GEODE-5996 Update dependencies.

assertj-core 3.10.0 -> 3.11.1 awaitility3.1.1 -> 3.1.2 bouncycastle 1.59 -> 1.60 cglib 3.2.7 -> 3.2.9 classgraph 4.0.6 -> 4.4.12 fastutil 8.2.1 -> 8.2.2 guava 25.1-jre -> 27.0-jre httpunit 1.7.2 -> 1.7.3 jackson 2.9.6 -> 2.9.7 javax.mail-api 1.6.1 -> 1.6.2 javax.persistence-api 2.2.0 -> 2.2.1 json-path-assert 2.2.0 -> 2.4.0 log4j 2.11.0 -> 2.11.1 mockito-core 2.19.1 -> 2.23.0 netty-all 4.1.27.Final -> 4.1.31.Final protobuf 3.6.0 -> 3.6.1 spring-hateoas 0.24.0.RELEASE -> 0.25.0.RELEASE spring-security 4.2.7.RELEASE -> 4.2.8.RELEASE spring 4.3.18 -> 4.3.20.RELEASE Not updating javax.resource-api since that breaks some tests that have hard-coded the javax.transaction version.
IronOnet · Nov 17, 2018 · 2d3f51f · 2d3f51f
1 parent 47f55bd
commit 2d3f51f
Show file tree

Hide file tree

Showing 21 changed files with 178 additions and 178 deletions.
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1184,7 +1184,7 @@ javadoc/stylesheet.css
 lib/HikariCP-3.2.0.jar
 lib/activation-1.1.1.jar
 lib/antlr-2.7.7.jar
-lib/classgraph-4.0.6.jar
+lib/classgraph-4.4.12.jar
 lib/commons-beanutils-1.9.3.jar
 lib/commons-codec-1.10.jar
 lib/commons-collections-3.2.2.jar
@@ -1195,7 +1195,7 @@ 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.1.jar
+lib/fastutil-8.2.2.jar
 lib/findbugs-annotations-1.3.9-1.jar
 lib/geo-0.7.1.jar
 lib/geode-common-1.9.0-SNAPSHOT.jar
@@ -1214,11 +1214,11 @@ lib/geode-wan-1.9.0-SNAPSHOT.jar
 lib/geode-web-1.9.0-SNAPSHOT.jar
 lib/gfsh-dependencies.jar
 lib/grumpy-core-0.2.2.jar
-lib/jackson-annotations-2.9.6.jar
-lib/jackson-core-2.9.6.jar
-lib/jackson-databind-2.9.6.jar
+lib/jackson-annotations-2.9.7.jar
+lib/jackson-core-2.9.7.jar
+lib/jackson-databind-2.9.7.jar
 lib/jansi-1.17.1.jar
-lib/javax.mail-api-1.6.1.jar
+lib/javax.mail-api-1.6.2.jar
 lib/javax.resource-api-1.7.jar
 lib/javax.servlet-api-3.1.0.jar
 lib/javax.transaction-api-1.2.jar
@@ -1237,11 +1237,11 @@ 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.11.0.jar
-lib/log4j-core-2.11.0.jar
-lib/log4j-jcl-2.11.0.jar
-lib/log4j-jul-2.11.0.jar
-lib/log4j-slf4j-impl-2.11.0.jar
+lib/log4j-api-2.11.1.jar
+lib/log4j-core-2.11.1.jar
+lib/log4j-jcl-2.11.1.jar
+lib/log4j-jul-2.11.1.jar
+lib/log4j-slf4j-impl-2.11.1.jar
 lib/lucene-analyzers-common-6.6.2.jar
 lib/lucene-analyzers-phonetic-6.6.2.jar
 lib/lucene-core-6.6.2.jar
@@ -1250,8 +1250,8 @@ lib/lucene-queryparser-6.6.2.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.27.Final.jar
-lib/protobuf-java-3.6.0.jar
+lib/netty-all-4.1.31.Final.jar
+lib/protobuf-java-3.6.1.jar
 lib/ra.jar
 lib/rmiio-2.1.2.jar
 lib/shiro-cache-1.4.0.jar
@@ -1265,13 +1265,13 @@ lib/shiro-event-1.4.0.jar
 lib/shiro-lang-1.4.0.jar
 lib/slf4j-api-1.7.25.jar
 lib/snappy-0.4.jar
-lib/spring-aop-4.3.18.RELEASE.jar
-lib/spring-beans-4.3.18.RELEASE.jar
-lib/spring-context-4.3.18.RELEASE.jar
-lib/spring-core-4.3.18.RELEASE.jar
-lib/spring-expression-4.3.18.RELEASE.jar
+lib/spring-aop-4.3.20.RELEASE.jar
+lib/spring-beans-4.3.20.RELEASE.jar
+lib/spring-context-4.3.20.RELEASE.jar
+lib/spring-core-4.3.20.RELEASE.jar
+lib/spring-expression-4.3.20.RELEASE.jar
 lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-4.3.18.RELEASE.jar
+lib/spring-web-4.3.20.RELEASE.jar
 tools/ClientProtocol/geode-protobuf-messages-definitions-1.9.0-SNAPSHOT.zip
 tools/Extensions/geode-web-1.9.0-SNAPSHOT.war
 tools/Extensions/geode-web-api-1.9.0-SNAPSHOT.war

diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -1,71 +1,71 @@
-HikariCP-3.2.0.jar
-activation-1.1.1.jar
-antlr-2.7.7.jar
-classgraph-4.0.6.jar
-commons-beanutils-1.9.3.jar
-commons-codec-1.10.jar
-commons-collections-3.2.2.jar
-commons-io-2.6.jar
+shiro-core-1.4.0.jar
+lucene-analyzers-common-6.6.2.jar
+jackson-databind-2.9.7.jar
+netty-all-4.1.31.Final.jar
 commons-lang3-3.8.1.jar
-commons-logging-1.2.jar
-commons-validator-1.6.jar
-fastutil-8.2.1.jar
 geode-common-1.9.0-SNAPSHOT.jar
-geode-connectors-1.9.0-SNAPSHOT.jar
 geode-core-1.9.0-SNAPSHOT.jar
-geode-cq-1.9.0-SNAPSHOT.jar
-geode-json-1.9.0-SNAPSHOT.jar
-geode-lucene-1.9.0-SNAPSHOT.jar
+commons-logging-1.2.jar
 geode-old-client-support-1.9.0-SNAPSHOT.jar
-geode-protobuf-1.9.0-SNAPSHOT.jar
-geode-protobuf-messages-1.9.0-SNAPSHOT.jar
-geode-rebalancer-1.9.0-SNAPSHOT.jar
-geode-wan-1.9.0-SNAPSHOT.jar
-jackson-annotations-2.9.6.jar
-jackson-core-2.9.6.jar
-jackson-databind-2.9.6.jar
-jansi-1.17.1.jar
-javax.resource-api-1.7.jar
+log4j-jul-2.11.1.jar
+shiro-crypto-cipher-1.4.0.jar
+shiro-event-1.4.0.jar
+jline-2.12.jar
+shiro-crypto-hash-1.4.0.jar
+fastutil-8.2.2.jar
+activation-1.1.1.jar
 javax.servlet-api-3.1.0.jar
-javax.transaction-api-1.2.jar
-jaxb-api-2.2.11.jar
-jaxb-core-2.2.11.jar
-jaxb-impl-2.2.11.jar
-jetty-http-9.4.12.v20180830.jar
-jetty-io-9.4.12.v20180830.jar
+jgroups-3.6.14.Final.jar
+shiro-crypto-core-1.4.0.jar
+shiro-lang-1.4.0.jar
 jetty-security-9.4.12.v20180830.jar
-jetty-server-9.4.12.v20180830.jar
-jetty-servlet-9.4.12.v20180830.jar
-jetty-util-9.4.12.v20180830.jar
-jetty-webapp-9.4.12.v20180830.jar
+lucene-queryparser-6.6.2.jar
+classgraph-4.4.12.jar
+slf4j-api-1.7.25.jar
+spring-core-4.3.20.RELEASE.jar
+jansi-1.17.1.jar
+jackson-core-2.9.7.jar
+geode-wan-1.9.0-SNAPSHOT.jar
 jetty-xml-9.4.12.v20180830.jar
-jgroups-3.6.14.Final.jar
-jline-2.12.jar
+geode-lucene-1.9.0-SNAPSHOT.jar
+geode-cq-1.9.0-SNAPSHOT.jar
+commons-collections-3.2.2.jar
+jetty-webapp-9.4.12.v20180830.jar
+log4j-jcl-2.11.1.jar
 jna-4.1.0.jar
+geode-rebalancer-1.9.0-SNAPSHOT.jar
+rmiio-2.1.2.jar
+commons-codec-1.10.jar
+log4j-api-2.11.1.jar
+jetty-server-9.4.12.v20180830.jar
+geode-connectors-1.9.0-SNAPSHOT.jar
+HikariCP-3.2.0.jar
+jaxb-impl-2.2.11.jar
 jopt-simple-5.0.4.jar
-log4j-api-2.11.0.jar
-log4j-core-2.11.0.jar
-log4j-jcl-2.11.0.jar
-log4j-jul-2.11.0.jar
-log4j-slf4j-impl-2.11.0.jar
-lucene-analyzers-common-6.6.2.jar
+jetty-util-9.4.12.v20180830.jar
 lucene-analyzers-phonetic-6.6.2.jar
-lucene-core-6.6.2.jar
-lucene-queries-6.6.2.jar
-lucene-queryparser-6.6.2.jar
-netty-all-4.1.27.Final.jar
-protobuf-java-3.6.0.jar
-rmiio-2.1.2.jar
-shiro-cache-1.4.0.jar
-shiro-config-core-1.4.0.jar
 shiro-config-ogdl-1.4.0.jar
-shiro-core-1.4.0.jar
-shiro-crypto-cipher-1.4.0.jar
-shiro-crypto-core-1.4.0.jar
-shiro-crypto-hash-1.4.0.jar
-shiro-event-1.4.0.jar
-shiro-lang-1.4.0.jar
-slf4j-api-1.7.25.jar
+jetty-http-9.4.12.v20180830.jar
+geode-protobuf-1.9.0-SNAPSHOT.jar
 snappy-0.4.jar
-spring-core-4.3.18.RELEASE.jar
+javax.resource-api-1.7.jar
+protobuf-java-3.6.1.jar
+lucene-queries-6.6.2.jar
+geode-json-1.9.0-SNAPSHOT.jar
+jetty-io-9.4.12.v20180830.jar
+lucene-core-6.6.2.jar
 spring-shell-1.2.0.RELEASE.jar
+jaxb-api-2.2.11.jar
+jackson-annotations-2.9.7.jar
+log4j-slf4j-impl-2.11.1.jar
+jetty-servlet-9.4.12.v20180830.jar
+jaxb-core-2.2.11.jar
+commons-beanutils-1.9.3.jar
+commons-io-2.6.jar
+commons-validator-1.6.jar
+shiro-config-core-1.4.0.jar
+javax.transaction-api-1.2.jar
+antlr-2.7.7.jar
+shiro-cache-1.4.0.jar
+geode-protobuf-messages-1.9.0-SNAPSHOT.jar
+log4j-core-2.11.1.jar
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE
@@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@
 
   * Brian Langel
 
-Jackson Core 2.9.6
+Jackson Core
 
   # Jackson JSON processor
 
@@ -119,8 +119,8 @@ Apache Lucene
 Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
 source code for this can be found at http://www.eclipse.org/jetty/downloads.php
 
-Spring Framework 4.3.18.RELEASE
-Copyright (c) 2002-2017 Pivotal, Inc.
+Spring Framework
+Copyright (c) 2002-2018 Pivotal, Inc.
 
   This product is licensed to you under the Apache License, Version 2.0
   (the "License"). You may not use this product except in compliance with
@@ -131,7 +131,7 @@ Copyright (c) 2002-2017 Pivotal, Inc.
   these subcomponents is subject to the terms and conditions of the
   subcomponent's license, as noted in the license.txt file.
 
-Spring Hateoas 0.24.0.RELEASE
+Spring Hateoas 
 Copyright (c) [2012-2017] Pivotal Software, Inc.
 
   This product is licensed to you under the Apache License, Version 2.0 (the "License").  
@@ -142,12 +142,12 @@ Copyright (c) [2012-2017] Pivotal Software, Inc.
   code for the these subcomponents is subject to the terms and
   conditions of the subcomponent's license, as noted in the LICENSE file.
 
-Spring LDAP Core 2.3.2.RELEASE
+Spring LDAP Core 
 
    This product includes software developed by the Spring LDAP
    Project (http://www.springframework.org/ldap).
 
-Spring Shell 1.2.0.RELEASE
+Spring Shell
 
    This product includes software developed by the Spring Framework
    Project (http://www.springframework.org).

diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
@@ -68,13 +68,13 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-jcl</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>

diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
@@ -56,13 +56,13 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.9.6</version>
+      <version>2.9.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.6</version>
+      <version>2.9.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -141,20 +141,20 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
-      <version>4.1.27.Final</version>
+      <version>4.1.31.Final</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>it.unimi.dsi</groupId>
       <artifactId>fastutil</artifactId>
-      <version>8.2.1</version>
+      <version>8.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>javax.mail-api</artifactId>
-      <version>1.6.1</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -200,13 +200,13 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -225,7 +225,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>4.3.18.RELEASE</version>
+      <version>4.3.20.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -278,7 +278,7 @@
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.0.6</version>
+      <version>4.4.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -315,7 +315,7 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -328,14 +328,14 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-jcl</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-jul</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>

diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>