GEODE-8496: Bump dependencies once more (#5883)
* Bump mockito from 3.6.28 to 3.7.0
* Bump bouncycastle from 1.67 to 1.68
* Bump cargo from 1.8.3 to 1.8.4
* Bump jedis from 3.4.0 to 3.4.1
* Bump spotless from 5.8.2 to 5.9.0
* Bump nebula.lint from 16.15.9 to 16.17.0
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 acab8be..e1f5a2b 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -424,13 +424,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.67</version>
+ <version>1.68</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>1.8.3</version>
+ <version>1.8.4</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -472,7 +472,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.6.28</version>
+ <version>3.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -538,7 +538,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/build.gradle b/build.gradle
index 14cf918..98a557e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,9 +21,9 @@
id "base"
id "idea"
id "eclipse"
- id "com.diffplug.spotless" version "5.8.2" apply false
+ id "com.diffplug.spotless" version "5.9.0" apply false
id "com.github.ben-manes.versions" version "0.36.0" apply false
- id "nebula.lint" version "16.15.9" apply false
+ id "nebula.lint" version "16.17.0" apply false
id "com.palantir.docker" version "0.22.1" apply false
id "io.spring.dependency-management" version "1.0.10.RELEASE" apply false
id "org.ajoberstar.grgit" version "4.1.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 dd6575b..79f3fad 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
@@ -149,15 +149,15 @@
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
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.67')
- api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.3')
+ api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.68')
+ api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.4')
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')
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.6.28')
+ api(group: 'org.mockito', name: 'mockito-core', version: '3.7.0')
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')
@@ -168,7 +168,7 @@
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: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
- api(group: 'redis.clients', name: 'jedis', version: '3.4.0')
+ api(group: 'redis.clients', name: 'jedis', version: '3.4.1')
api(group: 'io.lettuce', name: 'lettuce-core', version: '6.0.1.RELEASE')
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
}
diff --git a/dev-tools/dependencies/bump.sh b/dev-tools/dependencies/bump.sh
index f10292a..51f66f5 100755
--- a/dev-tools/dependencies/bump.sh
+++ b/dev-tools/dependencies/bump.sh
@@ -24,7 +24,7 @@
if [ "$2" = "-l" ] ; then
./gradlew dependencyUpdates -Drevision=release ; find . | grep build/dependencyUpdates/report.txt | xargs cat \
- | grep ' -> ' | egrep -v '(Gradle|antlr|protobuf|lucene|JUnitParams|docker-compose-rule|javax.servlet-api|gradle-tooling-api|springfox|derby|classgraph|selenium|jgroups|jmh| 6.0.37|commons-collections|jaxb|testcontainers.*1.15.0)' \
+ | grep ' -> ' | egrep -v '(Gradle|antlr|protobuf|lucene|JUnitParams|docker-compose-rule|javax.servlet-api|gradle-tooling-api|springfox|derby|classgraph|selenium|jgroups|jmh|\[6.0.37|commons-collections|jaxb|testcontainers)' \
| sort -u | tr -d '][' | sed -e 's/ -> / /' -e 's#.*:#'"$0 $1"' #'
exit 0
fi
