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 217be41 GEODE-8496: top up dependency updates (#5772) 217be41 is described below commit 217be41f087072026ea3b411b89107700edfb5f7 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Wed Nov 25 14:51:43 2020 -0800 GEODE-8496: top up dependency updates (#5772) * Bump jetty from 9.4.34.v20201102 to 9.4.35.v20201120 * Bump netty-all from 4.1.53.Final to 4.1.54.Final * Bump lettuce-core from 5.3.4.RELEASE to 5.3.5.RELEASE * Bump fastutil from 8.4.2 to 8.4.3 * Bump pmd from 6.28.0 to 6.29.0 * Bump tomcat9 from 9.0.39 to 9.0.40 * Bump tomcat8 from 8.5.59 to 8.5.60 * Bump tomcat7 from 7.0.106 to 7.0.107 * Bump bcpkix-jdk15on from 1.66 to 1.67 * Bump spring-boot from 2.3.4.RELEASE to 2.4.0 * Bump spring-hateoas from 1.1.2.RELEASE to 1.2.1 * Bump spring-session-data-redis from 2.3.1.RELEASE to 2.4.1 * Bump spring from 5.2.9.RELEASE to 5.3.1 * Bump junit-quickcheck from 0.9.5 to 1.0 * Bump assertj from 3.17.2 to 3.18.1 * Bump micrometer from 1.5.5 to 1.6.1 * Bump testcontainers from 1.14.3 to 1.15.0 * Bump powermock from 2.0.7 to 2.0.9 * Bump mockito from 3.5.15 to 3.6.28 * Bump log4j from 2.13.3 to 2.14.0 --- .../src/test/resources/expected-pom.xml | 76 +++++++++++----------- .../gradle/plugins/DependencyConstraints.groovy | 42 ++++++------ .../apache/geode/session/tests/TomcatInstall.java | 6 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 43 ++++++------ .../resources/dependency_classpath.txt | 37 ++++++----- .../integrationTest/resources/expected_jars.txt | 1 + .../cli/remote/OnlineCommandProcessor.java | 3 +- .../org/apache/geode/cache/util/AutoBalancer.java | 17 +++-- geode-wan/build.gradle | 2 +- .../support/RestServersResultCollector.java | 4 +- .../support/LoginHandlerInterceptor.java | 12 ++-- 12 files changed, 128 insertions(+), 117 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 6f52548..235c75f 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -244,13 +244,13 @@ <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-core</artifactId> - <version>1.5.5</version> + <version>1.6.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.1.53.Final</version> + <version>4.1.54.Final</version> <scope>compile</scope> </dependency> <dependency> @@ -262,7 +262,7 @@ <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>8.4.2</version> + <version>8.4.3</version> <scope>compile</scope> </dependency> <dependency> @@ -358,13 +358,13 @@ <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-java</artifactId> - <version>6.28.0</version> + <version>6.29.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-test</artifactId> - <version>6.28.0</version> + <version>6.29.0</version> <scope>compile</scope> </dependency> <dependency> @@ -418,7 +418,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.17.2</version> + <version>3.18.1</version> <scope>compile</scope> </dependency> <dependency> @@ -430,7 +430,7 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.66</version> + <version>1.67</version> <scope>compile</scope> </dependency> <dependency> @@ -442,13 +442,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.4.34.v20201102</version> + <version>9.4.35.v20201120</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>9.4.34.v20201102</version> + <version>9.4.35.v20201120</version> <scope>compile</scope> </dependency> <dependency> @@ -478,7 +478,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.5.15</version> + <version>3.6.28</version> <scope>compile</scope> </dependency> <dependency> @@ -514,7 +514,7 @@ <dependency> <groupId>org.springframework.hateoas</groupId> <artifactId>spring-hateoas</artifactId> - <version>1.1.2.RELEASE</version> + <version>1.2.1</version> <scope>compile</scope> </dependency> <dependency> @@ -532,7 +532,7 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.14.3</version> + <version>1.15.0</version> <scope>compile</scope> </dependency> <dependency> @@ -550,7 +550,7 @@ <dependency> <groupId>io.lettuce</groupId> <artifactId>lettuce-core</artifactId> - <version>5.3.4.RELEASE</version> + <version>5.3.5.RELEASE</version> <scope>compile</scope> </dependency> <dependency> @@ -604,13 +604,13 @@ <dependency> <groupId>com.pholser</groupId> <artifactId>junit-quickcheck-core</artifactId> - <version>0.9.5</version> + <version>1.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.pholser</groupId> <artifactId>junit-quickcheck-generators</artifactId> - <version>0.9.5</version> + <version>1.0</version> <scope>compile</scope> </dependency> <dependency> @@ -640,31 +640,31 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.13.3</version> + <version>2.14.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.13.3</version> + <version>2.14.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.13.3</version> + <version>2.14.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jul</artifactId> - <version>2.13.3</version> + <version>2.14.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.13.3</version> + <version>2.14.0</version> <scope>compile</scope> </dependency> <dependency> @@ -706,19 +706,19 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito2</artifactId> - <version>2.0.7</version> + <version>2.0.9</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-core</artifactId> - <version>2.0.7</version> + <version>2.0.9</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>2.0.7</version> + <version>2.0.9</version> <scope>compile</scope> </dependency> <dependency> @@ -796,91 +796,91 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aspects</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>5.2.9.RELEASE</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>2.3.4.RELEASE</version> + <version>2.4.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jetty</artifactId> - <version>2.3.4.RELEASE</version> + <version>2.4.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>2.3.4.RELEASE</version> + <version>2.4.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> - <version>2.3.4.RELEASE</version> + <version>2.4.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.session</groupId> <artifactId>spring-session-data-redis</artifactId> - <version>2.3.1.RELEASE</version> + <version>2.4.1</version> <scope>compile</scope> </dependency> <dependency> 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 35add7b..73ba727 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 @@ -37,11 +37,11 @@ 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.4.2") + deps.put("fastutil.version", "8.4.3") deps.put("javax.transaction-api.version", "1.3") deps.put("jgroups.version", "3.6.14.Final") - deps.put("log4j.version", "2.13.3") - deps.put("micrometer.version", "1.5.5") + deps.put("log4j.version", "2.14.0") + deps.put("micrometer.version", "1.6.1") deps.put("shiro.version", "1.7.0") deps.put("slf4j-api.version", "1.7.30") @@ -51,13 +51,13 @@ 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.106") - deps.put("tomcat8.version", "8.5.59") - deps.put("tomcat9.version", "9.0.39") + deps.put("tomcat7.version", "7.0.107") + deps.put("tomcat8.version", "8.5.60") + deps.put("tomcat9.version", "9.0.40") // 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.34.v20201102") + deps.put("jetty.version", "9.4.35.v20201120") // These version numbers are consumed by protobuf configurations that are plugin-specific and not // part of the typical Gradle dependency configurations. @@ -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.53.Final') + api(group: 'io.netty', name: 'netty-all', version: '4.1.54.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') @@ -138,8 +138,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.0') api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4') - 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.sourceforge.pmd', name: 'pmd-java', version: '6.29.0') + api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.29.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,9 +148,9 @@ class DependencyConstraints implements Plugin<Project> { 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.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.66') + 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.eclipse.jetty', name: 'jetty-server', version: get('jetty.version')) api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version')) @@ -158,19 +158,19 @@ class DependencyConstraints implements Plugin<Project> { 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.15') + api(group: 'org.mockito', name: 'mockito-core', version: '3.6.28') api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224') 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')) - api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.1.2.RELEASE') + api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.2.1') 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: 'org.testcontainers', name: 'testcontainers', version: '1.15.0') api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0') api(group: 'redis.clients', name: 'jedis', version: '3.3.0') - api(group: 'io.lettuce', name: 'lettuce-core', version: '5.3.4.RELEASE') + api(group: 'io.lettuce', name: 'lettuce-core', version: '5.3.5.RELEASE') api(group: 'xerces', name: 'xercesImpl', version: '2.12.0') } } @@ -191,7 +191,7 @@ class DependencyConstraints implements Plugin<Project> { entry('docker-compose-rule-junit4') } - dependencySet(group: 'com.pholser', version: '0.9.5') { + dependencySet(group: 'com.pholser', version: '1.0') { entry('junit-quickcheck-core') entry('junit-quickcheck-generators') } @@ -226,7 +226,7 @@ class DependencyConstraints implements Plugin<Project> { entry('hamcrest') } - dependencySet(group: 'org.powermock', version: '2.0.7') { + dependencySet(group: 'org.powermock', version: '2.0.9') { entry('powermock-api-mockito2') entry('powermock-core') entry('powermock-module-junit4') @@ -250,7 +250,7 @@ class DependencyConstraints implements Plugin<Project> { entry('spring-security-oauth2-jose') } - dependencySet(group: 'org.springframework', version: '5.2.9.RELEASE') { + dependencySet(group: 'org.springframework', version: '5.3.1') { entry('spring-aspects') entry('spring-beans') entry('spring-context') @@ -263,14 +263,14 @@ class DependencyConstraints implements Plugin<Project> { entry('spring-webmvc') } - dependencySet(group: 'org.springframework.boot', version: '2.3.4.RELEASE') { + dependencySet(group: 'org.springframework.boot', version: '2.4.0') { entry('spring-boot-starter') entry('spring-boot-starter-jetty') entry('spring-boot-starter-web') entry('spring-boot-starter-data-redis') } - dependencySet(group: 'org.springframework.session', version: '2.3.1.RELEASE') { + dependencySet(group: 'org.springframework.session', version: '2.4.1') { entry('spring-session-data-redis') } } 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 4c242c8..428b958 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 @@ -41,9 +41,9 @@ 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.59.zip"), - TOMCAT9(9, "tomcat-9.0.39.zip"); + TOMCAT7(7, "tomcat-7.0.107.zip"), + TOMCAT8(8, "tomcat-8.5.60.zip"), + TOMCAT9(9, "tomcat-9.0.40.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 01aa5a8..f364c30 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.34.v20201102"; + private static final String JETTY_VERSION = "9.4.35.v20201120"; /** * 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 5cf74ae..e6c2af5 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/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.4.2.jar +lib/fastutil-8.4.3.jar lib/findbugs-annotations-1.3.9-1.jar lib/geo-0.7.7.jar lib/geode-common-0.0.0.jar @@ -1027,34 +1027,35 @@ 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.34.v20201102.jar -lib/jetty-io-9.4.34.v20201102.jar -lib/jetty-security-9.4.34.v20201102.jar -lib/jetty-server-9.4.34.v20201102.jar -lib/jetty-servlet-9.4.34.v20201102.jar -lib/jetty-util-9.4.34.v20201102.jar -lib/jetty-webapp-9.4.34.v20201102.jar -lib/jetty-xml-9.4.34.v20201102.jar +lib/jetty-http-9.4.35.v20201120.jar +lib/jetty-io-9.4.35.v20201120.jar +lib/jetty-security-9.4.35.v20201120.jar +lib/jetty-server-9.4.35.v20201120.jar +lib/jetty-servlet-9.4.35.v20201120.jar +lib/jetty-util-9.4.35.v20201120.jar +lib/jetty-util-ajax-9.4.35.v20201120.jar +lib/jetty-webapp-9.4.35.v20201120.jar +lib/jetty-xml-9.4.35.v20201120.jar lib/jgroups-3.6.14.Final.jar lib/jline-2.12.jar lib/jna-5.6.0.jar lib/jna-platform-5.6.0.jar lib/jopt-simple-5.0.4.jar -lib/log4j-api-2.13.3.jar -lib/log4j-core-2.13.3.jar -lib/log4j-jcl-2.13.3.jar -lib/log4j-jul-2.13.3.jar -lib/log4j-slf4j-impl-2.13.3.jar +lib/log4j-api-2.14.0.jar +lib/log4j-core-2.14.0.jar +lib/log4j-jcl-2.14.0.jar +lib/log4j-jul-2.14.0.jar +lib/log4j-slf4j-impl-2.14.0.jar lib/lucene-analyzers-common-6.6.6.jar 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.5.5.jar +lib/micrometer-core-1.6.1.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.53.Final.jar +lib/netty-all-4.1.54.Final.jar lib/protobuf-java-3.11.4.jar lib/ra.jar lib/rmiio-2.1.2.jar @@ -1069,12 +1070,12 @@ lib/shiro-event-1.7.0.jar lib/shiro-lang-1.7.0.jar lib/slf4j-api-1.7.30.jar lib/snappy-0.4.jar -lib/spring-beans-5.2.9.RELEASE.jar -lib/spring-context-5.2.9.RELEASE.jar -lib/spring-core-5.2.9.RELEASE.jar -lib/spring-jcl-5.2.9.RELEASE.jar +lib/spring-beans-5.3.1.jar +lib/spring-context-5.3.1.jar +lib/spring-core-5.3.1.jar +lib/spring-jcl-5.3.1.jar lib/spring-shell-1.2.0.RELEASE.jar -lib/spring-web-5.2.9.RELEASE.jar +lib/spring-web-5.3.1.jar lib/swagger-annotations-1.6.2.jar tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.zip tools/Extensions/geode-web-0.0.0.war diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt index 4efd863..dfd59a4 100644 --- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt @@ -27,8 +27,8 @@ httpcore-4.4.13.jar HikariCP-3.4.5.jar commons-lang3-3.11.jar jaxb-api-2.3.1.jar -log4j-jcl-2.13.3.jar -log4j-api-2.13.3.jar +log4j-jcl-2.14.0.jar +log4j-api-2.14.0.jar spring-shell-1.2.0.RELEASE.jar rmiio-2.1.2.jar antlr-2.7.7.jar @@ -43,14 +43,14 @@ 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.5.5.jar +micrometer-core-1.6.1.jar swagger-annotations-1.6.2.jar -fastutil-8.4.2.jar +fastutil-8.4.3.jar javax.resource-api-1.7.1.jar -jetty-webapp-9.4.34.v20201102.jar -jetty-servlet-9.4.34.v20201102.jar -jetty-security-9.4.34.v20201102.jar -jetty-server-9.4.34.v20201102.jar +jetty-webapp-9.4.35.v20201120.jar +jetty-servlet-9.4.35.v20201120.jar +jetty-security-9.4.35.v20201120.jar +jetty-server-9.4.35.v20201120.jar javax.servlet-api-3.1.0.jar jna-platform-5.6.0.jar jna-5.6.0.jar @@ -65,20 +65,21 @@ shiro-event-1.7.0.jar shiro-crypto-core-1.7.0.jar shiro-lang-1.7.0.jar slf4j-api-1.7.30.jar -spring-core-5.2.9.RELEASE.jar +spring-core-5.3.1.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.2.9.RELEASE.jar -jetty-http-9.4.34.v20201102.jar -jetty-io-9.4.34.v20201102.jar -jetty-xml-9.4.34.v20201102.jar -jetty-util-9.4.34.v20201102.jar -log4j-slf4j-impl-2.13.3.jar -log4j-core-2.13.3.jar -log4j-jul-2.13.3.jar +spring-jcl-5.3.1.jar +jetty-http-9.4.35.v20201120.jar +jetty-io-9.4.35.v20201120.jar +jetty-xml-9.4.35.v20201120.jar +jetty-util-9.4.35.v20201120.jar +jetty-util-ajax-9.4.35.v20201120.jar +log4j-slf4j-impl-2.14.0.jar +log4j-core-2.14.0.jar +log4j-jul-2.14.0.jar lucene-analyzers-phonetic-6.6.6.jar lucene-analyzers-common-6.6.6.jar lucene-queryparser-6.6.6.jar @@ -86,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.53.Final.jar +netty-all-4.1.54.Final.jar diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt index 4a324f4..463ee4d 100644 --- a/geode-assembly/src/integrationTest/resources/expected_jars.txt +++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt @@ -48,6 +48,7 @@ jetty-security jetty-server jetty-servlet jetty-util +jetty-util-ajax jetty-webapp jetty-xml jgroups diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessor.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessor.java index 6d70a33..d7b93dd 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessor.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessor.java @@ -24,7 +24,6 @@ import java.util.Properties; import org.springframework.shell.core.Parser; import org.springframework.shell.event.ParseResult; -import org.springframework.util.StringUtils; import org.apache.geode.annotations.VisibleForTesting; import org.apache.geode.cache.Cache; @@ -97,7 +96,7 @@ public class OnlineCommandProcessor implements CommandProcessor { List<String> stagedFilePaths) { CommentSkipHelper commentSkipper = new CommentSkipHelper(); String commentLessLine = commentSkipper.skipComments(command); - if (StringUtils.isEmpty(commentLessLine)) { + if (commentLessLine == null || commentLessLine.toString().isEmpty()) { return null; } diff --git a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java index 4d10861..79bbf9b 100644 --- a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java +++ b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java @@ -14,6 +14,9 @@ */ package org.apache.geode.cache.util; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -27,7 +30,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.logging.log4j.Logger; -import org.springframework.scheduling.support.CronSequenceGenerator; +import org.springframework.scheduling.support.CronExpression; import org.apache.geode.GemFireConfigException; import org.apache.geode.annotations.Experimental; @@ -195,7 +198,7 @@ public class AutoBalancer implements Declarable { */ private class CronScheduler implements AuditScheduler { final ScheduledExecutorService trigger; - CronSequenceGenerator generator; + CronExpression generator; CronScheduler() { trigger = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { @@ -219,7 +222,7 @@ public class AutoBalancer implements Declarable { } try { - generator = new CronSequenceGenerator(schedule); + generator = CronExpression.parse(schedule); } catch (Exception e) { throw new GemFireConfigException("Cron expression could not be parsed: " + schedule, e); } @@ -229,8 +232,12 @@ public class AutoBalancer implements Declarable { private void submitNext() { long currentTime = clock.currentTimeMillis(); - Date nextSchedule = generator.next(new Date(currentTime)); - long delay = nextSchedule.getTime() - currentTime; + Instant currentInstant = new Date(currentTime).toInstant(); + ZoneId localTimeZone = ZoneId.systemDefault(); + LocalDateTime now = currentInstant.atZone(localTimeZone).toLocalDateTime(); + LocalDateTime next = generator.next(now); + long nextSchedule = 1000 * next.toEpochSecond(localTimeZone.getRules().getOffset(next)); + long delay = nextSchedule - currentTime; if (logger.isDebugEnabled()) { logger.debug("Now={}, next audit time={}, delay={} ms", new Date(currentTime), nextSchedule, diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle index 1ed32cc..b529003 100644 --- a/geode-wan/build.gradle +++ b/geode-wan/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation(project(':geode-tcp-server')) implementation(project(':geode-core')) - compileOnly('org.apache.logging.log4j:log4j-api:2.13.3') + compileOnly('org.apache.logging.log4j:log4j-api:2.14.0') testImplementation(project(':geode-junit')) testImplementation('org.assertj:assertj-core') diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RestServersResultCollector.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RestServersResultCollector.java index 7cc96cf..b94fbee 100644 --- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RestServersResultCollector.java +++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RestServersResultCollector.java @@ -17,8 +17,6 @@ package org.apache.geode.rest.internal.web.controllers.support; import java.util.ArrayList; import java.util.concurrent.TimeUnit; -import org.springframework.util.StringUtils; - import org.apache.geode.cache.execute.FunctionException; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; @@ -29,7 +27,7 @@ public class RestServersResultCollector<String, Object> implements ResultCollect @Override public void addResult(DistributedMember memberID, String result) { - if (!StringUtils.isEmpty(result)) { + if (result != null && result.toString().length() > 0) { resultList.add(result); } } diff --git a/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java b/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java index 6bd154e..e98fc72 100644 --- a/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java +++ b/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java @@ -26,7 +26,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.logging.log4j.Logger; import org.springframework.web.context.ServletContextAware; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.AsyncHandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; import org.apache.geode.annotations.VisibleForTesting; import org.apache.geode.cache.internal.HttpService; @@ -42,12 +43,11 @@ import org.apache.geode.management.internal.security.ResourceConstants; * * @see javax.servlet.http.HttpServletRequest * @see javax.servlet.http.HttpServletResponse - * @see org.springframework.web.servlet.handler.HandlerInterceptorAdapter + * @see org.springframework.web.servlet.AsyncHandlerInterceptor * @since GemFire 8.0 */ @SuppressWarnings("unused") -public class LoginHandlerInterceptor extends HandlerInterceptorAdapter - implements ServletContextAware { +public class LoginHandlerInterceptor implements AsyncHandlerInterceptor, ServletContextAware { private static final Logger logger = LogService.getLogger(); @@ -137,4 +137,8 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter securityService = (SecurityService) servletContext .getAttribute(HttpService.SECURITY_SERVICE_SERVLET_CONTEXT_PARAM); } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, + ModelAndView modelAndView) {} }