GEODE-8496: more dependency bumps (apache#5869)

* Bump guava from 30.0-jre to 30.1-jre
* Bump micrometer-core from 1.6.1 to 1.6.2
* Bump netty-all from 4.1.54.Final to 4.1.56.Final
* Bump json-path from 2.4.0 to 2.5.0
* Bump pmd from 6.29.0 to 6.30.0
* Bump compiler from 2.4.0 to 2.4.1
* Bump archunit from 0.14.1 to 0.15.0
* Bump tomcat from 8.5.60 to 8.5.61
* Bump tomcat from 9.0.40 to 9.0.41
* Bump cargo from 1.8.2 to 1.8.3
* Bump spring-boot-starter from 2.4.0 to 2.4.1
* Bump spring-hateoas from 1.2.1 to 1.2.2
* Bump jedis from 3.3.0 to 3.4.0

Author: onichols-pivotal

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

@@ -100,7 +100,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>30.0-jre</version>
+        <version>30.1-jre</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -238,13 +238,13 @@
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
-        <version>4.1.54.Final</version>
+        <version>4.1.56.Final</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -340,7 +340,7 @@
       <dependency>
         <groupId>net.openhft</groupId>
         <artifactId>compiler</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -352,13 +352,13 @@
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-java</artifactId>
-        <version>6.29.0</version>
+        <version>6.30.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-test</artifactId>
-        <version>6.29.0</version>
+        <version>6.30.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -430,7 +430,7 @@
       <dependency>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-core-uberjar</artifactId>
-        <version>1.8.2</version>
+        <version>1.8.3</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -508,7 +508,7 @@
       <dependency>
         <groupId>org.springframework.hateoas</groupId>
         <artifactId>spring-hateoas</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -538,7 +538,7 @@
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -574,13 +574,13 @@
       <dependency>
         <groupId>com.jayway.jsonpath</groupId>
         <artifactId>json-path-assert</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.jayway.jsonpath</groupId>
         <artifactId>json-path</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -850,25 +850,25 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jetty</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>

buildSrc/build.gradle

@@ -34,7 +34,7 @@ dependencies {
   implementation(gradleApi())
   implementation('org.apache.commons:commons-lang3:3.3.2')
   implementation('org.apache.maven:maven-artifact:3.3.3')
-  implementation('com.google.guava:guava:30.0-jre')
+  implementation('com.google.guava:guava:30.1-jre')
   implementation('com.github.docker-java:docker-java:3.0.14')
   implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9')
 

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

@@ -41,7 +41,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
     deps.put("log4j.version", "2.14.0")
-    deps.put("micrometer.version", "1.6.1")
+    deps.put("micrometer.version", "1.6.2")
     deps.put("shiro.version", "1.7.0")
     deps.put("slf4j-api.version", "1.7.30")
 
@@ -52,8 +52,8 @@ class DependencyConstraints implements Plugin<Project> {
     // 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.60")
-    deps.put("tomcat9.version", "9.0.40")
+    deps.put("tomcat8.version", "8.5.61")
+    deps.put("tomcat9.version", "9.0.41")
 
     // The jetty version is also hard-coded in geode-assembly:test
     // at o.a.g.sessions.tests.GenericAppServerInstall.java
@@ -93,7 +93,7 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0')
         api(group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1')
         api(group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2')
-        api(group: 'com.google.guava', name: 'guava', version: '30.0-jre')
+        api(group: 'com.google.guava', name: 'guava', version: '30.1-jre')
         api(group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: get('protobuf-gradle-plugin.version'))
         api(group: 'com.google.protobuf', name: 'protobuf-java', version: get('protobuf-java.version'))
         api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
@@ -119,7 +119,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.54.Final')
+        api(group: 'io.netty', name: 'netty-all', version: '4.1.56.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,10 +135,10 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
         api(group: 'net.java.dev.jna', name: 'jna', version: '5.6.0')
         api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.6.0')
-        api(group: 'net.openhft', name: 'compiler', version: '2.4.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.29.0')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.29.0')
+        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.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'))
@@ -150,7 +150,7 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'org.assertj', name: 'assertj-core', version: '3.18.1')
         api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
         api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.67')
-        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.2')
+        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.3')
         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')
@@ -163,12 +163,12 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
         api(group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0')
         api(group: 'org.slf4j', name: 'slf4j-api', version: get('slf4j-api.version'))
-        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.2.1')
+        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.2.2')
         api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.2.RELEASE')
         api(group: 'org.springframework.shell', name: 'spring-shell', version: '1.2.0.RELEASE')
         api(group: 'org.testcontainers', name: 'testcontainers', version: '1.14.3')
         api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
-        api(group: 'redis.clients', name: 'jedis', version: '3.3.0')
+        api(group: 'redis.clients', name: 'jedis', version: '3.4.0')
         api(group: 'io.lettuce', name: 'lettuce-core', version: '6.0.1.RELEASE')
         api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
       }
@@ -180,7 +180,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('jackson-databind')
     }
 
-    dependencySet(group: 'com.jayway.jsonpath', version: '2.4.0') {
+    dependencySet(group: 'com.jayway.jsonpath', version: '2.5.0') {
       entry('json-path-assert')
       entry('json-path')
     }
@@ -262,7 +262,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-webmvc')
     }
 
-    dependencySet(group: 'org.springframework.boot', version: '2.4.0') {
+    dependencySet(group: 'org.springframework.boot', version: '2.4.1') {
       entry('spring-boot-starter')
       entry('spring-boot-starter-jetty')
       entry('spring-boot-starter-web')

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

@@ -42,8 +42,8 @@ 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.60.zip"),
-    TOMCAT9(9, "tomcat-9.0.40.zip");
+    TOMCAT8(8, "tomcat-8.5.61.zip"),
+    TOMCAT9(9, "tomcat-9.0.41.zip");
 
     private final int version;
 

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

@@ -1051,11 +1051,11 @@ lib/lucene-analyzers-phonetic-6.6.6.jar
 lib/lucene-core-6.6.6.jar
 lib/lucene-queries-6.6.6.jar
 lib/lucene-queryparser-6.6.6.jar
-lib/micrometer-core-1.6.1.jar
+lib/micrometer-core-1.6.2.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.54.Final.jar
+lib/netty-all-4.1.56.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

@@ -43,7 +43,7 @@ commons-collections-3.2.2.jar
 commons-io-2.8.0.jar
 commons-logging-1.2.jar
 classgraph-4.8.52.jar
-micrometer-core-1.6.1.jar
+micrometer-core-1.6.2.jar
 swagger-annotations-1.6.2.jar
 fastutil-8.4.4.jar
 javax.resource-api-1.7.1.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.54.Final.jar
+netty-all-4.1.56.Final.jar