GEODE-8980: bump deps (apache#6734)

* Bump classgraph from 4.8.109 to 4.8.110
* Bump commons-io from 2.10.0 to 2.11.0
* Bump jedis from 3.6.1 to 3.6.3
* Bump jetty from 9.4.42.v20210604 to 9.4.43.v20210629
* Bump lettuce-core from 6.1.3.RELEASE to 6.1.4.RELEASE
* Bump micrometer-core from 1.7.1 to 1.7.2
* Bump mysql-connector-java from 8.0.25 to 8.0.26
* Bump spring from 5.3.8 to 5.3.9
* Bump spring-boot-starter from 2.5.2 to 2.5.3
* Bump spring-hateoas from 1.3.2 to 1.3.3
* Bump tomcat from 9.0.48 to 9.0.50

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

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.10.0</version>
+        <version>2.11.0</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
@@ -185,7 +185,7 @@
       <dependency>
         <groupId>io.github.classgraph</groupId>
         <artifactId>classgraph</artifactId>
-        <version>4.8.109</version>
+        <version>4.8.110</version>
       </dependency>
       <dependency>
         <groupId>io.github.resilience4j</groupId>
@@ -195,12 +195,12 @@
       <dependency>
         <groupId>io.lettuce</groupId>
         <artifactId>lettuce-core</artifactId>
-        <version>6.1.3.RELEASE</version>
+        <version>6.1.4.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
@@ -365,12 +365,12 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.4.42.v20210604</version>
+        <version>9.4.43.v20210629</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-webapp</artifactId>
-        <version>9.4.42.v20210604</version>
+        <version>9.4.43.v20210629</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
@@ -430,7 +430,7 @@
       <dependency>
         <groupId>org.springframework.hateoas</groupId>
         <artifactId>spring-hateoas</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.ldap</groupId>
@@ -455,7 +455,7 @@
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.3</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -645,72 +645,72 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aspects</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-oxm</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jetty</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.session</groupId>

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

@@ -34,20 +34,20 @@ class DependencyConstraints implements Plugin<Project> {
     // These version numbers are consumed by :geode-modules-assembly:distAppServer filtering
     // Some of these are referenced below as well
     deps.put("antlr.version", "2.7.7")
-    deps.put("commons-io.version", "2.10.0")
+    deps.put("commons-io.version", "2.11.0")
     deps.put("commons-lang3.version", "3.12.0")
     deps.put("commons-validator.version", "1.7")
     deps.put("fastutil.version", "8.5.4")
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
     deps.put("log4j.version", "2.14.1")
-    deps.put("micrometer.version", "1.7.1")
+    deps.put("micrometer.version", "1.7.2")
     deps.put("shiro.version", "1.7.1")
     deps.put("slf4j-api.version", "1.7.30")
     deps.put("jboss-modules.version", "1.11.0.Final")
     deps.put("jackson.version", "2.12.3")
     deps.put("springshell.version", "1.2.0.RELEASE")
-    deps.put("springframework.version", "5.3.8")
+    deps.put("springframework.version", "5.3.9")
 
     // These version numbers are used in testing various versions of tomcat and are consumed explicitly
     // in will be called explicitly in the relevant extensions module, and respective configurations
@@ -57,11 +57,11 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("tomcat6.version", "6.0.37")
     deps.put("tomcat7.version", "7.0.109")
     deps.put("tomcat8.version", "8.5.66")
-    deps.put("tomcat9.version", "9.0.48")
+    deps.put("tomcat9.version", "9.0.50")
 
     // 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.42.v20210604")
+    deps.put("jetty.version", "9.4.43.v20210629")
 
     // These versions are referenced in test.gradle, which is aggressively injected into all projects.
     deps.put("junit.version", "4.13.2")
@@ -111,9 +111,9 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1')
         api(group: 'commons-validator', name: 'commons-validator', version: get('commons-validator.version'))
         // Careful when upgrading this dependency: see GEODE-7370 and GEODE-8150.
-        api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.109')
+        api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.110')
         api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.1')
-        api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.3.RELEASE')
+        api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.4.RELEASE')
         api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
         api(group: 'io.netty', name: 'netty-all', version: '4.1.66.Final')
         api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
@@ -160,12 +160,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.3.2')
+        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.3.3')
         api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.2.RELEASE')
         api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
         api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3')
         api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
-        api(group: 'redis.clients', name: 'jedis', version: '3.6.1')
+        api(group: 'redis.clients', name: 'jedis', version: '3.6.3')
         api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
       }
     }
@@ -252,7 +252,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-webmvc')
     }
 
-    dependencySet(group: 'org.springframework.boot', version: '2.5.2') {
+    dependencySet(group: 'org.springframework.boot', version: '2.5.3') {
       entry('spring-boot-starter')
       entry('spring-boot-starter-jetty')
       entry('spring-boot-starter-web')

dev-tools/dependencies/bump.sh

@@ -24,7 +24,7 @@ fi
 
 if [ "$2" = "-l" ] ; then
   ./gradlew dependencyUpdates -Drevision=release ; find . | grep build/dependencyUpdates/report.txt | xargs cat \
-   | grep ' -> ' | egrep -v '(Gradle|antlr|lucene|JUnitParams|docker-compose-rule|javax.servlet-api|springfox|derby|selenium|jgroups|jmh|\[6.0.37|commons-collections|jaxb|testcontainers)' \
+   | grep ' -> ' | egrep -v '(Gradle|antlr|lucene|JUnitParams|docker-compose-rule|javax.servlet-api|springfox|derby|selenium|jgroups|jmh|\[6.0.37|commons-collections|jaxb|testcontainers|gradle-tooling-api|slf4j|archunit)' \
    | sort -u | tr -d '][' | sed -e 's/ -> / /' -e 's#.*:#'"$0 $1"' #'
   exit 0
 fi

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

@@ -43,7 +43,7 @@ public enum TomcatVersion {
     TOMCAT6(6, "tomcat-6.0.37.zip"),
     TOMCAT7(7, "tomcat-7.0.109.zip"),
     TOMCAT8(8, "tomcat-8.5.66.zip"),
-    TOMCAT9(9, "tomcat-9.0.48.zip");
+    TOMCAT9(9, "tomcat-9.0.50.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.42.v20210604";
+  private static final String JETTY_VERSION = "9.4.43.v20210629";
 
   /**
    * Get the version number, download URL, and container name of a generic app server using

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

@@ -965,12 +965,12 @@ lib/HdrHistogram-2.1.12.jar
 lib/HikariCP-4.0.3.jar
 lib/LatencyUtils-2.0.3.jar
 lib/antlr-2.7.7.jar
-lib/classgraph-4.8.109.jar
+lib/classgraph-4.8.110.jar
 lib/commons-beanutils-1.9.4.jar
 lib/commons-codec-1.15.jar
 lib/commons-collections-3.2.2.jar
 lib/commons-digester-2.1.jar
-lib/commons-io-2.10.0.jar
+lib/commons-io-2.11.0.jar
 lib/commons-lang3-3.12.0.jar
 lib/commons-logging-1.2.jar
 lib/commons-modeler-2.0.1.jar
@@ -1016,15 +1016,15 @@ lib/javax.servlet-api-3.1.0.jar
 lib/javax.transaction-api-1.3.jar
 lib/jaxb-api-2.3.1.jar
 lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.42.v20210604.jar
-lib/jetty-io-9.4.42.v20210604.jar
-lib/jetty-security-9.4.42.v20210604.jar
-lib/jetty-server-9.4.42.v20210604.jar
-lib/jetty-servlet-9.4.42.v20210604.jar
-lib/jetty-util-9.4.42.v20210604.jar
-lib/jetty-util-ajax-9.4.42.v20210604.jar
-lib/jetty-webapp-9.4.42.v20210604.jar
-lib/jetty-xml-9.4.42.v20210604.jar
+lib/jetty-http-9.4.43.v20210629.jar
+lib/jetty-io-9.4.43.v20210629.jar
+lib/jetty-security-9.4.43.v20210629.jar
+lib/jetty-server-9.4.43.v20210629.jar
+lib/jetty-servlet-9.4.43.v20210629.jar
+lib/jetty-util-9.4.43.v20210629.jar
+lib/jetty-util-ajax-9.4.43.v20210629.jar
+lib/jetty-webapp-9.4.43.v20210629.jar
+lib/jetty-xml-9.4.43.v20210629.jar
 lib/jgroups-3.6.14.Final.jar
 lib/jline-2.12.jar
 lib/jna-5.8.0.jar
@@ -1040,7 +1040,7 @@ 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.7.1.jar
+lib/micrometer-core-1.7.2.jar
 lib/mx4j-3.0.2.jar
 lib/mx4j-remote-3.0.2.jar
 lib/mx4j-tools-3.0.1.jar
@@ -1058,12 +1058,12 @@ lib/shiro-event-1.7.1.jar
 lib/shiro-lang-1.7.1.jar
 lib/slf4j-api-1.7.30.jar
 lib/snappy-0.4.jar
-lib/spring-beans-5.3.8.jar
-lib/spring-context-5.3.8.jar
-lib/spring-core-5.3.8.jar
-lib/spring-jcl-5.3.8.jar
+lib/spring-beans-5.3.9.jar
+lib/spring-context-5.3.9.jar
+lib/spring-core-5.3.9.jar
+lib/spring-jcl-5.3.9.jar
 lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-5.3.8.jar
+lib/spring-web-5.3.9.jar
 lib/swagger-annotations-1.6.2.jar
 tools/Extensions/geode-web-0.0.0.war
 tools/Extensions/geode-web-api-0.0.0.war

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

@@ -39,19 +39,19 @@ shiro-config-ogdl-1.7.1.jar
 commons-beanutils-1.9.4.jar
 commons-codec-1.15.jar
 commons-collections-3.2.2.jar
-commons-io-2.10.0.jar
+commons-io-2.11.0.jar
 commons-logging-1.2.jar
-classgraph-4.8.109.jar
-micrometer-core-1.7.1.jar
+classgraph-4.8.110.jar
+micrometer-core-1.7.2.jar
 swagger-annotations-1.6.2.jar
 fastutil-core-8.5.4.jar
 fastutil-extra-8.5.4.jar
 fastutil-8.5.4.jar
 javax.resource-api-1.7.1.jar
-jetty-webapp-9.4.42.v20210604.jar
-jetty-servlet-9.4.42.v20210604.jar
-jetty-security-9.4.42.v20210604.jar
-jetty-server-9.4.42.v20210604.jar
+jetty-webapp-9.4.43.v20210629.jar
+jetty-servlet-9.4.43.v20210629.jar
+jetty-security-9.4.43.v20210629.jar
+jetty-server-9.4.43.v20210629.jar
 javax.servlet-api-3.1.0.jar
 jna-platform-5.8.0.jar
 jna-5.8.0.jar
@@ -66,18 +66,18 @@ shiro-event-1.7.1.jar
 shiro-crypto-core-1.7.1.jar
 shiro-lang-1.7.1.jar
 slf4j-api-1.7.30.jar
-spring-core-5.3.8.jar
+spring-core-5.3.9.jar
 javax.activation-api-1.2.0.jar
 jline-2.12.jar
 HdrHistogram-2.1.12.jar
 LatencyUtils-2.0.3.jar
 javax.transaction-api-1.3.jar
-spring-jcl-5.3.8.jar
-jetty-xml-9.4.42.v20210604.jar
-jetty-http-9.4.42.v20210604.jar
-jetty-io-9.4.42.v20210604.jar
-jetty-util-ajax-9.4.42.v20210604.jar
-jetty-util-9.4.42.v20210604.jar
+spring-jcl-5.3.9.jar
+jetty-xml-9.4.43.v20210629.jar
+jetty-http-9.4.43.v20210629.jar
+jetty-io-9.4.43.v20210629.jar
+jetty-util-ajax-9.4.43.v20210629.jar
+jetty-util-9.4.43.v20210629.jar
 log4j-slf4j-impl-2.14.1.jar
 log4j-core-2.14.1.jar
 log4j-jul-2.14.1.jar

geode-assembly/src/main/dist/LICENSE

@@ -1064,7 +1064,7 @@ Apache Geode bundles the following files under the MIT License:
 
   - Checker Qual v2.10.0 (https://checkerframework.org), Copyright (c)
     2004-present by the Checker Framework developers
-  - ClassGraph v4.8.109 (https://github.com/classgraph/classgraph), Copyright
+  - ClassGraph v4.8.110 (https://github.com/classgraph/classgraph), Copyright
     (c) 2019 Luke Hutchison
   - HTML5 Shiv vpre3.5 (https://github.com/aFarkas/html5shiv), Copyright
     (c) 2014 Alexander Farkas (aFarkas)

geode-connectors/build.gradle

@@ -118,7 +118,7 @@ dependencies {
   acceptanceTestRuntimeOnly('org.apache.derby:derby')
   acceptanceTestRuntimeOnly('org.postgresql:postgresql')
 
-  jdbcTestingJars('mysql:mysql-connector-java:8.0.25')
+  jdbcTestingJars('mysql:mysql-connector-java:8.0.26')
 }
 
 integrationTest.forkEvery 0