[geode] branch support/1.12 updated: GEODE-8456: bump Shiro to 1.6.0 (#5477)

[on...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.12 by this push:
     new 881a0ab  GEODE-8456: bump Shiro to 1.6.0 (#5477)
881a0ab is described below

commit 881a0abff3cd8fc3968a4899c0b68d8d390b4caa
Author: Owen Nichols <34...@users.noreply.github.com>
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 6340b94..3b0f424 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -346,7 +346,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 e9c3f80..7494c8d 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.12.1")
     deps.put("micrometer.version", "1.2.1")
-    deps.put("shiro.version", "1.5.3")
+    deps.put("shiro.version", "1.6.0")
     deps.put("slf4j-api.version", "1.7.28")
 
     // 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 e2721b9..6628ce7 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1044,15 +1044,15 @@ lib/netty-all-4.1.48.Final.jar
 lib/protobuf-java-3.10.0.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.28.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 366ee24..d2fc66e 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -34,8 +34,8 @@ antlr-2.7.7.jar
 javax.activation-1.2.0.jar
 istack-commons-runtime-3.0.9.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-collections-3.2.2.jar
 commons-io-2.6.jar
@@ -56,13 +56,13 @@ jopt-simple-5.0.4.jar
 httpcore-4.4.12.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.28.jar
 swagger-annotations-1.5.23.jar
 spring-core-5.2.5.RELEASE.jar