GEODE-8496: final dependency bumps for 1.14 (apache#6017)

* GEODE-8496: Bump archunit-junit4 from 0.15.0 to 0.16.0

* GEODE-8496: Bump pmd from 6.30.0 to 6.31.0

* GEODE-8496: Bump netty from 4.1.58.Final to 4.1.59.Final

* GEODE-8496: Bump fastutil from 8.5.1 to 8.5.2

* GEODE-8496: Bump jproc from 2.3.0 to 2.4.0

* GEODE-8496: Bump tomcat from 9.0.41 to 9.0.43

* GEODE-8496: Bump tomcat from 7.0.107 to 7.0.108

* GEODE-8496: Bump tomcat from 8.5.61 to 8.5.63

* GEODE-8496: Bump cargo-core-uberjar from 1.9.0 to 1.9.1

* GEODE-8496: Bump spotless from 5.9.0 to 5.10.0

* GEODE-8496: Bump palantir-docker from 0.22.1 to 0.26.0

* Revert "GEODE-8496: Bump archunit-junit4 from 0.15.0 to 0.16.0"

This reverts commit 21fbcdf.

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -232,7 +232,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
-        <version>4.1.58.Final</version>
+        <version>4.1.59.Final</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>it.unimi.dsi</groupId>
         <artifactId>fastutil</artifactId>
-        <version>8.5.1</version>
+        <version>8.5.2</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -340,13 +340,13 @@
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-java</artifactId>
-        <version>6.30.0</version>
+        <version>6.31.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-test</artifactId>
-        <version>6.30.0</version>
+        <version>6.31.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -418,7 +418,7 @@
       <dependency>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-core-uberjar</artifactId>
-        <version>1.9.0</version>
+        <version>1.9.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>

build.gradle

@@ -21,10 +21,10 @@ plugins {
   id "base"
   id "idea"
   id "eclipse"
-  id "com.diffplug.spotless" version "5.9.0" apply false
+  id "com.diffplug.spotless" version "5.10.0" apply false
   id "com.github.ben-manes.versions" version "0.36.0" apply false
   id "nebula.lint" version "16.17.0" apply false
-  id "com.palantir.docker" version "0.22.1" apply false
+  id "com.palantir.docker" version "0.26.0" apply false
   id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false
   id "org.ajoberstar.grgit" version "4.1.0" apply false
   id "org.nosphere.apache.rat" version "0.6.0" apply false

buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

@@ -37,7 +37,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("commons-io.version", "2.8.0")
     deps.put("commons-lang3.version", "3.11")
     deps.put("commons-validator.version", "1.7")
-    deps.put("fastutil.version", "8.5.1")
+    deps.put("fastutil.version", "8.5.2")
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
     deps.put("log4j.version", "2.14.0")
@@ -51,9 +51,9 @@ class DependencyConstraints implements Plugin<Project> {
     // specifying @zip in a dependency, the manner in which we consume them in custom configurations.
     // This would possibly be corrected if they were proper source sets.
     deps.put("tomcat6.version", "6.0.37")
-    deps.put("tomcat7.version", "7.0.107")
-    deps.put("tomcat8.version", "8.5.61")
-    deps.put("tomcat9.version", "9.0.41")
+    deps.put("tomcat7.version", "7.0.108")
+    deps.put("tomcat8.version", "8.5.63")
+    deps.put("tomcat9.version", "9.0.43")
 
     // The jetty version is also hard-coded in geode-assembly:test
     // at o.a.g.sessions.tests.GenericAppServerInstall.java
@@ -117,7 +117,7 @@ class DependencyConstraints implements Plugin<Project> {
         // Careful when upgrading this dependency: see GEODE-7370 and GEODE-8150.
         api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.52')
         api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
-        api(group: 'io.netty', name: 'netty-all', version: '4.1.58.Final')
+        api(group: 'io.netty', name: 'netty-all', version: '4.1.59.Final')
         api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
         api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version'))
         api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2')
@@ -135,8 +135,8 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.6.0')
         api(group: 'net.openhft', name: 'compiler', version: '2.4.1')
         api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.30.0')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.30.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.31.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.31.0')
         api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
         api(group: 'org.apache.bcel', name: 'bcel', version: '6.5.0')
         api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))
@@ -148,7 +148,7 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'org.assertj', name: 'assertj-core', version: '3.19.0')
         api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
         api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.68')
-        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.0')
+        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.1')
         api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
         api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
         api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')

geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java

@@ -41,9 +41,9 @@ public class TomcatInstall extends ContainerInstall {
    */
   public enum TomcatVersion {
     TOMCAT6(6, "tomcat-6.0.37.zip"),
-    TOMCAT7(7, "tomcat-7.0.107.zip"),
-    TOMCAT8(8, "tomcat-8.5.61.zip"),
-    TOMCAT9(9, "tomcat-9.0.41.zip");
+    TOMCAT7(7, "tomcat-7.0.108.zip"),
+    TOMCAT8(8, "tomcat-8.5.63.zip"),
+    TOMCAT9(9, "tomcat-9.0.43.zip");
 
     private final int version;
 

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -987,7 +987,7 @@ lib/commons-lang3-3.11.jar
 lib/commons-logging-1.2.jar
 lib/commons-modeler-2.0.1.jar
 lib/commons-validator-1.7.jar
-lib/fastutil-8.5.1.jar
+lib/fastutil-8.5.2.jar
 lib/findbugs-annotations-1.3.9-1.jar
 lib/geo-0.7.7.jar
 lib/geode-common-0.0.0.jar
@@ -1055,7 +1055,7 @@ lib/micrometer-core-1.6.3.jar
 lib/mx4j-3.0.2.jar
 lib/mx4j-remote-3.0.2.jar
 lib/mx4j-tools-3.0.1.jar
-lib/netty-all-4.1.58.Final.jar
+lib/netty-all-4.1.59.Final.jar
 lib/protobuf-java-3.11.4.jar
 lib/ra.jar
 lib/rmiio-2.1.2.jar

geode-assembly/src/integrationTest/resources/dependency_classpath.txt

@@ -45,7 +45,7 @@ commons-logging-1.2.jar
 classgraph-4.8.52.jar
 micrometer-core-1.6.3.jar
 swagger-annotations-1.6.2.jar
-fastutil-8.5.1.jar
+fastutil-8.5.2.jar
 javax.resource-api-1.7.1.jar
 jetty-webapp-9.4.36.v20210114.jar
 jetty-servlet-9.4.36.v20210114.jar
@@ -87,4 +87,4 @@ lucene-core-6.6.6.jar
 lucene-queries-6.6.6.jar
 protobuf-java-3.11.4.jar
 geo-0.7.7.jar
-netty-all-4.1.58.Final.jar
+netty-all-4.1.59.Final.jar

geode-redis/build.gradle

@@ -55,7 +55,7 @@ dependencies {
   integrationTestImplementation('io.lettuce:lettuce-core')
   integrationTestImplementation('org.apache.logging.log4j:log4j-core')
   // This only exists for debugging PubSubNativeRedisAcceptanceTest
-  integrationTestImplementation('org.buildobjects:jproc:2.3.0')
+  integrationTestImplementation('org.buildobjects:jproc:2.4.0')
   integrationTestRuntime(project(':geode-log4j'))
 
   acceptanceTestImplementation(sourceSets.integrationTest.output)
@@ -73,7 +73,7 @@ dependencies {
   acceptanceTestImplementation('org.springframework.session:spring-session-data-redis')
   acceptanceTestImplementation('org.apache.logging.log4j:log4j-core')
   // This only exists for debugging PubSubNativeRedisAcceptanceTest
-  acceptanceTestImplementation('org.buildobjects:jproc:2.3.0')
+  acceptanceTestImplementation('org.buildobjects:jproc:2.4.0')
 
   distributedTestImplementation('org.apache.logging.log4j:log4j-core')
   distributedTestImplementation(project(':geode-dunit'))