From d8375fca5eccbb2f23d9860711035f9a7d151768 Mon Sep 17 00:00:00 2001 From: Marvin Date: Mon, 16 Dec 2024 17:07:41 -0300 Subject: [PATCH] Bump mysql driver version to fix CVE-2023-22102 (#745) * Bump mysql driver version to fix CVE-2023-22102 Signed-off-by: Marvin Froeder * Disable SQL server tests, as they are not running realiably Signed-off-by: Marvin Froeder --------- Signed-off-by: Marvin Froeder --- .circleci/config.yml | 37 +++++-------------- pom.xml | 2 +- querydsl-libraries/querydsl-jpa/pom.xml | 6 +-- querydsl-libraries/querydsl-sql-json/pom.xml | 4 +- .../querydsl-sql-spatial/pom.xml | 4 +- querydsl-libraries/querydsl-sql/pom.xml | 4 +- .../src/main/resources/keywords/mysql | 3 ++ querydsl-tooling/querydsl-sql-codegen/pom.xml | 4 +- 8 files changed, 24 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5588f5de4..99f982bcd0 100644 --- 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 index 25ae721e60..5ff61c212a 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 2.3.232 42.7.4 23.6.0.24.10 - 8.0.30 + 9.1.0 12.9.0.jre8-preview 9.3.9.0002 3.47.1.0 diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml index acbf87aa0d..0f136135e4 100644 --- a/querydsl-libraries/querydsl-jpa/pom.xml +++ b/querydsl-libraries/querydsl-jpa/pom.xml @@ -133,8 +133,8 @@ test - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} test @@ -307,7 +307,7 @@ ${project.version} org.apache.derby.jdbc.EmbeddedDriver - jdbc:derby:target/derbydb;create=true + jdbc:derby:${project.build.directory}/derbydb;create=true com.querydsl.jpa.domain.sql src/test/java src/test/java diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index d8f0f97fe0..742c217d2f 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -83,8 +83,8 @@ test - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} test diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml index 9ed1b11deb..7350b02295 100644 --- a/querydsl-libraries/querydsl-sql-spatial/pom.xml +++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml @@ -70,8 +70,8 @@ test - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} test diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index 1f51e76c92..8580a12a52 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -67,8 +67,8 @@ test - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} test diff --git a/querydsl-libraries/querydsl-sql/src/main/resources/keywords/mysql b/querydsl-libraries/querydsl-sql/src/main/resources/keywords/mysql index 0b1799f1f2..1aa82d3ffa 100644 --- 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 index 6d23508ed3..5b9962e504 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -69,8 +69,8 @@ test - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} test