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 2021/08/29 17:01:59 UTC
[geode] branch develop updated: GEODE-8980: bump deps (#6813)
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 ccaa72a GEODE-8980: bump deps (#6813)
ccaa72a is described below
commit ccaa72a7110d88b22530f66e5ff39ba8e3a20cbc
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Sun Aug 29 10:00:47 2021 -0700
GEODE-8980: bump deps (#6813)
* Bump annotations from 21.0.1 to 22.0.0
* Bump cargo from 1.9.5 to 1.9.7
* Bump classgraph from 4.8.110 to 4.8.115
* Bump com.diffplug.spotless from 5.14.0 to 5.14.3
* Bump com.palantir.docker from 0.26.0 to 0.28.0
* Bump jna from 5.8.0 to 5.9.0
* Bump json-smart from 2.3.1 to 2.4.7
* Bump micrometer-core from 1.7.2 to 1.7.3
* Bump mockito from 3.11.2 to 3.12.4
* Bump nebula.lint from 16.26.0 to 17.1.1
* Bump netty-all from 4.1.66.Final to 4.1.67.Final
* Bump pmd from 6.36.0 to 6.37.0
* Bump shiro from 1.7.1 to 1.8.0
* Bump spring-boot-starter from 2.5.3 to 2.5.4
* Bump spring-security from 5.5.1 to 5.5.2
* Bump spring-session-data-redis from 2.5.1 to 2.5.2
---
.../src/test/resources/expected-pom.xml | 50 +++++++++++-----------
build.gradle | 6 +--
.../gradle/plugins/DependencyConstraints.groovy | 30 ++++++-------
.../integrationTest/resources/assembly_content.txt | 28 ++++++------
.../resources/dependency_classpath.txt | 28 ++++++------
geode-assembly/src/main/dist/LICENSE | 2 +-
6 files changed, 72 insertions(+), 72 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 a82c4a0..d1da6d6 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -185,7 +185,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
- <version>4.8.110</version>
+ <version>4.8.115</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
@@ -200,12 +200,12 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
- <version>1.7.2</version>
+ <version>1.7.3</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.66.Final</version>
+ <version>4.1.67.Final</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@@ -275,17 +275,17 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>5.8.0</version>
+ <version>5.9.0</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
- <version>5.8.0</version>
+ <version>5.9.0</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>2.3.1</version>
+ <version>2.4.7</version>
</dependency>
<dependency>
<groupId>net.openhft</groupId>
@@ -300,12 +300,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
- <version>6.36.0</version>
+ <version>6.37.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-test</artifactId>
- <version>6.36.0</version>
+ <version>6.37.0</version>
</dependency>
<dependency>
<groupId>net.spy</groupId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.7.1</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -360,7 +360,7 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>1.9.5</version>
+ <version>1.9.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.11.2</version>
+ <version>3.12.4</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -605,42 +605,42 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-core</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
- <version>5.5.1</version>
+ <version>5.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -695,32 +695,32 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>21.0.1</version>
+ <version>22.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
diff --git a/build.gradle b/build.gradle
index a8d59eb..77624dd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,10 @@ plugins {
id "base"
id "idea"
id "eclipse"
- id "com.diffplug.spotless" version "5.14.0" apply false
+ id "com.diffplug.spotless" version "5.14.3" apply false
id "com.github.ben-manes.versions" version "0.39.0" apply false
- id "nebula.lint" version "16.26.0" apply false
- id "com.palantir.docker" version "0.26.0" apply false
+ id "nebula.lint" version "17.1.1" apply false
+ id "com.palantir.docker" version "0.28.0" apply false
id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false
id "org.ajoberstar.grgit" version "4.1.0" apply false
id "org.nosphere.apache.rat" version "0.7.0" apply false
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 2fa5ef1..5be3bd7 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.14.1")
- deps.put("micrometer.version", "1.7.2")
- deps.put("shiro.version", "1.7.1")
+ deps.put("micrometer.version", "1.7.3")
+ deps.put("shiro.version", "1.8.0")
deps.put("slf4j-api.version", "1.7.30")
deps.put("jboss-modules.version", "1.11.0.Final")
deps.put("jackson.version", "2.12.3")
@@ -111,11 +111,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.110')
+ api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.115')
api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.1')
api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.4.RELEASE')
api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
- api(group: 'io.netty', name: 'netty-all', version: '4.1.66.Final')
+ api(group: 'io.netty', name: 'netty-all', version: '4.1.67.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')
@@ -129,13 +129,13 @@ 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.8.0')
- api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0')
- api(group: 'net.minidev', name: 'json-smart', version: '2.3.1')
+ api(group: 'net.java.dev.jna', name: 'jna', version: '5.9.0')
+ api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.9.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')
- api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.36.0')
- api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.36.0')
+ api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.37.0')
+ api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.37.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'))
@@ -146,7 +146,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
api(group: 'org.assertj', name: 'assertj-core', version: '3.20.2')
api(group: 'org.awaitility', name: 'awaitility', version: '4.1.0')
- api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.5')
+ api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.7')
api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
@@ -154,7 +154,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
api(group: 'org.jboss.modules', name: 'jboss-modules', version: get('jboss-modules.version'))
api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))
- api(group: 'org.mockito', name: 'mockito-core', version: '3.11.2')
+ api(group: 'org.mockito', name: 'mockito-core', version: '3.12.4')
api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.32')
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
@@ -228,7 +228,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('selenium-support')
}
- dependencySet(group: 'org.springframework.security', version: '5.5.1') {
+ dependencySet(group: 'org.springframework.security', version: '5.5.2') {
entry('spring-security-config')
entry('spring-security-core')
entry('spring-security-ldap')
@@ -252,18 +252,18 @@ class DependencyConstraints implements Plugin<Project> {
entry('spring-webmvc')
}
- dependencySet(group: 'org.springframework.boot', version: '2.5.3') {
+ dependencySet(group: 'org.springframework.boot', version: '2.5.4') {
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.5.1') {
+ dependencySet(group: 'org.springframework.session', version: '2.5.2') {
entry('spring-session-data-redis')
}
- dependencySet(group: 'org.jetbrains', version: '21.0.1') {
+ dependencySet(group: 'org.jetbrains', version: '22.0.0') {
entry('annotations')
}
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 42ffc32..1467ae7 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.110.jar
+lib/classgraph-4.8.115.jar
lib/commons-beanutils-1.9.4.jar
lib/commons-codec-1.15.jar
lib/commons-collections-3.2.2.jar
@@ -1028,8 +1028,8 @@ lib/jetty-webapp-9.4.43.v20210629.jar
lib/jetty-xml-9.4.43.v20210629.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
-lib/jna-5.8.0.jar
-lib/jna-platform-5.8.0.jar
+lib/jna-5.9.0.jar
+lib/jna-platform-5.9.0.jar
lib/jopt-simple-5.0.4.jar
lib/log4j-api-2.14.1.jar
lib/log4j-core-2.14.1.jar
@@ -1041,22 +1041,22 @@ lib/lucene-analyzers-phonetic-6.6.6.jar
lib/lucene-core-6.6.6.jar
lib/lucene-queries-6.6.6.jar
lib/lucene-queryparser-6.6.6.jar
-lib/micrometer-core-1.7.2.jar
+lib/micrometer-core-1.7.3.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.66.Final.jar
+lib/netty-all-4.1.67.Final.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.7.1.jar
-lib/shiro-config-core-1.7.1.jar
-lib/shiro-config-ogdl-1.7.1.jar
-lib/shiro-core-1.7.1.jar
-lib/shiro-crypto-cipher-1.7.1.jar
-lib/shiro-crypto-core-1.7.1.jar
-lib/shiro-crypto-hash-1.7.1.jar
-lib/shiro-event-1.7.1.jar
-lib/shiro-lang-1.7.1.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/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
lib/spring-beans-5.3.9.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 36a04d7..d8cb3c1 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -34,15 +34,15 @@ 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.7.1.jar
-shiro-config-ogdl-1.7.1.jar
+shiro-core-1.8.0.jar
+shiro-config-ogdl-1.8.0.jar
commons-beanutils-1.9.4.jar
commons-codec-1.15.jar
commons-collections-3.2.2.jar
commons-io-2.11.0.jar
commons-logging-1.2.jar
-classgraph-4.8.110.jar
-micrometer-core-1.7.2.jar
+classgraph-4.8.115.jar
+micrometer-core-1.7.3.jar
swagger-annotations-1.6.2.jar
fastutil-core-8.5.4.jar
fastutil-extra-8.5.4.jar
@@ -53,18 +53,18 @@ jetty-servlet-9.4.43.v20210629.jar
jetty-security-9.4.43.v20210629.jar
jetty-server-9.4.43.v20210629.jar
javax.servlet-api-3.1.0.jar
-jna-platform-5.8.0.jar
-jna-5.8.0.jar
+jna-platform-5.9.0.jar
+jna-5.9.0.jar
jopt-simple-5.0.4.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.7.1.jar
-shiro-crypto-hash-1.7.1.jar
-shiro-crypto-cipher-1.7.1.jar
-shiro-config-core-1.7.1.jar
-shiro-event-1.7.1.jar
-shiro-crypto-core-1.7.1.jar
-shiro-lang-1.7.1.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
slf4j-api-1.7.30.jar
spring-core-5.3.9.jar
javax.activation-api-1.2.0.jar
@@ -87,4 +87,4 @@ lucene-queryparser-6.6.6.jar
lucene-core-6.6.6.jar
lucene-queries-6.6.6.jar
geo-0.7.7.jar
-netty-all-4.1.66.Final.jar
+netty-all-4.1.67.Final.jar
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 7916247..4335248 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 v2.10.0 (https://checkerframework.org), Copyright (c)
2004-present by the Checker Framework developers
- - ClassGraph v4.8.110 (https://github.com/classgraph/classgraph), Copyright
+ - ClassGraph v4.8.115 (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)