You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/04/06 18:41:32 UTC
[geode] branch support/1.12 updated: GEODE-7941: update Shiro to
recommended version 1.5.2 (#4896)
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 8a9490b GEODE-7941: update Shiro to recommended version 1.5.2 (#4896)
8a9490b is described below
commit 8a9490bb617c099907dc37ad4d161c31ec7b4f63
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Wed Apr 1 21:32:16 2020 -0700
GEODE-7941: update Shiro to recommended version 1.5.2 (#4896)
* GEODE-7941: update Shiro to recommended version 1.5.2
* update in dependency_classpath.txt and assembly_content.txt
(cherry picked from commit 6fffd5c07a2f67575ccec6d19df48c70a51ab1c3)
---
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 ce24ce9..765efc4 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -340,7 +340,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.4.1</version>
+ <version>1.5.2</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 e36a2f2..45c2a79 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.4.1")
+ deps.put("shiro.version", "1.5.2")
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 8b3b268..3e7a85f 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.42.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.4.1.jar
-lib/shiro-config-core-1.4.1.jar
-lib/shiro-config-ogdl-1.4.1.jar
-lib/shiro-core-1.4.1.jar
-lib/shiro-crypto-cipher-1.4.1.jar
-lib/shiro-crypto-core-1.4.1.jar
-lib/shiro-crypto-hash-1.4.1.jar
-lib/shiro-event-1.4.1.jar
-lib/shiro-lang-1.4.1.jar
+lib/shiro-cache-1.5.2.jar
+lib/shiro-config-core-1.5.2.jar
+lib/shiro-config-ogdl-1.5.2.jar
+lib/shiro-core-1.5.2.jar
+lib/shiro-crypto-cipher-1.5.2.jar
+lib/shiro-crypto-core-1.5.2.jar
+lib/shiro-crypto-hash-1.5.2.jar
+lib/shiro-event-1.5.2.jar
+lib/shiro-lang-1.5.2.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.1.RELEASE.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 95af982..f442a24 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.4.1.jar
-shiro-config-ogdl-1.4.1.jar
+shiro-core-1.5.2.jar
+shiro-config-ogdl-1.5.2.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.4.1.jar
-shiro-crypto-hash-1.4.1.jar
-shiro-crypto-cipher-1.4.1.jar
-shiro-config-core-1.4.1.jar
-shiro-event-1.4.1.jar
-shiro-crypto-core-1.4.1.jar
-shiro-lang-1.4.1.jar
+shiro-cache-1.5.2.jar
+shiro-crypto-hash-1.5.2.jar
+shiro-crypto-cipher-1.5.2.jar
+shiro-config-core-1.5.2.jar
+shiro-event-1.5.2.jar
+shiro-crypto-core-1.5.2.jar
+shiro-lang-1.5.2.jar
slf4j-api-1.7.28.jar
swagger-annotations-1.5.23.jar
spring-core-5.2.1.RELEASE.jar