This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 2412c88 GEODE-8456: bump Shiro to 1.6.0 (#5477)
2412c88 is described below
commit 2412c88550d97afc2be2f088983424e5f087313d
Author: Owen Nichols <[email protected]>
AuthorDate: Tue Aug 25 15:33:14 2020 -0700
GEODE-8456: bump Shiro to 1.6.0 (#5477)
(cherry picked from commit 06174302b2c255fa6da8572fe7444df5dd1b2767)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +++++++++---------
.../integrationTest/resources/dependency_classpath.txt | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 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 cbdfb1a..9f70ed5 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -406,7 +406,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.5.3</version>
+ <version>1.6.0</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 9b8c591..2fda632 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
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin<Project> {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.13.1")
deps.put("micrometer.version", "1.4.1")
- deps.put("shiro.version", "1.5.3")
+ deps.put("shiro.version", "1.6.0")
deps.put("slf4j-api.version", "1.7.30")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index e762126..1ce9113 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1055,15 +1055,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.11.4.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.5.3.jar
-lib/shiro-config-core-1.5.3.jar
-lib/shiro-config-ogdl-1.5.3.jar
-lib/shiro-core-1.5.3.jar
-lib/shiro-crypto-cipher-1.5.3.jar
-lib/shiro-crypto-core-1.5.3.jar
-lib/shiro-crypto-hash-1.5.3.jar
-lib/shiro-event-1.5.3.jar
-lib/shiro-lang-1.5.3.jar
+lib/shiro-cache-1.6.0.jar
+lib/shiro-config-core-1.6.0.jar
+lib/shiro-config-ogdl-1.6.0.jar
+lib/shiro-core-1.6.0.jar
+lib/shiro-crypto-cipher-1.6.0.jar
+lib/shiro-crypto-core-1.6.0.jar
+lib/shiro-crypto-hash-1.6.0.jar
+lib/shiro-event-1.6.0.jar
+lib/shiro-lang-1.6.0.jar
lib/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.5.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index a12a84b..11464ce 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -36,8 +36,8 @@ javax.activation-1.2.0.jar
istack-commons-runtime-3.0.11.jar
jaxb-impl-2.3.2.jar
commons-validator-1.6.jar
-shiro-core-1.5.3.jar
-shiro-config-ogdl-1.5.3.jar
+shiro-core-1.6.0.jar
+shiro-config-ogdl-1.6.0.jar
commons-beanutils-1.9.4.jar
commons-codec-1.14.jar
commons-collections-3.2.2.jar
@@ -58,13 +58,13 @@ jna-5.5.0.jar
jopt-simple-5.0.4.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.5.3.jar
-shiro-crypto-hash-1.5.3.jar
-shiro-crypto-cipher-1.5.3.jar
-shiro-config-core-1.5.3.jar
-shiro-event-1.5.3.jar
-shiro-crypto-core-1.5.3.jar
-shiro-lang-1.5.3.jar
+shiro-cache-1.6.0.jar
+shiro-crypto-hash-1.6.0.jar
+shiro-crypto-cipher-1.6.0.jar
+shiro-config-core-1.6.0.jar
+shiro-event-1.6.0.jar
+shiro-crypto-core-1.6.0.jar
+shiro-lang-1.6.0.jar
slf4j-api-1.7.30.jar
spring-core-5.2.5.RELEASE.jar
javax.activation-api-1.2.0.jar
