From f3811a152775daefef4995adfd523f08b437ad40 Mon Sep 17 00:00:00 2001
From: Brian Demers <bdemers@apache.org>
Date: Tue, 4 Oct 2022 16:18:49 -0500
Subject: [PATCH 1/2] Fix integration test package versions

---
 integration-tests/jaxrs/app/pom.xml          | 4 ++--
 integration-tests/jaxrs/meecrowave/pom.xml   | 2 +-
 integration-tests/jaxrs/openliberty/pom.xml  | 2 +-
 integration-tests/jaxrs/pom.xml              | 2 +-
 integration-tests/jaxrs/tests/pom.xml        | 2 +-
 integration-tests/meecrowave-support/pom.xml | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/integration-tests/jaxrs/app/pom.xml b/integration-tests/jaxrs/app/pom.xml
index 7d9463c1fc..d0a8e9ad15 100644
--- a/integration-tests/jaxrs/app/pom.xml
+++ b/integration-tests/jaxrs/app/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
         <artifactId>shiro-its-jaxrs</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shiro-its-jaxrs-app</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.10.0-SNAPSHOT</version>
     <name>Apache Shiro :: ITs :: JAX-RS :: App</name>
     <packaging>war</packaging>
 
diff --git a/integration-tests/jaxrs/meecrowave/pom.xml b/integration-tests/jaxrs/meecrowave/pom.xml
index 1b4828ee98..913a0f2526 100644
--- a/integration-tests/jaxrs/meecrowave/pom.xml
+++ b/integration-tests/jaxrs/meecrowave/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
         <artifactId>shiro-its-jaxrs</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shiro-its-jaxrs-meecrowave</artifactId>
diff --git a/integration-tests/jaxrs/openliberty/pom.xml b/integration-tests/jaxrs/openliberty/pom.xml
index 3935318321..c40ded4680 100644
--- a/integration-tests/jaxrs/openliberty/pom.xml
+++ b/integration-tests/jaxrs/openliberty/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
         <artifactId>shiro-its-jaxrs</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shiro-its-jaxrs-openliberty</artifactId>
diff --git a/integration-tests/jaxrs/pom.xml b/integration-tests/jaxrs/pom.xml
index b39d660062..47040cea2f 100644
--- a/integration-tests/jaxrs/pom.xml
+++ b/integration-tests/jaxrs/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.shiro.integrationtests</groupId>
         <artifactId>shiro-integration-tests</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
diff --git a/integration-tests/jaxrs/tests/pom.xml b/integration-tests/jaxrs/tests/pom.xml
index 2121b44fb5..86221d2f3b 100644
--- a/integration-tests/jaxrs/tests/pom.xml
+++ b/integration-tests/jaxrs/tests/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
         <artifactId>shiro-its-jaxrs</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shiro-its-jaxrs-tests</artifactId>
diff --git a/integration-tests/meecrowave-support/pom.xml b/integration-tests/meecrowave-support/pom.xml
index 7e77845029..39628dfc66 100644
--- a/integration-tests/meecrowave-support/pom.xml
+++ b/integration-tests/meecrowave-support/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>shiro-integration-tests</artifactId>
         <groupId>org.apache.shiro.integrationtests</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shiro-its-meecrowave-support</artifactId>

From 354f79b55955ec8f0560bbcc5ebdc974c38bd9ea Mon Sep 17 00:00:00 2001
From: Brian Demers <bdemers@apache.org>
Date: Tue, 4 Oct 2022 16:23:51 -0500
Subject: [PATCH 2/2] Update various dependencies:

commons-cli - 1.5.0
commons-codec - 1.15
commons-lang3 - 3.12.0
hazelcast - 3.12.13
log4j - 2.19.0
spring - 5.3.23
spring-boot - 2.7.4
guice - 4.2.3
jaxrs - 2.1.1
htmlunit - 2.65.1
easymock - 4.3
gmaven - 1.13.1
groovy - 2.15.18
junit - 4.13.2
hibernate - 5.6.12
powermock - 2.0.2
cxf - 3.5.3
bcprov - 1.70
---
 crypto/cipher/pom.xml |  2 +-
 crypto/hash/pom.xml   |  2 +-
 pom.xml               | 34 +++++++++++++++++-----------------
 samples/jaxrs/pom.xml |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index 488e0bc20e..62c1ffcac3 100644
--- a/crypto/cipher/pom.xml
+++ b/crypto/cipher/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.64</version>
+            <version>1.70</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index 2ac6b46d34..213a82f19d 100644
--- a/crypto/hash/pom.xml
+++ b/crypto/hash/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.64</version>
+            <version>1.70</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index e1e87b1e98..49cb840af6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 
     <properties>
 
-        <shiro.previousVersion>1.7.1</shiro.previousVersion>
+        <shiro.previousVersion>1.9.0</shiro.previousVersion>
         <!-- Replaced by the build number plugin at build time: -->
         <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
         <project.build.outputTimestamp>2022-06-23T18:55:19Z</project.build.outputTimestamp>
@@ -82,17 +82,17 @@
         <aspectj.version>1.9.7</aspectj.version>
         <cas.client.core.version>3.2.2</cas.client.core.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
-        <commons.cli.version>1.4</commons.cli.version>
-        <commons.codec.version>1.14</commons.codec.version>
+        <commons.cli.version>1.5.0</commons.cli.version>
+        <commons.codec.version>1.15</commons.codec.version>
         <commons.collection.version>3.2.2</commons.collection.version>
         <commons.configuration2.version>2.8.0</commons.configuration2.version>
-        <commons.lang3.version>3.9</commons.lang3.version>
+        <commons.lang3.version>3.12.0</commons.lang3.version>
         <commons.logging.version>1.2</commons.logging.version>
         <!-- Don't change this version without also changing the shiro-ehcache and shiro-features
              modules' OSGi metadata: -->
         <ehcache.version>2.6.11</ehcache.version>
         <!-- Don't change this version without also changing the shiro-hazelcast and shiro-features OSGi metadata: -->
-        <hazelcast.version>3.12.12</hazelcast.version>
+        <hazelcast.version>3.12.13</hazelcast.version>
         <hsqldb.version>2.5.0</hsqldb.version>
         <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
         <jdk.version>1.8</jdk.version>
@@ -103,24 +103,24 @@
         <quartz.version>2.3.2</quartz.version>
         <slf4j.version>1.7.36</slf4j.version>
         <logback.version>1.2.11</logback.version>
-        <log4j.version>2.17.1</log4j.version>
-        <spring.version>5.3.20</spring.version>
-        <spring-boot.version>2.7.0</spring-boot.version>
-        <guice.version>4.2.2</guice.version>
-        <jaxrs.api.version>2.0.1</jaxrs.api.version>
-        <htmlunit.version>2.39.0</htmlunit.version>
+        <log4j.version>2.19.0</log4j.version>
+        <spring.version>5.3.23</spring.version>
+        <spring-boot.version>2.7.4</spring-boot.version>
+        <guice.version>4.2.3</guice.version>
+        <jaxrs.api.version>2.1.1</jaxrs.api.version>
+        <htmlunit.version>2.65.1</htmlunit.version>
 
         <!-- Test 3rd-party dependencies: -->
-        <easymock.version>4.1</easymock.version>
-        <gmaven.version>1.8.0</gmaven.version>
-        <groovy.version>2.5.14</groovy.version>
-        <junit.version>4.12</junit.version>
+        <easymock.version>4.3</easymock.version>
+        <gmaven.version>1.13.1</gmaven.version>
+        <groovy.version>2.5.18</groovy.version>
+        <junit.version>4.13.2</junit.version>
         <junit.server.jetty.version>0.11.0</junit.server.jetty.version>
-        <hibernate.version>5.4.3.Final</hibernate.version>
+        <hibernate.version>5.6.12.Final</hibernate.version>
         <taglibs.standard.version>1.2.5</taglibs.standard.version>
         <!-- so we can mock static methods in 3rd party libraries that sometimes don't use proper interfaces
              ahem, hazelcast, ahem... -->
-        <powermock.version>2.0.2</powermock.version>
+        <powermock.version>2.0.9</powermock.version>
 
         <maven.compiler.source>${jdk.version}</maven.compiler.source>
         <maven.compiler.target>${jdk.version}</maven.compiler.target>
diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml
index 92860e242e..1b6fab389a 100644
--- a/samples/jaxrs/pom.xml
+++ b/samples/jaxrs/pom.xml
@@ -153,7 +153,7 @@
         <profile>
             <id>cxf</id>
             <properties>
-                <cxf.version>3.3.5</cxf.version>
+                <cxf.version>3.5.3</cxf.version>
             </properties>
             <dependencies>
                 <dependency>