Gradle Upgrade

build-logic/build.gradle

@@ -56,11 +56,11 @@ gradlePlugin {
 
 dependencies {
   api gradleApi()
-  api 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0'
-  api 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0'
+  api 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.3.1'
+  api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
   api 'org.unbroken-dome.gradle-plugins:gradle-xjc-plugin:2.0.0'
-  api 'com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.9'
-  implementation 'biz.aQute.bnd:biz.aQute.bndlib:6.0.0'
+  api 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.12'
+  implementation 'biz.aQute.bnd:biz.aQute.bndlib:6.3.1'
   implementation 'org.osgi:org.osgi.service.component.annotations:1.5.0'
   implementation 'org.apache.felix:org.apache.felix.scr.generator:1.18.4'
   implementation 'org.apache.felix:org.apache.felix.scr.ds-annotations:1.2.10'

build-logic/src/main/java/org/ehcache/build/conventions/JavaConvention.java

@@ -26,8 +26,8 @@ public void apply(Project project) {
 
     project.getConfigurations().all(config -> {
       config.getResolutionStrategy().dependencySubstitution(subs -> {
-        subs.substitute(subs.module("org.hamcrest:hamcrest-core:1.3")).with(subs.module("org.hamcrest:hamcrest-core:" + project.property("hamcrestVersion")));
-        subs.substitute(subs.module("org.hamcrest:hamcrest-library:1.3")).with(subs.module("org.hamcrest:hamcrest-library:" + project.property("hamcrestVersion")));
+        subs.substitute(subs.module("org.hamcrest:hamcrest-core:1.3")).using(subs.module("org.hamcrest:hamcrest-core:" + project.property("hamcrestVersion")));
+        subs.substitute(subs.module("org.hamcrest:hamcrest-library:1.3")).using(subs.module("org.hamcrest:hamcrest-library:" + project.property("hamcrestVersion")));
       });
     });
   }

ehcache-107/build.gradle

@@ -98,14 +98,14 @@ task unpackTckTests(type: Sync) {
   from {
     configurations.tckTestClasses.collect {zipTree(it)}
   }
-  into sourceSets.tckTest.java.outputDir
+  into sourceSets.tckTest.java.classesDirectory
 }
 
 task tckTest(type: Test, dependsOn: unpackTckTests) {
   testClassesDirs = sourceSets.tckTest.output.classesDirs
   classpath += sourceSets.tckTest.runtimeClasspath
 
-  binResultsDir file("$buildDir/tck-tests-results/binary/$name")
+  binaryResultsDirectory = file("$buildDir/tck-tests-results/binary/$name")
   reports.junitXml.destination = file("$buildDir/tck-tests-results")
   reports.html.destination = file("$buildDir/reports/tck-tests")
 

ehcache-api/config/checkstyle.xml

@@ -44,7 +44,7 @@
       <property name="scope" value="public"/>
     </module>
     <module name="JavadocMethod">
-      <property name="scope" value="public"/>
+      <property name="accessModifiers" value="public"/>
     </module>
     <module name="JavadocVariable">
       <property name="scope" value="public"/>

ehcache-impl/build.gradle

@@ -42,7 +42,7 @@ task slowTest(type: Test) {
   testClassesDirs = sourceSets.slowTest.output.classesDirs
   classpath += sourceSets.slowTest.runtimeClasspath
 
-  binResultsDir file("$buildDir/slow-tests-results/binary/$name")
+  binaryResultsDirectory = file("$buildDir/slow-tests-results/binary/$name")
   reports.junitXml.destination = file("$buildDir/slow-tests-results")
   reports.html.destination = file("$buildDir/reports/slow-tests")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists