Bump mysql driver version to fix CVE-2023-22102 (#745)

* Bump mysql driver version to fix CVE-2023-22102 Signed-off-by: Marvin Froeder <[email protected]> * Disable SQL server tests, as they are not running realiably Signed-off-by: Marvin Froeder <[email protected]> --------- Signed-off-by: Marvin Froeder <[email protected]>
OpenFeign · Dec 16, 2024 · d8375fc · d8375fc
1 parent 5b5d689
commit d8375fc
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 40 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -176,7 +176,15 @@ jobs:
           name: 'Build and test examples'
           command: |
             cd querydsl-examples/querydsl-example-ksp-codegen
-            ./gradlew  --no-daemon --console=plain  test
+            ./gradlew --no-daemon --console=plain
+      - run:
+          name: 'Save test results'
+          command: |
+            mkdir -p ~/test-results/junit/
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/test-results
   testMySQL:
     <<: *defaults
     working_directory: ~/querydsl
@@ -301,27 +309,6 @@ jobs:
           command: |
             ./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.Firebird
       - save-test-results
-  testMSSQL:
-    <<: *defaults
-    working_directory: ~/querydsl
-    docker:
-      - image: velo/toolchains-4-ci-builds:with-21
-      - image: mcr.microsoft.com/mssql/server:2022-latest
-        environment:
-          - ACCEPT_EULA=Y
-          - SA_PASSWORD=Password1!
-          - MSSQL_PID=Express
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - querydsl-dependencies-{{ checksum "pom.xml" }}
-            - querydsl-dependencies-
-      - run:
-          name: 'Test'
-          command: |
-            ./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.SQLServer
-      - save-test-results
   testEmbedded:
     <<: *defaults
     working_directory: ~/querydsl
@@ -443,12 +430,6 @@ workflows:
             - 'Resolve dependencies'
           filters:
             <<: *all-branches
-      - testMSSQL:
-          name: 'Test SQL Server'
-          requires:
-            - 'Resolve dependencies'
-          filters:
-            <<: *all-branches
       - testEmbedded:
           name: 'Test Embedded databases'
           requires:

diff --git a/pom.xml b/pom.xml
@@ -114,7 +114,7 @@
     <h2.version>2.3.232</h2.version>
     <postgresql.version>42.7.4</postgresql.version>
     <oracle.version>23.6.0.24.10</oracle.version>
-    <mysql.version>8.0.30</mysql.version>
+    <mysql.version>9.1.0</mysql.version>
     <mssql.version>12.9.0.jre8-preview</mssql.version>
     <cubrid.version>9.3.9.0002</cubrid.version>
     <sqlite.version>3.47.1.0</sqlite.version>

diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml
@@ -133,8 +133,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <version>${mysql.version}</version>
       <scope>test</scope>
     </dependency>
@@ -307,7 +307,7 @@
         <version>${project.version}</version>
         <configuration>
           <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-          <jdbcUrl>jdbc:derby:target/derbydb;create=true</jdbcUrl>
+          <jdbcUrl>jdbc:derby:${project.build.directory}/derbydb;create=true</jdbcUrl>
           <packageName>com.querydsl.jpa.domain.sql</packageName>
           <targetFolder>src/test/java</targetFolder>
           <sourceFolder>src/test/java</sourceFolder>

diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml
@@ -83,8 +83,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <version>${mysql.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml
@@ -70,8 +70,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <version>${mysql.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml
@@ -67,8 +67,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <version>${mysql.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/querydsl-libraries/querydsl-sql/src/main/resources/keywords/mysql b/querydsl-libraries/querydsl-sql/src/main/resources/keywords/mysql
@@ -131,6 +131,7 @@ LONGBLOB
 LONGTEXT
 LOOP
 LOW_PRIORITY
+MANUAL
 MASTER_BIND
 MASTER_SSL_VERIFY_SERVER_CERT
 MATCH
@@ -160,12 +161,14 @@ ORDER
 OUT
 OUTER
 OUTFILE
+PARALLEL
 PERSIST
 PERSIST_ONLY
 PRECISION
 PRIMARY
 PROCEDURE
 PURGE
+QUALIFY
 RANGE
 READ
 READ_WRITE

diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml
@@ -69,8 +69,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <version>${mysql.version}</version>
       <scope>test</scope>
     </dependency>