CURATOR-691. Compatible with JDK 21 (#484)

Signed-off-by: tison <[email protected]>
apache · Oct 24, 2023 · a83a0b2 · a83a0b2
1 parent 2a94b2d
commit a83a0b2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,8 +44,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
-          distribution: 'temurin'
+          java-version: 21
+          distribution: 'zulu'
       - name: Check code style
         run: ./mvnw spotless:check
 
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11, 17, 21]
     env:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
@@ -74,7 +74,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'temurin'
+          distribution: 'zulu'
 
       - name: Build with ${{ matrix.java }}
         run: ./mvnw clean install -DskipTests

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -24,11 +24,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.17</version>
+        <version>1.19.1</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.11.1</version>
+        <version>1.12.4</version>
     </extension>
 </extensions>
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
         <maven-project-info-reports-plugin-version>3.0.0</maven-project-info-reports-plugin-version>
         <maven-javadoc-plugin-version>3.3.2</maven-javadoc-plugin-version>
         <maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
-        <spotless.version>2.36.0</spotless.version>
+        <spotless.version>2.39.0</spotless.version>
         <doxia-module-confluence-version>1.11.1</doxia-module-confluence-version>
         <javassist-version>3.24.1-GA</javassist-version>
         <commons-math-version>2.2</commons-math-version>
@@ -936,7 +936,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.30.0</version>
+                            <version>2.38.0</version>
                         </palantirJavaFormat>
                         <!-- static imports first, then others, no blank lines  -->
                         <importOrder>