From fe8e702a5cda030954a11927a86ab63fa42691ab Mon Sep 17 00:00:00 2001 From: ATX Bot Date: Mon, 15 Jun 2026 10:06:10 -0700 Subject: [PATCH] =?UTF-8?q?Step=201:=20Upgrade=20Java=20from=2011=20to=202?= =?UTF-8?q?1=20-=20Updated=20Maven=20compiler=20plugin=20(3.7.0=E2=86=923.?= =?UTF-8?q?13.0),=20surefire=20(2.22.0=E2=86=923.2.5),=20javadoc=20(3.0.1?= =?UTF-8?q?=E2=86=923.6.3),=20JUnit=20Jupiter=20(5.3.2=E2=86=925.10.2),=20?= =?UTF-8?q?AssertJ=20(3.11.1=E2=86=923.25.3),=20Gradle=20wrapper=20(4.10.3?= =?UTF-8?q?=E2=86=928.11),=20Maven=20wrapper=20(3.5.4=E2=86=923.9.6),=20fi?= =?UTF-8?q?xed=20Gradle=208.x=20compatibility=20(testCompile=E2=86=92testI?= =?UTF-8?q?mplementation,=20removed=20jcenter).=20Build=20status:=20Succes?= =?UTF-8?q?s=20(13=20tests=20pass)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mvn/wrapper/maven-wrapper.properties | 2 +- build.gradle | 15 +++++++-------- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 3 +-- pom.xml | 12 ++++++------ 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 00d32aa..83fff6d 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip \ No newline at end of file +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip \ No newline at end of file diff --git a/build.gradle b/build.gradle index 221e716..e32bcba 100644 --- a/build.gradle +++ b/build.gradle @@ -33,22 +33,21 @@ apply plugin: 'java' ext { // Cribbed from https://github.com/mindscratch/reactor-offline/blob/master/build.gradle javadocLinks = [ - "http://docs.oracle.com/javase/11/docs/api/" + "http://docs.oracle.com/javase/21/docs/api/" ] as String[] } repositories { mavenCentral() - jcenter() } dependencies { // Compile-time dependencies // Test dependencies - testCompile("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}") - testCompile("org.assertj:assertj-core:${assertjVersion}") - testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}") + testImplementation("org.assertj:assertj-core:${assertjVersion}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}") } // ********************************************************************************************************************* @@ -63,8 +62,8 @@ eclipse { idea { project { - jdkName = '11' - languageLevel = '11' + jdkName = '21' + languageLevel = '21' } } @@ -85,7 +84,7 @@ test { task javadocTests(type: Javadoc, group: "documentation" ) { description = 'Generates Javadoc API documentation for the test source code.' source = sourceSets.test.allJava - classpath = configurations.testCompile + classpath = configurations.testImplementation options.links(project.ext.javadocLinks) options.addBooleanOption('html5',true) } diff --git a/gradle.properties b/gradle.properties index 11ecfb0..cc38659 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ # dependencies. Configuring the properties in this file avoids the need to edit build.gradle except when build logic # needs to change. # ********************************************************************************************************************** -assertjVersion=3.11.1 +assertjVersion=3.25.3 description=Java 11 code examples group=com.neiljbrown -junitJupiterVersion=5.3.2 +junitJupiterVersion=5.10.2 # Set Java source & class versions to use when compiling. Needs to be defined after applying java plugin to take affect -sourceCompatibility=11 -targetCompatibility=11 +sourceCompatibility=21 +targetCompatibility=21 # Default project version unless overridden version=0.0.1-snapshot diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 75c31a3..2496707 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Feb 01 15:35:05 GMT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip diff --git a/pom.xml b/pom.xml index c1ba53a..c06fbe2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,10 +12,10 @@ https://github.com/neiljbrown/java11-examples - 11 + 21 UTF-8 - 5.3.2 - 3.11.1 + 5.10.2 + 3.25.3 @@ -44,7 +44,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.13.0 ${java.version} ${java.version} @@ -52,12 +52,12 @@ maven-surefire-plugin - 2.22.0 + 3.2.5 org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.6.3 -html5