You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by db...@apache.org on 2020/01/22 22:48:02 UTC
[geode] 01/05: GEODE-7294: Update dependencies for v1.12
This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to tag rel/v1.11.0.1
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4cc5c735d27bca38f2dbed178461dbf0cf2fe012
Author: Anthony Baker <ab...@apache.org>
AuthorDate: Thu Dec 26 16:15:34 2019 -0800
GEODE-7294: Update dependencies for v1.12
Update many but not all dependencies.
---
.../src/test/resources/expected-pom.xml | 90 +++++++++++-----------
.../gradle/plugins/DependencyConstraints.groovy | 72 ++++++++---------
.../apache/geode/session/tests/TomcatInstall.java | 4 +-
.../integrationTest/resources/assembly_content.txt | 69 ++++++++---------
.../resources/dependency_classpath.txt | 68 ++++++++--------
geode-connectors/build.gradle | 2 +-
.../cli/CreateDataSourceCommandDUnitTest.java | 2 +-
.../cli/DeregisterDriverCommandDUnitTest.java | 2 +-
.../internal/cli/ListDriversCommandDUnitTest.java | 4 +-
.../cli/RegisterDriverCommandDUnitTest.java | 2 +-
...eneIndexCreationPersistenceIntegrationTest.java | 2 +-
geode-wan/build.gradle | 4 +-
static-analysis/pmd-rules/build.gradle | 6 +-
13 files changed, 164 insertions(+), 163 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 d41c059..ba90673 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>2.5.0</version>
+ <version>2.7.3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -94,19 +94,19 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.0-jre</version>
+ <version>28.1-jre</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
- <version>0.8.6</version>
+ <version>0.8.10</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.6.1</version>
+ <version>3.10.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -118,7 +118,7 @@
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
- <version>1.1.2</version>
+ <version>2.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -130,7 +130,7 @@
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
- <version>2.2</version>
+ <version>3.0.9</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -142,13 +142,13 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>3.2.0</version>
+ <version>3.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
+ <version>1.9.4</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -172,7 +172,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -208,19 +208,19 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.42.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
- <version>8.2.2</version>
+ <version>8.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -286,7 +286,7 @@
<dependency>
<groupId>net.openhft</groupId>
<artifactId>compiler</artifactId>
- <version>2.3.1</version>
+ <version>2.3.4</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -298,7 +298,7 @@
<dependency>
<groupId>net.spy</groupId>
<artifactId>spymemcached</artifactId>
- <version>2.12.2</version>
+ <version>2.12.3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -310,7 +310,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.9</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -322,43 +322,43 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.6</version>
+ <version>4.5.10</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.10</version>
+ <version>4.4.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.11.1</version>
+ <version>3.13.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>3.1.2</version>
+ <version>3.1.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.60</version>
+ <version>1.63</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>1.6.10</version>
+ <version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -424,7 +424,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.2.2</version>
+ <version>42.2.8</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -436,13 +436,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>1.7.28</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.5.20</version>
+ <version>1.5.23</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -544,13 +544,13 @@
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
- <version>0.8.1</version>
+ <version>0.9</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-generators</artifactId>
- <version>0.8.1</version>
+ <version>0.9</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -580,61 +580,61 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
- <version>6.6.2</version>
+ <version>6.6.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-phonetic</artifactId>
- <version>6.6.2</version>
+ <version>6.6.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>6.6.2</version>
+ <version>6.6.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
- <version>6.6.2</version>
+ <version>6.6.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
- <version>6.6.2</version>
+ <version>6.6.6</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -658,43 +658,43 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.0-beta.5</version>
+ <version>2.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
- <version>2.0.0-beta.5</version>
+ <version>2.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>2.0.0-beta.5</version>
+ <version>2.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
- <version>3.13.0</version>
+ <version>3.141.59</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
- <version>3.13.0</version>
+ <version>3.141.59</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
- <version>3.13.0</version>
+ <version>3.141.59</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
- <version>3.13.0</version>
+ <version>3.141.59</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 3bfeec7..99f1c58 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
@@ -35,15 +35,15 @@ class DependencyConstraints implements Plugin<Project> {
// Some of these are referenced below as well
deps.put("antlr.version", "2.7.7")
deps.put("commons-io.version", "2.6")
- deps.put("commons-lang3.version", "3.8.1")
+ deps.put("commons-lang3.version", "3.9")
deps.put("commons-validator.version", "1.6")
- deps.put("fastutil.version", "8.2.2")
+ deps.put("fastutil.version", "8.3.0")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
- deps.put("log4j.version", "2.12.0")
- deps.put("micrometer.version", "1.2.0")
- deps.put("shiro.version", "1.4.0")
- deps.put("slf4j-api.version", "1.7.25")
+ deps.put("log4j.version", "2.12.1")
+ deps.put("micrometer.version", "1.2.1")
+ deps.put("shiro.version", "1.4.1")
+ deps.put("slf4j-api.version", "1.7.28")
// 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
@@ -51,8 +51,8 @@ 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.90")
- deps.put("tomcat8.version", "8.5.34")
+ deps.put("tomcat7.version", "7.0.96")
+ deps.put("tomcat8.version", "8.5.46")
deps.put("tomcat9.version", "9.0.12")
// The jetty version is also hard-coded in geode-assembly:test
@@ -61,9 +61,9 @@ class DependencyConstraints implements Plugin<Project> {
// These version numbers are consumed by protobuf configurations that are plugin-specific and not
// part of the typical Gradle dependency configurations.
- deps.put("protoc.version", "3.6.1")
- deps.put("protobuf-gradle-plugin.version", "0.8.6")
- deps.put("protobuf-java.version", "3.6.1")
+ deps.put("protoc.version", "3.10.0")
+ deps.put("protobuf-gradle-plugin.version", "0.8.10")
+ deps.put("protobuf-java.version", "3.10.0")
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
deps.put("junit.version", "4.12")
@@ -83,37 +83,37 @@ class DependencyConstraints implements Plugin<Project> {
project.dependencies {
constraints {
// informal, inter-group dependencySet
- api('com.sun.xml.bind:jaxb-impl:2.3.1')
+ api('com.sun.xml.bind:jaxb-impl:2.3.2')
api('javax.xml.bind:jaxb-api:2.3.1')
api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
- api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.5.0')
+ api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.3')
api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.10.0')
api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.1')
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.guava', name: 'guava', version: '27.0-jre')
+ api(group: 'com.google.guava', name: 'guava', version: '28.1-jre')
api(group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: get('protobuf-gradle-plugin.version'))
api(group: 'com.google.protobuf', name: 'protobuf-java', version: get('protobuf-java.version'))
api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
- api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '1.1.2')
+ api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.1')
api(group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0')
- api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '2.2')
- api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.10.2')
- api(group: 'com.zaxxer', name: 'HikariCP', version: '3.2.0')
- api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3')
+ api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.9')
+ api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.12.0')
+ api(group: 'com.zaxxer', name: 'HikariCP', version: '3.4.1')
+ api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4')
api(group: 'commons-collections', name: 'commons-collections', version: '3.2.2')
api(group: 'commons-configuration', name: 'commons-configuration', version: '1.10')
api(group: 'commons-digester', name: 'commons-digester', version: '2.1')
- api(group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.3')
+ api(group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4')
api(group: 'commons-io', name: 'commons-io', version: get('commons-io.version'))
api(group: 'commons-logging', name: 'commons-logging', version: '1.2')
api(group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1')
api(group: 'commons-validator', name: 'commons-validator', version: get('commons-validator.version'))
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.31.Final')
+ api(group: 'io.netty', name: 'netty-all', version: '4.1.42.Final')
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')
@@ -125,19 +125,19 @@ class DependencyConstraints implements Plugin<Project> {
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: '4.1.0')
- api(group: 'net.openhft', name: 'compiler', version: '2.3.1')
+ api(group: 'net.openhft', name: 'compiler', version: '2.3.4')
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
- api(group: 'net.spy', name: 'spymemcached', version: '2.12.2')
+ api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
api(group: 'org.apache.bcel', name: 'bcel', version: '6.2')
api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))
api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
- api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6')
- api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10')
+ api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.10')
+ api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.12')
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
- api(group: 'org.assertj', name: 'assertj-core', version: '3.11.1')
- api(group: 'org.awaitility', name: 'awaitility', version: '3.1.2')
- api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60')
- api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.10')
+ api(group: 'org.assertj', name: 'assertj-core', version: '3.13.2')
+ api(group: 'org.awaitility', name: 'awaitility', version: '3.1.6')
+ api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.63')
+ api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.7.7')
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
@@ -148,11 +148,11 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'org.mockito', name: 'mockito-core', version: '2.23.0')
api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.21')
- api(group: 'org.postgresql', name: 'postgresql', version: '42.2.2')
+ 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: 'io.swagger', name: 'swagger-annotations', version: '1.5.20')
- api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '0.25.0.RELEASE')
+ api(group: 'io.swagger', name: 'swagger-annotations', version: '1.5.23')
+ api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.0.1.RELEASE')
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: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
@@ -180,7 +180,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('docker-compose-rule-junit4')
}
- dependencySet(group: 'com.pholser', version: '0.8.1') {
+ dependencySet(group: 'com.pholser', version: '0.9') {
entry('junit-quickcheck-core')
entry('junit-quickcheck-generators')
}
@@ -203,7 +203,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('log4j-slf4j-impl')
}
- dependencySet(group: 'org.apache.lucene', version: '6.6.2') {
+ dependencySet(group: 'org.apache.lucene', version: '6.6.6') {
entry('lucene-analyzers-common')
entry('lucene-analyzers-phonetic')
entry('lucene-core')
@@ -217,13 +217,13 @@ class DependencyConstraints implements Plugin<Project> {
entry('hamcrest-library')
}
- dependencySet(group: 'org.powermock', version: '2.0.0-beta.5') {
+ dependencySet(group: 'org.powermock', version: '2.0.2') {
entry('powermock-api-mockito2')
entry('powermock-core')
entry('powermock-module-junit4')
}
- dependencySet(group: 'org.seleniumhq.selenium', version: '3.13.0') {
+ dependencySet(group: 'org.seleniumhq.selenium', version: '3.141.59') {
entry('selenium-api')
entry('selenium-chrome-driver')
entry('selenium-remote-driver')
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 1a1d555..8664058 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,8 +41,8 @@ public class TomcatInstall extends ContainerInstall {
*/
public enum TomcatVersion {
TOMCAT6(6, "tomcat-6.0.37.zip"),
- TOMCAT7(7, "tomcat-7.0.90.zip"),
- TOMCAT8(8, "tomcat-8.5.34.zip"),
+ TOMCAT7(7, "tomcat-7.0.96.zip"),
+ TOMCAT8(8, "tomcat-8.5.46.zip"),
TOMCAT9(9, "tomcat-9.0.12.zip");
private final int version;
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 9985d73..87af445 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -935,22 +935,21 @@ javadoc/script.js
javadoc/serialized-form.html
javadoc/stylesheet.css
lib/HdrHistogram-2.1.11.jar
-lib/HikariCP-3.2.0.jar
+lib/HikariCP-3.4.1.jar
lib/LatencyUtils-2.0.3.jar
lib/antlr-2.7.7.jar
lib/classgraph-4.8.52.jar
-lib/commons-beanutils-1.9.3.jar
-lib/commons-codec-1.10.jar
+lib/commons-beanutils-1.9.4.jar
+lib/commons-codec-1.11.jar
lib/commons-collections-3.2.2.jar
lib/commons-digester-2.1.jar
lib/commons-io-2.6.jar
-lib/commons-lang3-3.8.1.jar
+lib/commons-lang3-3.9.jar
lib/commons-logging-1.2.jar
lib/commons-math3-3.2.jar
lib/commons-modeler-2.0.1.jar
lib/commons-validator-1.6.jar
-lib/fastutil-8.2.2.jar
-lib/findbugs-annotations-1.3.9-1.jar
+lib/fastutil-8.3.0.jar
lib/geo-0.7.1.jar
lib/geode-common-0.0.0.jar
lib/geode-connectors-0.0.0.jar
@@ -974,9 +973,9 @@ lib/geode-unsafe-0.0.0.jar
lib/geode-wan-0.0.0.jar
lib/gfsh-dependencies.jar
lib/grumpy-core-0.2.2.jar
-lib/httpclient-4.5.6.jar
-lib/httpcore-4.4.10.jar
-lib/istack-commons-runtime-2.2.jar
+lib/httpclient-4.5.10.jar
+lib/httpcore-4.4.12.jar
+lib/istack-commons-runtime-3.0.9.jar
lib/jackson-annotations-2.10.0.jar
lib/jackson-core-2.10.0.jar
lib/jackson-databind-2.10.0.jar
@@ -988,7 +987,7 @@ lib/javax.resource-api-1.7.1.jar
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.1.jar
+lib/jaxb-impl-2.3.2.jar
lib/jetty-http-9.4.21.v20190926.jar
lib/jetty-io-9.4.21.v20190926.jar
lib/jetty-security-9.4.21.v20190926.jar
@@ -1001,34 +1000,34 @@ lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-4.1.0.jar
lib/jopt-simple-5.0.4.jar
-lib/log4j-api-2.12.0.jar
-lib/log4j-core-2.12.0.jar
-lib/log4j-jcl-2.12.0.jar
-lib/log4j-jul-2.12.0.jar
-lib/log4j-slf4j-impl-2.12.0.jar
-lib/lucene-analyzers-common-6.6.2.jar
-lib/lucene-analyzers-phonetic-6.6.2.jar
-lib/lucene-core-6.6.2.jar
-lib/lucene-queries-6.6.2.jar
-lib/lucene-queryparser-6.6.2.jar
-lib/micrometer-core-1.2.0.jar
+lib/log4j-api-2.12.1.jar
+lib/log4j-core-2.12.1.jar
+lib/log4j-jcl-2.12.1.jar
+lib/log4j-jul-2.12.1.jar
+lib/log4j-slf4j-impl-2.12.1.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.2.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.31.Final.jar
-lib/protobuf-java-3.6.1.jar
+lib/netty-all-4.1.42.Final.jar
+lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.4.0.jar
-lib/shiro-config-core-1.4.0.jar
-lib/shiro-config-ogdl-1.4.0.jar
-lib/shiro-core-1.4.0.jar
-lib/shiro-crypto-cipher-1.4.0.jar
-lib/shiro-crypto-core-1.4.0.jar
-lib/shiro-crypto-hash-1.4.0.jar
-lib/shiro-event-1.4.0.jar
-lib/shiro-lang-1.4.0.jar
-lib/slf4j-api-1.7.25.jar
+lib/shiro-cache-1.4.1.jar
+lib/shiro-config-core-1.4.1.jar
+lib/shiro-config-ogdl-1.4.1.jar
+lib/shiro-core-1.4.1.jar
+lib/shiro-crypto-cipher-1.4.1.jar
+lib/shiro-crypto-core-1.4.1.jar
+lib/shiro-crypto-hash-1.4.1.jar
+lib/shiro-event-1.4.1.jar
+lib/shiro-lang-1.4.1.jar
+lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-aop-4.3.23.RELEASE.jar
lib/spring-beans-4.3.23.RELEASE.jar
@@ -1036,8 +1035,8 @@ lib/spring-context-4.3.23.RELEASE.jar
lib/spring-core-4.3.23.RELEASE.jar
lib/spring-expression-4.3.23.RELEASE.jar
lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-4.3.23.RELEASE.jar
-lib/swagger-annotations-1.5.20.jar
+lib/spring-web-5.2.1.RELEASE.jar
+lib/swagger-annotations-1.5.23.jar
tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.zip
tools/Extensions/geode-web-0.0.0.war
tools/Extensions/geode-web-api-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 4b1151a..f642969 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -19,32 +19,30 @@ jackson-databind-2.10.0.jar
jackson-annotations-2.10.0.jar
jackson-core-2.10.0.jar
geode-unsafe-0.0.0.jar
-HikariCP-3.2.0.jar
-commons-lang3-3.8.1.jar
+HikariCP-3.4.1.jar
+commons-lang3-3.9.jar
jaxb-api-2.3.1.jar
-log4j-jcl-2.12.0.jar
-log4j-slf4j-impl-2.12.0.jar
-log4j-core-2.12.0.jar
-log4j-jul-2.12.0.jar
-log4j-api-2.12.0.jar
+log4j-jcl-2.12.1.jar
+log4j-api-2.12.1.jar
spring-shell-1.2.0.RELEASE.jar
rmiio-2.1.2.jar
-jaxb-impl-2.3.1.jar
+jaxb-impl-2.3.2.jar
antlr-2.7.7.jar
javax.activation-1.2.0.jar
-istack-commons-runtime-2.2.jar
+istack-commons-runtime-3.0.9.jar
commons-validator-1.6.jar
-shiro-core-1.4.0.jar
-shiro-config-ogdl-1.4.0.jar
-commons-beanutils-1.9.3.jar
+shiro-core-1.4.1.jar
+shiro-config-ogdl-1.4.1.jar
+commons-beanutils-1.9.4.jar
commons-collections-3.2.2.jar
commons-io-2.6.jar
spring-core-4.3.23.RELEASE.jar
httpclient-4.5.6.jar
+httpclient-4.5.10.jar
commons-logging-1.2.jar
classgraph-4.8.52.jar
-micrometer-core-1.2.0.jar
-fastutil-8.2.2.jar
+micrometer-core-1.2.1.jar
+fastutil-8.3.0.jar
javax.resource-api-1.7.1.jar
jetty-webapp-9.4.21.v20190926.jar
jetty-servlet-9.4.21.v20190926.jar
@@ -53,36 +51,40 @@ jetty-server-9.4.21.v20190926.jar
javax.servlet-api-3.1.0.jar
jna-4.1.0.jar
jopt-simple-5.0.4.jar
-httpcore-4.4.10.jar
-jansi-1.17.1.jar
+httpcore-4.4.12.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.4.0.jar
-shiro-crypto-hash-1.4.0.jar
-shiro-crypto-cipher-1.4.0.jar
-shiro-config-core-1.4.0.jar
-shiro-event-1.4.0.jar
-shiro-crypto-core-1.4.0.jar
-shiro-lang-1.4.0.jar
-slf4j-api-1.7.25.jar
-swagger-annotations-1.5.20.jar
+shiro-cache-1.4.1.jar
+shiro-crypto-hash-1.4.1.jar
+shiro-crypto-cipher-1.4.1.jar
+shiro-config-core-1.4.1.jar
+shiro-event-1.4.1.jar
+shiro-crypto-core-1.4.1.jar
+shiro-lang-1.4.1.jar
+slf4j-api-1.7.28.jar
+swagger-annotations-1.5.23.jar
+spring-core-5.2.1.RELEASE.jar
javax.activation-api-1.2.0.jar
jline-2.12.jar
HdrHistogram-2.1.11.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
+spring-jcl-5.2.1.RELEASE.jar
+commons-codec-1.11.jar
jetty-xml-9.4.21.v20190926.jar
jetty-http-9.4.21.v20190926.jar
jetty-io-9.4.21.v20190926.jar
jetty-util-9.4.21.v20190926.jar
-commons-codec-1.10.jar
-lucene-analyzers-phonetic-6.6.2.jar
-lucene-analyzers-common-6.6.2.jar
-lucene-queryparser-6.6.2.jar
-lucene-core-6.6.2.jar
-lucene-queries-6.6.2.jar
-protobuf-java-3.6.1.jar
+log4j-slf4j-impl-2.12.1.jar
+log4j-core-2.12.1.jar
+log4j-jul-2.12.1.jar
+lucene-analyzers-phonetic-6.6.6.jar
+lucene-analyzers-common-6.6.6.jar
+lucene-queryparser-6.6.6.jar
+lucene-core-6.6.6.jar
+lucene-queries-6.6.6.jar
+protobuf-java-3.10.0.jar
geo-0.7.1.jar
-netty-all-4.1.31.Final.jar
+netty-all-4.1.42.Final.jar
grumpy-core-0.2.2.jar
commons-math3-3.2.jar
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index 384fa3d..df2fca3 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -119,7 +119,7 @@ dependencies {
acceptanceTestRuntime('org.apache.derby:derby')
acceptanceTestRuntime('org.postgresql:postgresql')
- jdbcTestingJars('mysql:mysql-connector-java:8.0.15')
+ jdbcTestingJars('mysql:mysql-connector-java:8.0.17')
}
integrationTest.forkEvery 0
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java
index b060905..3c65636 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java
@@ -113,7 +113,7 @@ public class CreateDataSourceCommandDUnitTest {
"Failed to connect to \"mySqlDataSource\"");
// aquire the jar to be used
- final String jdbcJarName = "mysql-connector-java-8.0.15.jar";
+ final String jdbcJarName = "mysql-connector-java-8.0.17.jar";
final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver";
File mySqlDriverFile = loadTestResource("/" + jdbcJarName);
assertThat(mySqlDriverFile).exists();
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java
index f75f5ac..5668d36 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java
@@ -53,7 +53,7 @@ public class DeregisterDriverCommandDUnitTest {
public void testDeregisterDriverDoesNotThrowException() {
// aquire the jar to be used
- final String jdbcJarName = "mysql-connector-java-8.0.15.jar";
+ final String jdbcJarName = "mysql-connector-java-8.0.17.jar";
final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver";
File mySqlDriverFile = loadTestResource("/" + jdbcJarName);
assertThat(mySqlDriverFile).exists();
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java
index e1225dc..51839ee 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java
@@ -53,7 +53,7 @@ public class ListDriversCommandDUnitTest {
public void testListDriversWithoutMemberNameDoesNotThrowException() {
// acquire the jar to be used
- final String jdbcJarName = "mysql-connector-java-8.0.15.jar";
+ final String jdbcJarName = "mysql-connector-java-8.0.17.jar";
final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver";
File mySqlDriverFile = loadTestResource("/" + jdbcJarName);
assertThat(mySqlDriverFile).exists();
@@ -72,7 +72,7 @@ public class ListDriversCommandDUnitTest {
@Test
public void testLIstDriversWithMemberNameDoesNotThrowException() {
// acquire the jar to be used
- final String jdbcJarName = "mysql-connector-java-8.0.15.jar";
+ final String jdbcJarName = "mysql-connector-java-8.0.17.jar";
final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver";
File mySqlDriverFile = loadTestResource("/" + jdbcJarName);
assertThat(mySqlDriverFile).exists();
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java
index a2a3fa9..bfdc5fc 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java
@@ -60,7 +60,7 @@ public class RegisterDriverCommandDUnitTest {
public void testRegisterDriverDoesNotThrowException() {
// aquire the jar to be used
- final String jdbcJarName = "mysql-connector-java-8.0.15.jar";
+ final String jdbcJarName = "mysql-connector-java-8.0.17.jar";
File mySqlDriverFile = loadTestResource("/" + jdbcJarName);
assertThat(mySqlDriverFile).exists();
String jarFile = mySqlDriverFile.getAbsolutePath();
diff --git a/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
index 30ec1aa..73ec170 100644
--- a/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
+++ b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
@@ -228,7 +228,7 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
String defaultField, int size) throws Exception {
LuceneQuery query = luceneService.createLuceneQueryFactory().create(indexName, regionName,
queryString, defaultField);
- await().untilAsserted(() -> assertThat(query.findPages()).hasSize(size));
+ await().untilAsserted(() -> assertThat(query.findPages()).toIterable().hasSize(size));
}
private void verifyInternalRegions(Consumer<LocalRegion> verify) {
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 1f2df63..6970d03 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -24,13 +24,13 @@ dependencies {
compile(platform(project(':boms:geode-all-bom')))
gradleLint.ignore {
// See GEODE-6128 -- ignore xml-apis in linter to avoid changes with every run.
- upgradeTestCompile('xml-apis:xml-apis:1.4.01')
+ upgradeTestCompile('xml-apis:xml-apis:2.0.2')
}
implementation(project(':geode-logging'))
implementation(project(':geode-serialization'))
compile(project(':geode-core'))
- compileOnly('org.apache.logging.log4j:log4j-api:2.12.0')
+ compileOnly('org.apache.logging.log4j:log4j-api:2.12.1')
testCompile(project(':geode-junit')) {
exclude module: 'geode-core'
diff --git a/static-analysis/pmd-rules/build.gradle b/static-analysis/pmd-rules/build.gradle
index 850a012..a94ab3a 100644
--- a/static-analysis/pmd-rules/build.gradle
+++ b/static-analysis/pmd-rules/build.gradle
@@ -18,6 +18,6 @@
apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
dependencies {
- testCompile(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.11.0')
- compile(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.11.0')
-}
\ No newline at end of file
+ testCompile(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.18.0')
+ compile(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.18.0')
+}