From 443135bf8b2ee960b25c93c5d9619c4aa8c15830 Mon Sep 17 00:00:00 2001 From: francois papon Date: Mon, 30 Oct 2023 10:52:50 +0100 Subject: [PATCH] Revert "[maven-release-plugin] prepare release shiro-root-1.13.0" This reverts commit fb469762d32cf2fbaaa3f296475e50680c384961. --- all/pom.xml | 2 +- bom/pom.xml | 2 +- cache/pom.xml | 2 +- config/core/pom.xml | 2 +- config/ogdl/pom.xml | 2 +- config/pom.xml | 2 +- core/pom.xml | 2 +- crypto/cipher/pom.xml | 2 +- crypto/core/pom.xml | 2 +- crypto/hash/pom.xml | 2 +- crypto/pom.xml | 2 +- event/pom.xml | 2 +- integration-tests/guice3/pom.xml | 2 +- integration-tests/guice4/pom.xml | 2 +- integration-tests/pom.xml | 2 +- integration-tests/support/pom.xml | 2 +- lang/pom.xml | 2 +- pom.xml | 6 +++--- samples/aspectj/pom.xml | 2 +- samples/guice/pom.xml | 2 +- samples/jaxrs/pom.xml | 2 +- samples/pom.xml | 2 +- samples/quickstart-guice/pom.xml | 2 +- samples/quickstart/pom.xml | 2 +- samples/servlet-plugin/pom.xml | 2 +- samples/spring-boot-web/pom.xml | 2 +- samples/spring-boot/pom.xml | 2 +- samples/spring-hibernate/pom.xml | 2 +- samples/spring-mvc/pom.xml | 2 +- samples/spring/pom.xml | 2 +- samples/web-jakarta/pom.xml | 2 +- samples/web/pom.xml | 2 +- support/aspectj/pom.xml | 2 +- support/cas/pom.xml | 2 +- support/ehcache/pom.xml | 2 +- support/features/pom.xml | 2 +- support/guice/pom.xml | 2 +- support/hazelcast/pom.xml | 2 +- support/jaxrs/pom.xml | 2 +- support/jcache/pom.xml | 2 +- support/pom.xml | 2 +- support/quartz/pom.xml | 2 +- support/servlet-plugin/pom.xml | 2 +- support/spring-boot/pom.xml | 2 +- support/spring-boot/spring-boot-starter/pom.xml | 2 +- support/spring-boot/spring-boot-web-starter/pom.xml | 2 +- support/spring/pom.xml | 2 +- test-coverage/pom.xml | 2 +- tools/hasher/pom.xml | 2 +- tools/pom.xml | 2 +- web/pom.xml | 2 +- 51 files changed, 53 insertions(+), 53 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index a8effaf5f9..150484daf1 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index df5d7008d3..14751a9502 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -21,7 +21,7 @@ shiro-root org.apache.shiro - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/cache/pom.xml b/cache/pom.xml index 9232a19fff..1f3f27f410 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/config/core/pom.xml b/config/core/pom.xml index e2bb3c9b48..125f5adf22 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-config - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml index 3f77719c3d..18ae2c7dbc 100644 --- a/config/ogdl/pom.xml +++ b/config/ogdl/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-config - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index b6d807c267..5779b52b30 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT shiro-config diff --git a/core/pom.xml b/core/pom.xml index fd691602c6..266855dcf9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml index d54490506a..d178940229 100644 --- a/crypto/cipher/pom.xml +++ b/crypto/cipher/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-crypto - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml index 4319f8a53b..61cd319673 100644 --- a/crypto/core/pom.xml +++ b/crypto/core/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-crypto - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml index 7d09c9731c..5186436ddb 100644 --- a/crypto/hash/pom.xml +++ b/crypto/hash/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-crypto - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/crypto/pom.xml b/crypto/pom.xml index aeaddd82b3..e9607db6c4 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -24,7 +24,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT shiro-crypto diff --git a/event/pom.xml b/event/pom.xml index 7b85290c56..daf6ce19d3 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml index 837e8ee771..4f41799e84 100644 --- a/integration-tests/guice3/pom.xml +++ b/integration-tests/guice3/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.integrationtests shiro-integration-tests - 1.13.0 + 1.13.0-SNAPSHOT shiro-its-guice3 diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml index 87a458e59b..e631537c33 100644 --- a/integration-tests/guice4/pom.xml +++ b/integration-tests/guice4/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.integrationtests shiro-integration-tests - 1.13.0 + 1.13.0-SNAPSHOT shiro-its-guice4 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index d5e37004eb..4f8292208c 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT org.apache.shiro.integrationtests diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml index bac45089fb..c7884c37c6 100644 --- a/integration-tests/support/pom.xml +++ b/integration-tests/support/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.integrationtests shiro-integration-tests - 1.13.0 + 1.13.0-SNAPSHOT shiro-its-support diff --git a/lang/pom.xml b/lang/pom.xml index eb096758a9..5485aa71ed 100644 --- a/lang/pom.xml +++ b/lang/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index c7445afbca..64950431b3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.apache.shiro shiro-root pom - 1.13.0 + 1.13.0-SNAPSHOT Apache Shiro https://shiro.apache.org/ @@ -44,7 +44,7 @@ scm:git:https://gitbox.apache.org/repos/asf/shiro.git scm:git:https://gitbox.apache.org/repos/asf/shiro.git https://github.com/apache/shiro/tree/${project.scm.tag} - shiro-root-1.13.0 + shiro-root-1.12.0 Jira @@ -69,7 +69,7 @@ 1.11.0 ${user.name}-${maven.build.timestamp} - 2023-10-29T09:55:59Z + 2023-10-25T19:21:25Z true false diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml index 00d6612abf..2a124659aa 100644 --- a/samples/aspectj/pom.xml +++ b/samples/aspectj/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml index 4d73ff3a3b..609178fa5e 100644 --- a/samples/guice/pom.xml +++ b/samples/guice/pom.xml @@ -21,7 +21,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml index d239e842c2..e0a4a1f0f0 100644 --- a/samples/jaxrs/pom.xml +++ b/samples/jaxrs/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/pom.xml b/samples/pom.xml index 62a9d58ef8..e4daf14cd0 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml index 60590f2c30..d59bd6dae3 100644 --- a/samples/quickstart-guice/pom.xml +++ b/samples/quickstart-guice/pom.xml @@ -21,7 +21,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml index 1935ad373e..b9d0864b4e 100644 --- a/samples/quickstart/pom.xml +++ b/samples/quickstart/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml index 6beaa00011..0f6e4fdbe1 100644 --- a/samples/servlet-plugin/pom.xml +++ b/samples/servlet-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml index 9b8eef5afd..d99364378a 100644 --- a/samples/spring-boot-web/pom.xml +++ b/samples/spring-boot-web/pom.xml @@ -25,7 +25,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT samples-spring-boot-web diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index 2c004d0176..e99f492777 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -25,7 +25,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT samples-spring-boot diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml index 1b650f5229..6eda1864db 100644 --- a/samples/spring-hibernate/pom.xml +++ b/samples/spring-hibernate/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml index f0068a07be..a01b3d630d 100644 --- a/samples/spring-mvc/pom.xml +++ b/samples/spring-mvc/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index 047dd02a73..35c5830bc4 100644 --- a/samples/spring/pom.xml +++ b/samples/spring/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/web-jakarta/pom.xml b/samples/web-jakarta/pom.xml index 28892fbc95..6e9043d9a9 100644 --- a/samples/web-jakarta/pom.xml +++ b/samples/web-jakarta/pom.xml @@ -21,7 +21,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/samples/web/pom.xml b/samples/web/pom.xml index c205b015c0..9a69ede2a8 100644 --- a/samples/web/pom.xml +++ b/samples/web/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro.samples shiro-samples - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml index eb0918d3c5..2ba4695c56 100644 --- a/support/aspectj/pom.xml +++ b/support/aspectj/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/cas/pom.xml b/support/cas/pom.xml index a561c3ab35..2ca13685c7 100644 --- a/support/cas/pom.xml +++ b/support/cas/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml index f6bcc23b8a..e5e4414689 100644 --- a/support/ehcache/pom.xml +++ b/support/ehcache/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/features/pom.xml b/support/features/pom.xml index bc02b2b079..cfe9a91042 100644 --- a/support/features/pom.xml +++ b/support/features/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/guice/pom.xml b/support/guice/pom.xml index a820d5f540..2efded4ad0 100644 --- a/support/guice/pom.xml +++ b/support/guice/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml index aeea34e30c..a869d7a0d1 100644 --- a/support/hazelcast/pom.xml +++ b/support/hazelcast/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml index afe26961d5..09aeeeeb22 100644 --- a/support/jaxrs/pom.xml +++ b/support/jaxrs/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/jcache/pom.xml b/support/jcache/pom.xml index 43e33752a7..feb38146fd 100644 --- a/support/jcache/pom.xml +++ b/support/jcache/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT ../pom.xml diff --git a/support/pom.xml b/support/pom.xml index 96f18b25b9..c4286145d7 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml index 6aceb36ed2..38a32a7c26 100644 --- a/support/quartz/pom.xml +++ b/support/quartz/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml index de80a0f375..9cc7b5f021 100644 --- a/support/servlet-plugin/pom.xml +++ b/support/servlet-plugin/pom.xml @@ -25,7 +25,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT shiro-servlet-plugin diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml index 896390208a..b92774667e 100644 --- a/support/spring-boot/pom.xml +++ b/support/spring-boot/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml index aec27b2f28..ac45fe4365 100644 --- a/support/spring-boot/spring-boot-starter/pom.xml +++ b/support/spring-boot/spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ org.apache.shiro shiro-spring-boot - 1.13.0 + 1.13.0-SNAPSHOT shiro-spring-boot-starter diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml index 41c1c3fc82..2cea06b8c5 100644 --- a/support/spring-boot/spring-boot-web-starter/pom.xml +++ b/support/spring-boot/spring-boot-web-starter/pom.xml @@ -25,7 +25,7 @@ org.apache.shiro shiro-spring-boot - 1.13.0 + 1.13.0-SNAPSHOT shiro-spring-boot-web-starter diff --git a/support/spring/pom.xml b/support/spring/pom.xml index 82b7d0ee44..07706db535 100644 --- a/support/spring/pom.xml +++ b/support/spring/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-support - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index 26ed54083c..f3cf93951d 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml index 0bfcd2312f..3b0880a3e8 100644 --- a/tools/hasher/pom.xml +++ b/tools/hasher/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro.tools shiro-tools - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/tools/pom.xml b/tools/pom.xml index ae9724a4b3..7ff1f53d6b 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -22,7 +22,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0 diff --git a/web/pom.xml b/web/pom.xml index 7744f7b6e4..2bf4fe31fd 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -23,7 +23,7 @@ org.apache.shiro shiro-root - 1.13.0 + 1.13.0-SNAPSHOT 4.0.0