This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to tag shiro-root-2.0.0-alpha-3-vote-2 in repository https://gitbox.apache.org/repos/asf/shiro.git
commit a1d532d6ed6f365b47a66c45f711950f78cbb20a Author: lprimak <[email protected]> AuthorDate: Tue Jul 25 16:04:45 2023 -0500 [maven-release-plugin] prepare release shiro-root-2.0.0-alpha-3 --- bom/pom.xml | 6 ++---- 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 +- crypto/support/hashes/argon2/pom.xml | 6 ++---- crypto/support/hashes/bcrypt/pom.xml | 6 ++---- crypto/support/pom.xml | 6 ++---- event/pom.xml | 2 +- integration-tests/guice3/pom.xml | 2 +- integration-tests/guice4/pom.xml | 2 +- integration-tests/jakarta-ee-support/pom.xml | 4 ++-- integration-tests/jakarta-ee/pom.xml | 13 ++++++------- integration-tests/jaxrs/app/pom.xml | 8 +++----- integration-tests/jaxrs/meecrowave/pom.xml | 6 ++---- integration-tests/jaxrs/openliberty/pom.xml | 6 ++---- integration-tests/jaxrs/pom.xml | 6 ++---- integration-tests/jaxrs/tests/pom.xml | 6 ++---- integration-tests/meecrowave-support/pom.xml | 6 ++---- integration-tests/pom.xml | 2 +- integration-tests/support/pom.xml | 2 +- lang/pom.xml | 2 +- pom.xml | 12 ++++++------ samples/aspectj/pom.xml | 2 +- samples/guice/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-3-web/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 | 6 ++---- samples/web/pom.xml | 2 +- support/aspectj/pom.xml | 2 +- support/cdi/pom.xml | 2 +- support/ehcache/pom.xml | 2 +- support/features/pom.xml | 2 +- support/guice/pom.xml | 2 +- support/hazelcast/pom.xml | 2 +- support/jakarta-ee/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 +- 62 files changed, 85 insertions(+), 108 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index b9cb6b177..199479e96 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,13 +17,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>shiro-root</artifactId> <groupId>org.apache.shiro</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/cache/pom.xml b/cache/pom.xml index efbdae8ee..c1bae952c 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/config/core/pom.xml b/config/core/pom.xml index c41b94126..39deae92d 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml index dceb2065e..e5f48dce8 100644 --- a/config/ogdl/pom.xml +++ b/config/ogdl/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/config/pom.xml b/config/pom.xml index 7b885c4d7..584ce3729 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-config</artifactId> diff --git a/core/pom.xml b/core/pom.xml index a81cbf471..3d60e52ea 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml index a190c73b5..f02dd998d 100644 --- a/crypto/cipher/pom.xml +++ b/crypto/cipher/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml index 6105d06b1..9da1c0948 100644 --- a/crypto/core/pom.xml +++ b/crypto/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml index 82acf151d..be7e3f1f2 100644 --- a/crypto/hash/pom.xml +++ b/crypto/hash/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/crypto/pom.xml b/crypto/pom.xml index 28cda20fb..04af72936 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-crypto</artifactId> diff --git a/crypto/support/hashes/argon2/pom.xml b/crypto/support/hashes/argon2/pom.xml index c82b586fb..a9f0ae2cf 100644 --- a/crypto/support/hashes/argon2/pom.xml +++ b/crypto/support/hashes/argon2/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.crypto</groupId> <artifactId>shiro-crypto-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/crypto/support/hashes/bcrypt/pom.xml b/crypto/support/hashes/bcrypt/pom.xml index d25aa0c3d..22803e7fd 100644 --- a/crypto/support/hashes/bcrypt/pom.xml +++ b/crypto/support/hashes/bcrypt/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.crypto</groupId> <artifactId>shiro-crypto-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/crypto/support/pom.xml b/crypto/support/pom.xml index fde3c8710..1abf88a13 100644 --- a/crypto/support/pom.xml +++ b/crypto/support/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <groupId>org.apache.shiro.crypto</groupId> diff --git a/event/pom.xml b/event/pom.xml index 090e6a3cf..0f90261eb 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml index 79aa731e0..71e3f882d 100644 --- a/integration-tests/guice3/pom.xml +++ b/integration-tests/guice3/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-its-guice3</artifactId> diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml index 0c45c4680..13f2e1e75 100644 --- a/integration-tests/guice4/pom.xml +++ b/integration-tests/guice4/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-its-guice4</artifactId> diff --git a/integration-tests/jakarta-ee-support/pom.xml b/integration-tests/jakarta-ee-support/pom.xml index 228cc9a06..97cde2242 100644 --- a/integration-tests/jakarta-ee-support/pom.xml +++ b/integration-tests/jakarta-ee-support/pom.xml @@ -21,14 +21,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>jakarta-ee-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> <name>Apache Shiro :: ITs :: Jakarta EE Support</name> <packaging>pom</packaging> <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <build> diff --git a/integration-tests/jakarta-ee/pom.xml b/integration-tests/jakarta-ee/pom.xml index 0f05e5ba6..894e6467c 100644 --- a/integration-tests/jakarta-ee/pom.xml +++ b/integration-tests/jakarta-ee/pom.xml @@ -21,14 +21,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-its-jakarta-ee</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> <packaging>war</packaging> <name>Apache Shiro :: ITs :: Jakarta EE</name> <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <properties> @@ -48,7 +48,7 @@ <payara.start.skip>${skipITs}</payara.start.skip> <asadmin.cmd>asadmin</asadmin.cmd> <unix-sed-skip>${payara.start.skip}</unix-sed-skip> - <mac-backup-file/> + <mac-backup-file /> <create-domain-skip>true</create-domain-skip> <domain.name>domain1</domain.name> @@ -338,8 +338,7 @@ int portbase = 4900 + (executor_number as int) * port_increment int adminPort // find a free port - for (; portbase < 10000; portbase += port_increment) { - def server_socket + for (; portbase < 10000; portbase += port_increment) { def server_socket adminPort = portbase + admin_port_increment try { server_socket = new ServerSocket() @@ -397,7 +396,7 @@ <phase>pre-integration-test</phase> <configuration> <executable>sed</executable> - <commandlineArgs>-i ${mac-backup-file} -e 's/jvm-options>\[17|/jvm-options>\[16|/g' + <commandlineArgs>-i ${mac-backup-file} -e 's/jvm-options>\[17|/jvm-options>\[16|/g' -e 's/property name="HZ_LISTENER_PORT" value="5900/property name="HZ_LISTENER_PORT" value="5920/g' -e 's/hazelcast-runtime-configuration start-port="5900/hazelcast-runtime-configuration start-port="5920/g' ${project.build.directory}/dependency/payara5/glassfish/domains/${domain.name}/config/domain.xml</commandlineArgs> @@ -481,7 +480,7 @@ <id>payara-server-remote</id> <properties> <payara.start.skip>true</payara.start.skip> - <payara.argLine/> + <payara.argLine /> </properties> </profile> <profile> diff --git a/integration-tests/jaxrs/app/pom.xml b/integration-tests/jaxrs/app/pom.xml index 91564ba05..42082a325 100644 --- a/integration-tests/jaxrs/app/pom.xml +++ b/integration-tests/jaxrs/app/pom.xml @@ -18,19 +18,17 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.integrationtests.jaxrs</groupId> <artifactId>shiro-its-jaxrs</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-its-jaxrs-app</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</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 d0602cc81..28a1051bb 100644 --- a/integration-tests/jaxrs/meecrowave/pom.xml +++ b/integration-tests/jaxrs/meecrowave/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.integrationtests.jaxrs</groupId> <artifactId>shiro-its-jaxrs</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</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 3aad63bb8..98a2dca16 100644 --- a/integration-tests/jaxrs/openliberty/pom.xml +++ b/integration-tests/jaxrs/openliberty/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.integrationtests.jaxrs</groupId> <artifactId>shiro-its-jaxrs</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-its-jaxrs-openliberty</artifactId> diff --git a/integration-tests/jaxrs/pom.xml b/integration-tests/jaxrs/pom.xml index b39d66006..9d5daf7f9 100644 --- a/integration-tests/jaxrs/pom.xml +++ b/integration-tests/jaxrs/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</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 fa66549e3..9cea23281 100644 --- a/integration-tests/jaxrs/tests/pom.xml +++ b/integration-tests/jaxrs/tests/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shiro.integrationtests.jaxrs</groupId> <artifactId>shiro-its-jaxrs</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</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 e3a594265..538d53217 100644 --- a/integration-tests/meecrowave-support/pom.xml +++ b/integration-tests/meecrowave-support/pom.xml @@ -18,15 +18,13 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>shiro-integration-tests</artifactId> <groupId>org.apache.shiro.integrationtests</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-its-meecrowave-support</artifactId> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index df8bce4ce..283e0497d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <groupId>org.apache.shiro.integrationtests</groupId> diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml index b1b3d62dc..1cc81d4a7 100644 --- a/integration-tests/support/pom.xml +++ b/integration-tests/support/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-its-support</artifactId> diff --git a/lang/pom.xml b/lang/pom.xml index e6729bce4..430daa00d 100644 --- a/lang/pom.xml +++ b/lang/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 6c8fdedf9..f08b054f9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> <packaging>pom</packaging> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> <name>Apache Shiro</name> <url>https://shiro.apache.org/</url> @@ -44,7 +44,7 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/shiro.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/shiro.git</developerConnection> <url>https://github.com/apache/shiro/tree/${project.scm.tag}</url> - <tag>main</tag> + <tag>shiro-root-2.0.0-alpha-3</tag> </scm> <issueManagement> <system>Jira</system> @@ -69,14 +69,14 @@ <shiro.previousVersion>1.7.1</shiro.previousVersion> <!-- Replaced by the build number plugin at build time: --> <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber> - <project.build.outputTimestamp>2022-03-22T23:08:15Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2023-07-25T21:04:28Z</project.build.outputTimestamp> <jacoco.skip>true</jacoco.skip> <!--suppress CheckTagEmptyBody --> - <surefire.argLine></surefire.argLine> + <surefire.argLine /> <!--suppress CheckTagEmptyBody --> - <failsafe.argLine></failsafe.argLine> + <failsafe.argLine /> <nexus.deploy.skip>false</nexus.deploy.skip> - <jacocoAgent/> + <jacocoAgent /> <!-- non-dependency-based properties: --> <shiro.osgi.importRange>[2, 3)</shiro.osgi.importRange> <jcache.osgi.importRange>[1.1,2)</jcache.osgi.importRange> diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml index af9b9218b..e77b7c081 100644 --- a/samples/aspectj/pom.xml +++ b/samples/aspectj/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml index 3262723df..1b9adffdd 100644 --- a/samples/guice/pom.xml +++ b/samples/guice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/pom.xml b/samples/pom.xml index ea9049337..31d721e4c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml index de4417168..af902602d 100644 --- a/samples/quickstart-guice/pom.xml +++ b/samples/quickstart-guice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml index 3f117014e..6eebe95eb 100644 --- a/samples/quickstart/pom.xml +++ b/samples/quickstart/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml index 5088e3f35..7c4e61ec8 100644 --- a/samples/servlet-plugin/pom.xml +++ b/samples/servlet-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/spring-boot-3-web/pom.xml b/samples/spring-boot-3-web/pom.xml index 5f16321e3..0962ddbec 100644 --- a/samples/spring-boot-3-web/pom.xml +++ b/samples/spring-boot-3-web/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>samples-spring-boot-3-web</artifactId> diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml index d3027b519..f2146bb0a 100644 --- a/samples/spring-boot-web/pom.xml +++ b/samples/spring-boot-web/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>samples-spring-boot-web</artifactId> diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index f214a7742..16db93cb5 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>samples-spring-boot</artifactId> diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml index 7bfe6b251..a290e31c7 100644 --- a/samples/spring-hibernate/pom.xml +++ b/samples/spring-hibernate/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml index 901a1a7bb..e56f759ca 100644 --- a/samples/spring-mvc/pom.xml +++ b/samples/spring-mvc/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index 78d35cf74..bd7122e07 100644 --- a/samples/spring/pom.xml +++ b/samples/spring/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/web-jakarta/pom.xml b/samples/web-jakarta/pom.xml index 0448a2c10..0a3a59cf7 100644 --- a/samples/web-jakarta/pom.xml +++ b/samples/web-jakarta/pom.xml @@ -17,13 +17,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/web/pom.xml b/samples/web/pom.xml index f771559c7..9acd04602 100644 --- a/samples/web/pom.xml +++ b/samples/web/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml index bd77a9eb5..c99917aee 100644 --- a/support/aspectj/pom.xml +++ b/support/aspectj/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/cdi/pom.xml b/support/cdi/pom.xml index 5c6863194..cd1b2ab29 100644 --- a/support/cdi/pom.xml +++ b/support/cdi/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <properties> <module.name>cdi</module.name> diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml index e2d297dc3..e802f3e44 100644 --- a/support/ehcache/pom.xml +++ b/support/ehcache/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/features/pom.xml b/support/features/pom.xml index 4a5fcefef..73f17db6e 100644 --- a/support/features/pom.xml +++ b/support/features/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/guice/pom.xml b/support/guice/pom.xml index bb9287724..81e86683a 100644 --- a/support/guice/pom.xml +++ b/support/guice/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml index 07c5bbecd..322ea6b12 100644 --- a/support/hazelcast/pom.xml +++ b/support/hazelcast/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/jakarta-ee/pom.xml b/support/jakarta-ee/pom.xml index 07f4eca68..94a13c336 100644 --- a/support/jakarta-ee/pom.xml +++ b/support/jakarta-ee/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <properties> diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml index b56cd6517..2775bdc7d 100644 --- a/support/jaxrs/pom.xml +++ b/support/jaxrs/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/jcache/pom.xml b/support/jcache/pom.xml index 36d2270dd..ae446d177 100644 --- a/support/jcache/pom.xml +++ b/support/jcache/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/support/pom.xml b/support/pom.xml index 526d80ba9..85dded3fa 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml index 72e089374..551385f2e 100644 --- a/support/quartz/pom.xml +++ b/support/quartz/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml index 1699c139f..dd26cef0d 100644 --- a/support/servlet-plugin/pom.xml +++ b/support/servlet-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-servlet-plugin</artifactId> diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml index 310d429ad..8cca1b6fa 100644 --- a/support/spring-boot/pom.xml +++ b/support/spring-boot/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml index 65cf593a8..d0d4ccdba 100644 --- a/support/spring-boot/spring-boot-starter/pom.xml +++ b/support/spring-boot/spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-spring-boot-starter</artifactId> diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml index ef8020685..e7269a152 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 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <artifactId>shiro-spring-boot-web-starter</artifactId> diff --git a/support/spring/pom.xml b/support/spring/pom.xml index bccba64ab..de9c567af 100644 --- a/support/spring/pom.xml +++ b/support/spring/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index f48427518..70d5fc3f9 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml index 351d3cd04..99b67a872 100644 --- a/tools/hasher/pom.xml +++ b/tools/hasher/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro.tools</groupId> <artifactId>shiro-tools</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tools/pom.xml b/tools/pom.xml index cf87c6d21..48881095e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/web/pom.xml b/web/pom.xml index 75b1cf767..871faf602 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-alpha-3</version> </parent> <modelVersion>4.0.0</modelVersion>
