From 0f7d3b2de44992f0c614ebeefb1d8c52876e93af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:11:53 +0000 Subject: [PATCH 1/3] build(deps): bump the minor-and-patch group across 2 directories with 17 updates Bumps the minor-and-patch group with 15 updates in the /server/java directory: | Package | From | To | | --- | --- | --- | | [io.netty:netty-all](https://github.com/netty/netty) | `4.1.103.Final` | `4.1.115.Final` | | [io.netty:netty-codec-http2](https://github.com/netty/netty) | `4.1.103.Final` | `4.1.115.Final` | | [io.netty:netty-handler-proxy](https://github.com/netty/netty) | `4.1.103.Final` | `4.1.115.Final` | | [io.netty:netty-transport-native-unix-common](https://github.com/netty/netty) | `4.1.103.Final` | `4.1.115.Final` | | [info.picocli:picocli](https://github.com/remkop/picocli) | `4.7.5` | `4.7.6` | | org.apache.commons:commons-lang3 | `3.14.0` | `3.17.0` | | org.slf4j:slf4j-api | `2.0.9` | `2.0.16` | | org.slf4j:slf4j-simple | `2.0.9` | `2.0.16` | | [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.9.3` | `5.11.3` | | [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.9.3` | `5.11.3` | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | `5.3.1` | `5.14.2` | | [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.10.1` | `3.13.0` | | [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) | `3.2.2` | `3.6.0` | | [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.0.0` | `3.5.2` | | [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) | `0.8.10` | `0.8.12` | Bumps the minor-and-patch group with 5 updates in the /tests/cross-language/java directory: | Package | From | To | | --- | --- | --- | | [mysql:mysql-connector-java](https://github.com/mysql/mysql-connector-j) | `8.0.28` | `8.0.30` | | [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.1.0` | `5.11.3` | | [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.7.0` | `3.13.0` | | [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) | `3.0.0` | `3.6.0` | | [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) | `3.0.1` | `3.3.1` | Updates `io.netty:netty-all` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `io.netty:netty-codec-http2` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `io.netty:netty-handler-proxy` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `io.netty:netty-transport-native-unix-common` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `io.netty:netty-codec-http2` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `io.netty:netty-handler-proxy` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `io.netty:netty-transport-native-unix-common` from 4.1.103.Final to 4.1.115.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.103.Final...netty-4.1.115.Final) Updates `info.picocli:picocli` from 4.7.5 to 4.7.6 - [Release notes](https://github.com/remkop/picocli/releases) - [Changelog](https://github.com/remkop/picocli/blob/main/RELEASE-NOTES.md) - [Commits](https://github.com/remkop/picocli/compare/v4.7.5...v4.7.6) Updates `org.apache.commons:commons-lang3` from 3.14.0 to 3.17.0 Updates `org.slf4j:slf4j-api` from 2.0.9 to 2.0.16 Updates `org.slf4j:slf4j-simple` from 2.0.9 to 2.0.16 Updates `org.slf4j:slf4j-simple` from 2.0.9 to 2.0.16 Updates `org.junit.jupiter:junit-jupiter-engine` from 5.9.3 to 5.11.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.11.3) Updates `org.junit.jupiter:junit-jupiter-api` from 5.9.3 to 5.11.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.11.3) Updates `org.mockito:mockito-core` from 5.3.1 to 5.14.2 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.3.1...v5.14.2) Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.10.1 to 3.13.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.13.0) Updates `org.apache.maven.plugins:maven-checkstyle-plugin` from 3.2.2 to 3.6.0 - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.6.0) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.0.0 to 3.5.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.5.2) Updates `org.jacoco:jacoco-maven-plugin` from 0.8.10 to 0.8.12 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.10...v0.8.12) Updates `mysql:mysql-connector-java` from 8.0.28 to 8.0.30 - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.28...8.0.30) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.1.0 to 5.11.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.11.3) Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.7.0 to 3.13.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.13.0) Updates `org.apache.maven.plugins:maven-checkstyle-plugin` from 3.0.0 to 3.6.0 - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.6.0) Updates `org.apache.maven.plugins:maven-source-plugin` from 3.0.1 to 3.3.1 - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.0.1...maven-source-plugin-3.3.1) --- updated-dependencies: - dependency-name: io.netty:netty-all dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: io.netty:netty-codec-http2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: io.netty:netty-handler-proxy dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: io.netty:netty-transport-native-unix-common dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: io.netty:netty-codec-http2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: io.netty:netty-handler-proxy dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: io.netty:netty-transport-native-unix-common dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: info.picocli:picocli dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch ... Signed-off-by: dependabot[bot] --- server/java/pom.xml | 22 +++++++++++----------- tests/cross-language/java/pom.xml | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 9016f84fb..12f8cf5be 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -13,19 +13,19 @@ UTF-8 - 5.9.3 - 5.9.3 + 5.11.3 + 5.11.3 1.68.1 3.25.5 0.3.1 - 4.7.5 + 4.7.6 2.11.0 20231013 6.2.1 - 4.1.103.Final - 3.14.0 - 2.0.9 - 0.8.10 + 4.1.115.Final + 3.17.0 + 2.0.16 + 0.8.12 ${project.basedir}/checkstyle.xml ${project.basedir}/suppressions.xml @@ -178,7 +178,7 @@ org.mockito mockito-core - 5.3.1 + 5.14.2 test @@ -215,7 +215,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 8 8 @@ -224,7 +224,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.2 + 3.6.0 validate @@ -246,7 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.5.2 false diff --git a/tests/cross-language/java/pom.xml b/tests/cross-language/java/pom.xml index 3b01afeed..5299d65e8 100644 --- a/tests/cross-language/java/pom.xml +++ b/tests/cross-language/java/pom.xml @@ -30,9 +30,9 @@ 17 UTF-8 5.4.0 - 5.1.0 + 5.11.3 6.2.1 - 8.0.28 + 8.0.30 ${project.basedir}/checkstyle.xml @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 + 3.6.0 validate @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.13.0 ${java.version} ${java.version} @@ -71,7 +71,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.1 attach-sources From 2e95acc9c56e6916b955d31e88d1c5d51bd3a52c Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Mon, 25 Nov 2024 12:07:19 -0700 Subject: [PATCH 2/3] checkstyle configuration fix FIX: Failed during checkstyle configuration: cannot initialize module TreeWalker - TreeWalker is not allowed as a parent of LineLength Please review 'Parent Module' section for this Check in web documentation if Check is standard. --- tests/cross-language/java/checkstyle.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/cross-language/java/checkstyle.xml b/tests/cross-language/java/checkstyle.xml index d6019ea91..56d031265 100644 --- a/tests/cross-language/java/checkstyle.xml +++ b/tests/cross-language/java/checkstyle.xml @@ -70,6 +70,12 @@ + + + + + + @@ -109,11 +115,6 @@ - - - - - From c8a4f99556e489235534a413a1b4784dfc20904e Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Mon, 25 Nov 2024 12:08:37 -0700 Subject: [PATCH 3/3] whitespace fix --- .../com/godaddy/asherah/cltf/DecryptDefinitions.java | 10 +++++----- .../com/godaddy/asherah/cltf/EncryptDefinitions.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/DecryptDefinitions.java b/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/DecryptDefinitions.java index 307c07602..e12814462 100644 --- a/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/DecryptDefinitions.java +++ b/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/DecryptDefinitions.java @@ -51,11 +51,11 @@ public void iDecryptTheEncryptedData() { // Create a session for this test try (SessionFactory sessionFactory = SessionFactory - .newBuilder(DefaultProductId, DefaultServiceId) - .withMetastore(metastore) - .withCryptoPolicy(cryptoPolicy) - .withKeyManagementService(keyManagementService) - .build()) { + .newBuilder(DefaultProductId, DefaultServiceId) + .withMetastore(metastore) + .withCryptoPolicy(cryptoPolicy) + .withKeyManagementService(keyManagementService) + .build()) { // Now create an actual session for a partition (which in our case is a dummy id). This session is used // for a transaction and is closed automatically after use due to the AutoCloseable implementation. diff --git a/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/EncryptDefinitions.java b/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/EncryptDefinitions.java index 4e03bd3e2..8deefc11c 100644 --- a/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/EncryptDefinitions.java +++ b/tests/cross-language/java/src/test/java/com/godaddy/asherah/cltf/EncryptDefinitions.java @@ -47,11 +47,11 @@ public void iEncryptTheData() { // Create a session for the test try (SessionFactory sessionFactory = SessionFactory - .newBuilder(DefaultProductId, DefaultServiceId) - .withMetastore(metastore) - .withCryptoPolicy(cryptoPolicy) - .withKeyManagementService(keyManagementService) - .build()) { + .newBuilder(DefaultProductId, DefaultServiceId) + .withMetastore(metastore) + .withCryptoPolicy(cryptoPolicy) + .withKeyManagementService(keyManagementService) + .build()) { // Now create an actual session for a partition (which in our case is a dummy id). This session is used // for a transaction and is closed automatically after use due to the AutoCloseable implementation.