You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2022/04/06 19:20:18 UTC
[geode] branch develop updated: GEODE-10046: Bump 3rd-party dependency versions (#7557)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f110b9be35 GEODE-10046: Bump 3rd-party dependency versions (#7557)
f110b9be35 is described below
commit f110b9be3547474e74bc16cf2f24337b90e8fae2
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Wed Apr 6 12:20:12 2022 -0700
GEODE-10046: Bump 3rd-party dependency versions (#7557)
Geode endeavors to regularly update 3rd-party dependencies to increase
shelf life, security and reliability of releases.
Dependency bumps in this batch:
* Bump classgraph from 4.8.141 to 4.8.143
* Bump jetty from 9.4.45.v20220203 to 9.4.46.v20220331
* Bump jna from 5.10.0 to 5.11.0
* Bump junit-pioneer from 1.6.1 to 1.6.2
* Bump lettuce-core from 6.1.6.RELEASE to 6.1.8.RELEASE
* Bump maven-artifact from 3.8.1 to 3.8.5
* Bump micrometer-core from 1.8.3 to 1.8.4
* Bump nebula.lint from 17.6.1 to 17.7.0
* Bump netty from 4.1.74.Final to 4.1.75.Final
* Bump rat from 0.7.0 to 0.7.1
* Bump shiro-core from 1.8.0 to 1.9.0
* Bump spotless from 6.2.2 to 6.4.1
* Bump spring-boot-starter-web from 2.6.5 to 2.6.6
* Bump swagger-annotations from 1.6.2 to 1.6.6
* Bump tomcat from 9.0.59 to 9.0.62
---
.../src/test/resources/expected-pom.xml | 32 +++++++--------
build.gradle | 6 +--
buildSrc/build.gradle | 2 +-
.../gradle/plugins/DependencyConstraints.groovy | 24 +++++------
.../apache/geode/session/tests/TomcatInstall.java | 2 +-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 46 +++++++++++-----------
.../resources/gfsh_dependency_classpath.txt | 46 +++++++++++-----------
geode-assembly/src/main/dist/LICENSE | 2 +-
.../http_session_mgmt/quick_start.html.md.erb | 4 +-
.../tomcat_installing_the_module.html.md.erb | 4 +-
.../tomcat_setting_up_the_module.html.md.erb | 2 +-
.../resources/dependency_classpath.txt | 46 +++++++++++-----------
13 files changed, 109 insertions(+), 109 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 994e24bf57..7fc8a34a6d 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -180,7 +180,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
- <version>4.8.141</version>
+ <version>4.8.143</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
@@ -190,17 +190,17 @@
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
- <version>6.1.6.RELEASE</version>
+ <version>6.1.8.RELEASE</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
- <version>1.8.3</version>
+ <version>1.8.4</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.6.2</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
@@ -265,12 +265,12 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>5.10.0</version>
+ <version>5.11.0</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
- <version>5.10.0</version>
+ <version>5.11.0</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
@@ -335,7 +335,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -360,12 +360,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.45.v20220203</version>
+ <version>9.4.46.v20220331</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.45.v20220203</version>
+ <version>9.4.46.v20220331</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -465,7 +465,7 @@
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
- <version>1.6.1</version>
+ <version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -620,12 +620,12 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-redis</artifactId>
- <version>4.1.74.Final</version>
+ <version>4.1.75.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.74.Final</version>
+ <version>4.1.75.Final</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
@@ -740,22 +740,22 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>2.6.5</version>
+ <version>2.6.6</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
- <version>2.6.5</version>
+ <version>2.6.6</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>2.6.5</version>
+ <version>2.6.6</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
- <version>2.6.5</version>
+ <version>2.6.6</version>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
diff --git a/build.gradle b/build.gradle
index 52a58c4f7a..ccf150ca34 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,13 +21,13 @@ plugins {
id "base"
id "idea"
id "eclipse"
- id "com.diffplug.spotless" version "6.2.2" apply false
+ id "com.diffplug.spotless" version "6.4.1" apply false
id "com.github.ben-manes.versions" version "0.42.0" apply false
- id "nebula.lint" version "17.6.1" apply false
+ id "nebula.lint" version "17.7.0" apply false
id "com.palantir.docker" version "0.32.0" apply false
id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false
id "org.ajoberstar.grgit" version "4.1.1" apply false
- id "org.nosphere.apache.rat" version "0.7.0" apply false
+ id "org.nosphere.apache.rat" version "0.7.1" apply false
id "org.sonarqube" version "3.3" apply false
id "me.champeau.gradle.japicmp" apply false // Version defined in buildSrc/build.gradle
id 'me.champeau.gradle.jmh' version '0.5.3' apply false
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index fda611119b..08be6c8dcb 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -35,7 +35,7 @@ dependencies {
}
implementation(gradleApi())
implementation('org.apache.commons:commons-lang3:3.12.0')
- implementation('org.apache.maven:maven-artifact:3.8.1')
+ implementation('org.apache.maven:maven-artifact:3.8.5')
implementation('com.google.guava:guava:31.1-jre')
implementation('me.champeau.gradle:japicmp-gradle-plugin:0.3.0')
implementation('junit:junit:4.13.2')
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 799116f165..d70167aa95 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -41,8 +41,8 @@ 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.17.2")
- deps.put("micrometer.version", "1.8.3")
- deps.put("shiro.version", "1.8.0")
+ deps.put("micrometer.version", "1.8.4")
+ deps.put("shiro.version", "1.9.0")
deps.put("slf4j-api.version", "1.7.32")
deps.put("jboss-modules.version", "1.11.0.Final")
deps.put("jackson.version", "2.13.2")
@@ -58,11 +58,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.59")
+ deps.put("tomcat9.version", "9.0.62")
// 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.45.v20220203")
+ deps.put("jetty.version", "9.4.46.v20220331")
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
deps.put("junit.version", "4.13.2")
@@ -117,11 +117,11 @@ 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.141')
+ api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.143')
api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.1')
- api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.6.RELEASE')
+ api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.8.RELEASE')
api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
- api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
+ api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.6')
api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version'))
api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2')
api(group: 'javax.annotation', name: 'jsr250-api', version: '1.0')
@@ -134,8 +134,8 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'junit', name: 'junit', version: get('junit.version'))
api(group: 'mx4j', name: 'mx4j-tools', version: '3.0.1')
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
- api(group: 'net.java.dev.jna', name: 'jna', version: '5.10.0')
- api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.10.0')
+ api(group: 'net.java.dev.jna', name: 'jna', version: '5.11.0')
+ api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.11.0')
api(group: 'net.minidev', name: 'json-smart', version: '2.4.7')
api(group: 'net.openhft', name: 'compiler', version: '2.4.1')
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
@@ -174,7 +174,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'redis.clients', name: 'jedis', version: '4.1.1')
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')
- api(group: 'org.junit-pioneer', name: 'junit-pioneer', version: '1.6.1')
+ api(group: 'org.junit-pioneer', name: 'junit-pioneer', version: '1.6.2')
}
}
@@ -247,7 +247,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('junit-vintage-engine')
}
- dependencySet(group: 'io.netty', version: '4.1.74.Final') {
+ dependencySet(group: 'io.netty', version: '4.1.75.Final') {
entry('netty-codec-redis')
entry('netty-handler')
}
@@ -283,7 +283,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('spring-webmvc')
}
- dependencySet(group: 'org.springframework.boot', version: '2.6.5') {
+ dependencySet(group: 'org.springframework.boot', version: '2.6.6') {
entry('spring-boot-starter')
entry('spring-boot-starter-jetty')
entry('spring-boot-starter-web')
diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
index a9086ada92..36433809a3 100644
--- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
+++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
@@ -43,7 +43,7 @@ public class TomcatInstall extends ContainerInstall {
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.59.zip");
+ TOMCAT9(9, "tomcat-9.0.62.zip");
private final int version;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index e1e803145c..be5b8035f2 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.45.v20220203";
+ private static final String JETTY_VERSION = "9.4.46.v20220331";
/**
* Get the version number, download URL, and container name of a generic app server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index a87204539d..d28417ced2 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -966,7 +966,7 @@ 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.141.jar
+lib/classgraph-4.8.143.jar
lib/commons-beanutils-1.9.4.jar
lib/commons-codec-1.15.jar
lib/commons-collections-3.2.2.jar
@@ -1013,19 +1013,19 @@ 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.45.v20220203.jar
-lib/jetty-io-9.4.45.v20220203.jar
-lib/jetty-security-9.4.45.v20220203.jar
-lib/jetty-server-9.4.45.v20220203.jar
-lib/jetty-servlet-9.4.45.v20220203.jar
-lib/jetty-util-9.4.45.v20220203.jar
-lib/jetty-util-ajax-9.4.45.v20220203.jar
-lib/jetty-webapp-9.4.45.v20220203.jar
-lib/jetty-xml-9.4.45.v20220203.jar
+lib/jetty-http-9.4.46.v20220331.jar
+lib/jetty-io-9.4.46.v20220331.jar
+lib/jetty-security-9.4.46.v20220331.jar
+lib/jetty-server-9.4.46.v20220331.jar
+lib/jetty-servlet-9.4.46.v20220331.jar
+lib/jetty-util-9.4.46.v20220331.jar
+lib/jetty-util-ajax-9.4.46.v20220331.jar
+lib/jetty-webapp-9.4.46.v20220331.jar
+lib/jetty-xml-9.4.46.v20220331.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
-lib/jna-5.10.0.jar
-lib/jna-platform-5.10.0.jar
+lib/jna-5.11.0.jar
+lib/jna-platform-5.11.0.jar
lib/jopt-simple-5.0.4.jar
lib/log4j-api-2.17.2.jar
lib/log4j-core-2.17.2.jar
@@ -1037,21 +1037,21 @@ 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.8.3.jar
+lib/micrometer-core-1.8.4.jar
lib/mx4j-3.0.2.jar
lib/mx4j-remote-3.0.2.jar
lib/mx4j-tools-3.0.1.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.8.0.jar
-lib/shiro-config-core-1.8.0.jar
-lib/shiro-config-ogdl-1.8.0.jar
-lib/shiro-core-1.8.0.jar
-lib/shiro-crypto-cipher-1.8.0.jar
-lib/shiro-crypto-core-1.8.0.jar
-lib/shiro-crypto-hash-1.8.0.jar
-lib/shiro-event-1.8.0.jar
-lib/shiro-lang-1.8.0.jar
+lib/shiro-cache-1.9.0.jar
+lib/shiro-config-core-1.9.0.jar
+lib/shiro-config-ogdl-1.9.0.jar
+lib/shiro-core-1.9.0.jar
+lib/shiro-crypto-cipher-1.9.0.jar
+lib/shiro-crypto-core-1.9.0.jar
+lib/shiro-crypto-hash-1.9.0.jar
+lib/shiro-event-1.9.0.jar
+lib/shiro-lang-1.9.0.jar
lib/slf4j-api-1.7.32.jar
lib/snappy-0.4.jar
lib/spring-beans-5.3.18.jar
@@ -1060,7 +1060,7 @@ lib/spring-core-5.3.18.jar
lib/spring-jcl-5.3.18.jar
lib/spring-shell-1.2.0.RELEASE.jar
lib/spring-web-5.3.18.jar
-lib/swagger-annotations-1.6.2.jar
+lib/swagger-annotations-1.6.6.jar
tools/Extensions/geode-web-0.0.0.war
tools/Extensions/geode-web-api-0.0.0.war
tools/Extensions/geode-web-management-0.0.0.war
diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
index 59cce02a2b..0f5b5386a8 100644
--- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
@@ -24,7 +24,7 @@ rmiio-2.1.2.jar
jackson-annotations-2.13.2.jar
jackson-core-2.13.2.jar
jackson-databind-2.13.2.2.jar
-swagger-annotations-1.6.2.jar
+swagger-annotations-1.6.6.jar
jopt-simple-5.0.4.jar
log4j-slf4j-impl-2.17.2.jar
log4j-core-2.17.2.jar
@@ -45,34 +45,34 @@ antlr-2.7.7.jar
istack-commons-runtime-4.0.1.jar
jaxb-impl-2.3.2.jar
commons-validator-1.7.jar
-shiro-core-1.8.0.jar
-shiro-config-ogdl-1.8.0.jar
+shiro-core-1.9.0.jar
+shiro-config-ogdl-1.9.0.jar
commons-beanutils-1.9.4.jar
commons-codec-1.15.jar
commons-collections-3.2.2.jar
commons-digester-2.1.jar
commons-io-2.11.0.jar
commons-logging-1.2.jar
-classgraph-4.8.141.jar
-micrometer-core-1.8.3.jar
+classgraph-4.8.143.jar
+micrometer-core-1.8.4.jar
fastutil-8.5.8.jar
javax.resource-api-1.7.1.jar
-jetty-webapp-9.4.45.v20220203.jar
-jetty-servlet-9.4.45.v20220203.jar
-jetty-security-9.4.45.v20220203.jar
-jetty-server-9.4.45.v20220203.jar
+jetty-webapp-9.4.46.v20220331.jar
+jetty-servlet-9.4.46.v20220331.jar
+jetty-security-9.4.46.v20220331.jar
+jetty-server-9.4.46.v20220331.jar
javax.servlet-api-3.1.0.jar
-jna-platform-5.10.0.jar
-jna-5.10.0.jar
+jna-platform-5.11.0.jar
+jna-5.11.0.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.8.0.jar
-shiro-crypto-hash-1.8.0.jar
-shiro-crypto-cipher-1.8.0.jar
-shiro-config-core-1.8.0.jar
-shiro-event-1.8.0.jar
-shiro-crypto-core-1.8.0.jar
-shiro-lang-1.8.0.jar
+shiro-cache-1.9.0.jar
+shiro-crypto-hash-1.9.0.jar
+shiro-crypto-cipher-1.9.0.jar
+shiro-config-core-1.9.0.jar
+shiro-event-1.9.0.jar
+shiro-crypto-core-1.9.0.jar
+shiro-lang-1.9.0.jar
slf4j-api-1.7.32.jar
spring-beans-5.3.18.jar
javax.activation-api-1.2.0.jar
@@ -82,8 +82,8 @@ spring-jcl-5.3.18.jar
HdrHistogram-2.1.12.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
-jetty-xml-9.4.45.v20220203.jar
-jetty-http-9.4.45.v20220203.jar
-jetty-io-9.4.45.v20220203.jar
-jetty-util-ajax-9.4.45.v20220203.jar
-jetty-util-9.4.45.v20220203.jar
+jetty-xml-9.4.46.v20220331.jar
+jetty-http-9.4.46.v20220331.jar
+jetty-io-9.4.46.v20220331.jar
+jetty-util-ajax-9.4.46.v20220331.jar
+jetty-util-9.4.46.v20220331.jar
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index a2316be800..bcd8a64d85 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -1064,7 +1064,7 @@ Apache Geode bundles the following files under the MIT License:
- Checker Qual v3.12.0 (https://checkerframework.org), Copyright (c)
2004-present by the Checker Framework developers
- - ClassGraph v4.8.141 (https://github.com/classgraph/classgraph), Copyright
+ - ClassGraph v4.8.143 (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)
diff --git a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
index ad7bd86dcb..fae1198d18 100644
--- a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
@@ -22,10 +22,10 @@ limitations under the License.
In this section you download, install, and set up the HTTP Session Management modules.
Following the Apache Tomcat convention, this page assumes the CATALINA_HOME environment variable is set to the root directory of the "binary" Tomcat distribution.
-For example, if Apache Tomcat is installed in `/usr/bin/apache-tomcat-9.0.59` then
+For example, if Apache Tomcat is installed in `/usr/bin/apache-tomcat-9.0.62` then
```
-CATALINA_HOME=/usr/bin/apache-tomcat-9.0.59
+CATALINA_HOME=/usr/bin/apache-tomcat-9.0.62
```
## <a id="quick_start__section_6A4A00B6DA404E10A5C29E5E31101445" class="no-quick-link"></a>Quick Start Instructions
diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
index 5555644cac..08fd93a5ca 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
@@ -23,10 +23,10 @@ This topic describes how to install the HTTP session management module for Tomca
1. If you have not already installed Tomcat, download the desired version from the [Apache Website](http://tomcat.apache.org/) and install it.
2. Following the Apache Tomcat convention, this page assumes the CATALINA_HOME environment variable is set to the root directory of the "binary" Tomcat distribution.
- For example, if Apache Tomcat is installed in `/usr/bin/apache-tomcat-9.0.59` then
+ For example, if Apache Tomcat is installed in `/usr/bin/apache-tomcat-9.0.62` then
```
- CATALINA_HOME=/usr/bin/apache-tomcat-9.0.59
+ CATALINA_HOME=/usr/bin/apache-tomcat-9.0.62
```
Define $CATALINA_HOME if it is not already defined.
diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
index e8fa16b9f6..1698795c3e 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
@@ -117,7 +117,7 @@ Once you've updated the configuration, you are now ready to start your tc Server
You can verify that <%=vars.product_name%> has successfully started by inspecting the Tomcat log file. For example:
``` pre
-15-Jul-2021 10:25:11.483 INFO [main] org.apache.catalina.startup.HostConfig.deployDirectory Deployment of web application directory [/Users/user/workspace/apache-tomcat-9.0.59/webapps/host-manager] has finished in [1,688] ms
+15-Jul-2021 10:25:11.483 INFO [main] org.apache.catalina.startup.HostConfig.deployDirectory Deployment of web application directory [/Users/user/workspace/apache-tomcat-9.0.62/webapps/host-manager] has finished in [1,688] ms
15-Jul-2021 10:25:11.486 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
15-Jul-2021 10:25:11.493 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [11682] milliseconds
```
diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
index 6b8669b4f3..e7f3ef42f2 100644
--- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
@@ -1,13 +1,13 @@
spring-web-5.3.18.jar
-shiro-event-1.8.0.jar
-shiro-crypto-hash-1.8.0.jar
-shiro-crypto-cipher-1.8.0.jar
-shiro-config-core-1.8.0.jar
+shiro-event-1.9.0.jar
+shiro-crypto-hash-1.9.0.jar
+shiro-crypto-cipher-1.9.0.jar
+shiro-config-core-1.9.0.jar
commons-digester-2.1.jar
commons-validator-1.7.jar
spring-jcl-5.3.18.jar
commons-codec-1.15.jar
-classgraph-4.8.141.jar
+classgraph-4.8.143.jar
jackson-databind-2.13.2.2.jar
commons-logging-1.2.jar
geode-management-0.0.0.jar
@@ -16,74 +16,74 @@ javax.activation-api-1.2.0.jar
javax.resource-api-1.7.1.jar
LatencyUtils-2.0.3.jar
jline-2.12.jar
-jetty-servlet-9.4.45.v20220203.jar
+jetty-servlet-9.4.46.v20220331.jar
spring-core-5.3.18.jar
-jetty-util-ajax-9.4.45.v20220203.jar
+jetty-util-ajax-9.4.46.v20220331.jar
geode-cq-0.0.0.jar
geode-old-client-support-0.0.0.jar
javax.servlet-api-3.1.0.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.8.0.jar
+shiro-cache-1.9.0.jar
httpcore-4.4.15.jar
spring-beans-5.3.18.jar
lucene-queries-6.6.6.jar
-shiro-core-1.8.0.jar
+shiro-core-1.9.0.jar
HikariCP-4.0.3.jar
slf4j-api-1.7.32.jar
geode-http-service-0.0.0.jar
commons-collections-3.2.2.jar
httpclient-4.5.13.jar
-jna-5.10.0.jar
+jna-5.11.0.jar
geode-lucene-0.0.0.jar
lucene-core-6.6.6.jar
fastutil-8.5.8.jar
geode-gfsh-0.0.0.jar
-jetty-http-9.4.45.v20220203.jar
+jetty-http-9.4.46.v20220331.jar
geode-memcached-0.0.0.jar
rmiio-2.1.2.jar
geode-tcp-server-0.0.0.jar
log4j-jcl-2.17.2.jar
geode-connectors-0.0.0.jar
jackson-core-2.13.2.jar
-jetty-util-9.4.45.v20220203.jar
+jetty-util-9.4.46.v20220331.jar
log4j-slf4j-impl-2.17.2.jar
lucene-analyzers-common-6.6.6.jar
geode-membership-0.0.0.jar
-jetty-webapp-9.4.45.v20220203.jar
+jetty-webapp-9.4.46.v20220331.jar
commons-lang3-3.12.0.jar
jopt-simple-5.0.4.jar
-swagger-annotations-1.6.2.jar
+swagger-annotations-1.6.6.jar
snappy-0.4.jar
geode-wan-0.0.0.jar
log4j-api-2.17.2.jar
geode-serialization-0.0.0.jar
istack-commons-runtime-4.0.1.jar
lucene-queryparser-6.6.6.jar
-jetty-io-9.4.45.v20220203.jar
+jetty-io-9.4.46.v20220331.jar
geode-deployment-legacy-0.0.0.jar
commons-beanutils-1.9.4.jar
log4j-core-2.17.2.jar
-shiro-crypto-core-1.8.0.jar
+shiro-crypto-core-1.9.0.jar
jaxb-api-2.3.1.jar
geode-unsafe-0.0.0.jar
spring-shell-1.2.0.RELEASE.jar
jaxb-impl-2.3.2.jar
-jna-platform-5.10.0.jar
+jna-platform-5.11.0.jar
log4j-jul-2.17.2.jar
HdrHistogram-2.1.12.jar
jackson-annotations-2.13.2.jar
-micrometer-core-1.8.3.jar
-shiro-config-ogdl-1.8.0.jar
+micrometer-core-1.8.4.jar
+shiro-config-ogdl-1.9.0.jar
geode-log4j-0.0.0.jar
lucene-analyzers-phonetic-6.6.6.jar
spring-context-5.3.18.jar
-jetty-security-9.4.45.v20220203.jar
+jetty-security-9.4.46.v20220331.jar
geode-logging-0.0.0.jar
commons-io-2.11.0.jar
-shiro-lang-1.8.0.jar
+shiro-lang-1.9.0.jar
javax.transaction-api-1.3.jar
geode-common-0.0.0.jar
antlr-2.7.7.jar
-jetty-xml-9.4.45.v20220203.jar
+jetty-xml-9.4.46.v20220331.jar
geode-rebalancer-0.0.0.jar
-jetty-server-9.4.45.v20220203.jar
+jetty-server-9.4.46.v20220331.jar