GEODE-8718: Bump shiro from 1.6.0 to 1.7.0

kekerzzZ · Nov 17, 2020 · 2053a5d · 2053a5d
1 parent 1c6206c
commit 2053a5d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 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
@@ -412,7 +412,7 @@
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.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
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("jgroups.version", "3.6.14.Final")
     deps.put("log4j.version", "2.13.3")
     deps.put("micrometer.version", "1.5.5")
-    deps.put("shiro.version", "1.6.0")
+    deps.put("shiro.version", "1.7.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
@@ -1058,15 +1058,15 @@ lib/netty-all-4.1.53.Final.jar
 lib/protobuf-java-3.11.4.jar
 lib/ra.jar
 lib/rmiio-2.1.2.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/shiro-cache-1.7.0.jar
+lib/shiro-config-core-1.7.0.jar
+lib/shiro-config-ogdl-1.7.0.jar
+lib/shiro-core-1.7.0.jar
+lib/shiro-crypto-cipher-1.7.0.jar
+lib/shiro-crypto-core-1.7.0.jar
+lib/shiro-crypto-hash-1.7.0.jar
+lib/shiro-event-1.7.0.jar
+lib/shiro-lang-1.7.0.jar
 lib/slf4j-api-1.7.30.jar
 lib/snappy-0.4.jar
 lib/spring-beans-5.2.9.RELEASE.jar

diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -35,8 +35,8 @@ antlr-2.7.7.jar
 istack-commons-runtime-3.0.11.jar
 jaxb-impl-2.3.2.jar
 commons-validator-1.7.jar
-shiro-core-1.6.0.jar
-shiro-config-ogdl-1.6.0.jar
+shiro-core-1.7.0.jar
+shiro-config-ogdl-1.7.0.jar
 commons-beanutils-1.9.4.jar
 commons-codec-1.15.jar
 commons-collections-3.2.2.jar
@@ -57,13 +57,13 @@ jna-5.6.0.jar
 jopt-simple-5.0.4.jar
 snappy-0.4.jar
 jgroups-3.6.14.Final.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
+shiro-cache-1.7.0.jar
+shiro-crypto-hash-1.7.0.jar
+shiro-crypto-cipher-1.7.0.jar
+shiro-config-core-1.7.0.jar
+shiro-event-1.7.0.jar
+shiro-crypto-core-1.7.0.jar
+shiro-lang-1.7.0.jar
 slf4j-api-1.7.30.jar
 spring-core-5.2.9.RELEASE.jar
 javax.activation-api-1.2.0.jar