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 7e75db9 GEODE-8980: bump deps (#6675) 7e75db9 is described below commit 7e75db972bbfa20a910cf013d07a10ac18bd5161 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Tue Jul 6 12:26:18 2021 -0700 GEODE-8980: bump deps (#6675) * Bump assertj from 3.19.0 to 3.20.2 * Bump cargo from 1.9.4 to 1.9.5 * Bump classgraph from 4.8.108 to 4.8.109 * Bump spotless from 5.12.5 to 5.14.0 * Bump commons-io from 2.8.0 to 2.10.0 * Bump jedis from 3.6.0 to 3.6.1 * Bump lettuce from 6.1.2.RELEASE to 6.1.3.RELEASE * Bump micrometer from 1.7.0 to 1.7.1 * Bump mockito from 3.11.0 to 3.11.2 * Bump nebula.lint from 16.23.0 to 16.26.0 * Bump pmd from 6.35.0 to 6.36.0 * Bump resilience4j-retry from 1.7.0 to 1.7.1 * Bump sonarqube from 3.2.0 to 3.3 * Bump spring-boot-starter from 2.5.0 to 2.5.2 * Bump spring-hateoas from 1.3.1 to 1.3.2 * Bump spring-security from 5.5.0 to 5.5.1 * Bump spring-session-data-redis from 2.5.0 to 2.5.1 * Bump tomcat from 9.0.46 to 9.0.48 --- .../src/test/resources/expected-pom.xml | 50 +++++++++++----------- build.gradle | 6 +-- .../gradle/plugins/DependencyConstraints.groovy | 32 +++++++------- .../apache/geode/session/tests/TomcatInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 6 +-- .../resources/dependency_classpath.txt | 6 +-- .../integrationTest/resources/expected_jars.txt | 4 -- geode-assembly/src/main/dist/LICENSE | 2 +- 8 files changed, 52 insertions(+), 56 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 b731be6..a975ffe 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -165,7 +165,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.8.0</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -185,22 +185,22 @@ <dependency> <groupId>io.github.classgraph</groupId> <artifactId>classgraph</artifactId> - <version>4.8.108</version> + <version>4.8.109</version> </dependency> <dependency> <groupId>io.github.resilience4j</groupId> <artifactId>resilience4j-retry</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>io.lettuce</groupId> <artifactId>lettuce-core</artifactId> - <version>6.1.2.RELEASE</version> + <version>6.1.3.RELEASE</version> </dependency> <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-core</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>io.netty</groupId> @@ -300,12 +300,12 @@ <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-java</artifactId> - <version>6.35.0</version> + <version>6.36.0</version> </dependency> <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-test</artifactId> - <version>6.35.0</version> + <version>6.36.0</version> </dependency> <dependency> <groupId>net.spy</groupId> @@ -350,7 +350,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.19.0</version> + <version>3.20.2</version> </dependency> <dependency> <groupId>org.awaitility</groupId> @@ -365,7 +365,7 @@ <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> - <version>1.9.4</version> + <version>1.9.5</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -405,7 +405,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.11.0</version> + <version>3.11.2</version> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> @@ -435,7 +435,7 @@ <dependency> <groupId>org.springframework.hateoas</groupId> <artifactId>spring-hateoas</artifactId> - <version>1.3.1</version> + <version>1.3.2</version> </dependency> <dependency> <groupId>org.springframework.ldap</groupId> @@ -460,7 +460,7 @@ <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> - <version>3.6.0</version> + <version>3.6.1</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -610,42 +610,42 @@ <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-ldap</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-test</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-web</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-oauth2-core</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-oauth2-client</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-oauth2-jose</artifactId> - <version>5.5.0</version> + <version>5.5.1</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -700,27 +700,27 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>2.5.0</version> + <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jetty</artifactId> - <version>2.5.0</version> + <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>2.5.0</version> + <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> - <version>2.5.0</version> + <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework.session</groupId> <artifactId>spring-session-data-redis</artifactId> - <version>2.5.0</version> + <version>2.5.1</version> </dependency> <dependency> <groupId>org.jetbrains</groupId> diff --git a/build.gradle b/build.gradle index 4d0d850..a8d59eb 100755 --- a/build.gradle +++ b/build.gradle @@ -21,14 +21,14 @@ plugins { id "base" id "idea" id "eclipse" - id "com.diffplug.spotless" version "5.12.5" apply false + id "com.diffplug.spotless" version "5.14.0" apply false id "com.github.ben-manes.versions" version "0.39.0" apply false - id "nebula.lint" version "16.23.0" apply false + id "nebula.lint" version "16.26.0" apply false id "com.palantir.docker" version "0.26.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 - id "org.sonarqube" version "3.2.0" apply false + id "org.sonarqube" version "3.3" apply false id "me.champeau.gradle.japicmp" apply false // Version defined in buildSrc/build.gradle id 'me.champeau.gradle.jmh' version '0.5.3' apply false } diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index c28eeb9..79d6e79 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 @@ -34,14 +34,14 @@ class DependencyConstraints implements Plugin<Project> { // These version numbers are consumed by :geode-modules-assembly:distAppServer filtering // Some of these are referenced below as well deps.put("antlr.version", "2.7.7") - deps.put("commons-io.version", "2.8.0") + deps.put("commons-io.version", "2.10.0") deps.put("commons-lang3.version", "3.12.0") deps.put("commons-validator.version", "1.7") deps.put("fastutil.version", "8.5.4") 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.0") + deps.put("micrometer.version", "1.7.1") deps.put("shiro.version", "1.7.1") deps.put("slf4j-api.version", "1.7.30") deps.put("jboss-modules.version", "1.11.0.Final") @@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin<Project> { deps.put("tomcat6.version", "6.0.37") deps.put("tomcat7.version", "7.0.109") deps.put("tomcat8.version", "8.5.66") - deps.put("tomcat9.version", "9.0.46") + deps.put("tomcat9.version", "9.0.48") // The jetty version is also hard-coded in geode-assembly:test // at o.a.g.sessions.tests.GenericAppServerInstall.java @@ -111,9 +111,9 @@ 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.108') - api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.0') - api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.2.RELEASE') + api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.109') + api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.1') + api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.3.RELEASE') api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version')) api(group: 'io.netty', name: 'netty-all', version: '4.1.59.Final') api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2') @@ -134,8 +134,8 @@ class DependencyConstraints implements Plugin<Project> { api(group: 'net.minidev', name: 'json-smart', version: '2.3.1') 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.35.0') - api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.35.0') + 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.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')) @@ -144,10 +144,10 @@ 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.14') api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version')) - api(group: 'org.assertj', name: 'assertj-core', version: '3.19.0') + api(group: 'org.assertj', name: 'assertj-core', version: '3.20.2') api(group: 'org.awaitility', name: 'awaitility', version: '4.1.0') api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.69') - api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.4') + api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.5') 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') @@ -155,18 +155,18 @@ 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.0') + api(group: 'org.mockito', name: 'mockito-core', version: '3.11.2') 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') 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.3.1') + api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.3.2') api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.2.RELEASE') api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version')) api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3') api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0') - api(group: 'redis.clients', name: 'jedis', version: '3.6.0') + api(group: 'redis.clients', name: 'jedis', version: '3.6.1') api(group: 'xerces', name: 'xercesImpl', version: '2.12.0') } } @@ -229,7 +229,7 @@ class DependencyConstraints implements Plugin<Project> { entry('selenium-support') } - dependencySet(group: 'org.springframework.security', version: '5.5.0') { + dependencySet(group: 'org.springframework.security', version: '5.5.1') { entry('spring-security-config') entry('spring-security-core') entry('spring-security-ldap') @@ -253,14 +253,14 @@ class DependencyConstraints implements Plugin<Project> { entry('spring-webmvc') } - dependencySet(group: 'org.springframework.boot', version: '2.5.0') { + dependencySet(group: 'org.springframework.boot', version: '2.5.2') { 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.0') { + dependencySet(group: 'org.springframework.session', version: '2.5.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 285dedd..a0a38c6 100644 --- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java +++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java @@ -43,7 +43,7 @@ public class TomcatInstall extends ContainerInstall { TOMCAT6(6, "tomcat-6.0.37.zip"), TOMCAT7(7, "tomcat-7.0.109.zip"), TOMCAT8(8, "tomcat-8.5.66.zip"), - TOMCAT9(9, "tomcat-9.0.46.zip"); + TOMCAT9(9, "tomcat-9.0.48.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 5337fba..c408ada 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -965,12 +965,12 @@ 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.108.jar +lib/classgraph-4.8.109.jar lib/commons-beanutils-1.9.4.jar lib/commons-codec-1.15.jar lib/commons-collections-3.2.2.jar lib/commons-digester-2.1.jar -lib/commons-io-2.8.0.jar +lib/commons-io-2.10.0.jar lib/commons-lang3-3.12.0.jar lib/commons-logging-1.2.jar lib/commons-modeler-2.0.1.jar @@ -1040,7 +1040,7 @@ 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.0.jar +lib/micrometer-core-1.7.1.jar lib/mx4j-3.0.2.jar lib/mx4j-remote-3.0.2.jar lib/mx4j-tools-3.0.1.jar diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt index dfdc3b8..cdbd9b5 100644 --- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt @@ -39,10 +39,10 @@ shiro-config-ogdl-1.7.1.jar commons-beanutils-1.9.4.jar commons-codec-1.15.jar commons-collections-3.2.2.jar -commons-io-2.8.0.jar +commons-io-2.10.0.jar commons-logging-1.2.jar -classgraph-4.8.108.jar -micrometer-core-1.7.0.jar +classgraph-4.8.109.jar +micrometer-core-1.7.1.jar swagger-annotations-1.6.2.jar fastutil-core-8.5.4.jar fastutil-extra-8.5.4.jar diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt index 99c31e7..c18e2a9 100644 --- a/geode-assembly/src/integrationTest/resources/expected_jars.txt +++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt @@ -2,7 +2,6 @@ HdrHistogram HikariCP LatencyUtils accessors-smart -annotations antlr asm byte-buddy @@ -62,9 +61,6 @@ jopt-simple json-path json-smart jsr -kotlin-stdlib -kotlin-stdlib-common -kotlin-stdlib-jdk lang-tag listenablefuture log4j-api diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE index 3bf549e..9fbcc6b 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.108 (https://github.com/classgraph/classgraph), Copyright + - ClassGraph v4.8.109 (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)