GEODE-8496: top off dependency updates for 1.14 (apache#5652)

* Bump spring-security from 5.4.0 to 5.4.1
* Bump jackson and jackson-databind from 2.11.2 to 2.11.3
* Bump netty-all from 4.1.52.Final to 4.1.53.Final
* Bump mysql-connector-java from 8.0.21 to 8.0.22
* Bump httpclient from 4.5.12 to 4.5.13
* Bump tomcat9 from 9.0.38 to 9.0.39
* Bump tomcat8 from 8.5.58 to 8.5.59
* Bump cargo from 1.8.1 to 1.8.2
* Bump jetty from 9.4.31.v20200723 to 9.4.32.v20200930
* Bump jmh from 1.25.2 to 1.26
* Bump guava from 29.0-jre to 30.0-jre
* Bump mockrunner-servlet from 2.0.4 to 2.0.6
* Bump pmd from 6.27.0 to 6.28.0
* Bump junit from 4.13 to 4.13.1
* Bump junit-quickcheck from 0.9.4 to 0.9.5
* Bump mockito-core from 3.5.11 to 3.5.15
* Bump compiler from 2.3.6 to 2.4.0

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

@@ -70,13 +70,13 @@
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>2.11.2</version>
+        <version>2.11.3</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-scala_2.10</artifactId>
-        <version>2.11.2</version>
+        <version>2.11.3</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -106,7 +106,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>29.0-jre</version>
+        <version>30.0-jre</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -130,7 +130,7 @@
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.6</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -250,7 +250,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
-        <version>4.1.52.Final</version>
+        <version>4.1.53.Final</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -316,7 +316,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.13</version>
+        <version>4.13.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -346,7 +346,7 @@
       <dependency>
         <groupId>net.openhft</groupId>
         <artifactId>compiler</artifactId>
-        <version>2.3.6</version>
+        <version>2.4.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -358,13 +358,13 @@
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-java</artifactId>
-        <version>6.27.0</version>
+        <version>6.28.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-test</artifactId>
-        <version>6.27.0</version>
+        <version>6.28.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -400,7 +400,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.5.12</version>
+        <version>4.5.13</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -436,19 +436,19 @@
       <dependency>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-core-uberjar</artifactId>
-        <version>1.8.1</version>
+        <version>1.8.2</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.4.31.v20200723</version>
+        <version>9.4.32.v20200930</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-webapp</artifactId>
-        <version>9.4.31.v20200723</version>
+        <version>9.4.32.v20200930</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -478,7 +478,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.5.11</version>
+        <version>3.5.15</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -490,7 +490,7 @@
       <dependency>
         <groupId>org.openjdk.jmh</groupId>
         <artifactId>jmh-core</artifactId>
-        <version>1.25.2</version>
+        <version>1.26</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -562,19 +562,19 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>2.11.2</version>
+        <version>2.11.3</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.11.2</version>
+        <version>2.11.3</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.11.2</version>
+        <version>2.11.3</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -604,13 +604,13 @@
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>
-        <version>0.9.4</version>
+        <version>0.9.5</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-generators</artifactId>
-        <version>0.9.4</version>
+        <version>0.9.5</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -748,49 +748,49 @@
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-config</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-core</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-ldap</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-test</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-web</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-oauth2-core</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-oauth2-client</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-oauth2-jose</artifactId>
-        <version>5.4.0</version>
+        <version>5.4.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>

buildSrc/build.gradle

@@ -34,11 +34,11 @@ 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:29.0-jre')
+  implementation('com.google.guava:guava:30.0-jre')
   implementation('com.github.docker-java:docker-java:3.0.14')
   implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9')
 
-  implementation('junit:junit:4.13')
+  implementation('junit:junit:4.13.1')
 
   testAnnotationProcessor(this.project)
 }

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

@@ -52,12 +52,12 @@ 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.106")
-    deps.put("tomcat8.version", "8.5.58")
-    deps.put("tomcat9.version", "9.0.38")
+    deps.put("tomcat8.version", "8.5.59")
+    deps.put("tomcat9.version", "9.0.39")
 
     // The jetty version is also hard-coded in geode-assembly:test
     // at o.a.g.sessions.tests.GenericAppServerInstall.java
-    deps.put("jetty.version", "9.4.31.v20200723")
+    deps.put("jetty.version", "9.4.32.v20200930")
 
     // These version numbers are consumed by protobuf configurations that are plugin-specific and not
     // part of the typical Gradle dependency configurations.
@@ -66,7 +66,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("protobuf-java.version", "3.11.4")
 
     // These versions are referenced in test.gradle, which is aggressively injected into all projects.
-    deps.put("junit.version", "4.13")
+    deps.put("junit.version", "4.13.1")
     deps.put("cglib.version", "3.3.0")
     return deps
   }
@@ -88,17 +88,17 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'com.arakelian', name: 'java-jq', version: '1.1.0')
         api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.8')
         api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.9.8')
-        api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.2')
-        api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.11.2')
+        api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.3')
+        api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.11.3')
         api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.7')
         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: '29.0-jre')
+        api(group: 'com.google.guava', name: 'guava', version: '30.0-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')
-        api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.4')
+        api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.6')
         api(group: 'com.nimbusds', name:'nimbus-jose-jwt', version:'8.11')
         // Pinning transitive dependency from spring-security-oauth2 to clean up our licenses.
         api(group: 'com.nimbusds', name: 'oauth2-oidc-sdk', version: '8.9')
@@ -120,7 +120,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.52.Final')
+        api(group: 'io.netty', name: 'netty-all', version: '4.1.53.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')
@@ -136,31 +136,31 @@ 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.3.6')
+        api(group: 'net.openhft', name: 'compiler', version: '2.4.0')
         api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.27.0')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.27.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.28.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.28.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'))
         api(group: 'org.apache.commons', name: 'commons-text', version: 1.9)
         api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
-        api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12')
+        api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13')
         api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13')
         api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
         api(group: 'org.assertj', name: 'assertj-core', version: '3.17.2')
         api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
         api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66')
-        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.1')
+        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.2')
         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')
         api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
         api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
         api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))
-        api(group: 'org.mockito', name: 'mockito-core', version: '3.5.11')
+        api(group: 'org.mockito', name: 'mockito-core', version: '3.5.15')
         api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
-        api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.25.2')
+        api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.26')
         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'))
@@ -175,7 +175,7 @@ class DependencyConstraints implements Plugin<Project> {
       }
     }
 
-    dependencySet(group: 'com.fasterxml.jackson.core', version: '2.11.2') {
+    dependencySet(group: 'com.fasterxml.jackson.core', version: '2.11.3') {
       entry('jackson-annotations')
       entry('jackson-core')
       entry('jackson-databind')
@@ -191,7 +191,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('docker-compose-rule-junit4')
     }
 
-    dependencySet(group: 'com.pholser', version: '0.9.4') {
+    dependencySet(group: 'com.pholser', version: '0.9.5') {
       entry('junit-quickcheck-core')
       entry('junit-quickcheck-generators')
     }
@@ -239,7 +239,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('selenium-support')
     }
 
-    dependencySet(group: 'org.springframework.security', version: '5.4.0') {
+    dependencySet(group: 'org.springframework.security', version: '5.4.1') {
       entry('spring-security-config')
       entry('spring-security-core')
       entry('spring-security-ldap')

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.106.zip"),
-    TOMCAT8(8, "tomcat-8.5.58.zip"),
-    TOMCAT9(9, "tomcat-9.0.38.zip");
+    TOMCAT8(8, "tomcat-8.5.59.zip"),
+    TOMCAT9(9, "tomcat-9.0.39.zip");
 
     private final int version;
 

geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java

@@ -33,7 +33,7 @@
  * specific code outside of the {@link GenericAppServerVersion}.
  */
 public class GenericAppServerInstall extends ContainerInstall {
-  private static final String JETTY_VERSION = "9.4.31.v20200723";
+  private static final String JETTY_VERSION = "9.4.32.v20200930";
 
   /**
    * Get the version number, download URL, and container name of a generic app server using