Move master to 2.0.0-SNAPSHOT
diff --git a/all/pom.xml b/all/pom.xml
index a40cf02..19c348f 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/cache/pom.xml b/cache/pom.xml
index b112f4c..bed6d4e 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index 7a87406..faa8716 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
index b0bd9ff..aa05dff 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/config/pom.xml b/config/pom.xml
index 18f060e..0d39970 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index afa5d2e..bf3ac48 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index 8d53327..559624b 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
index 011f4a5..7297b58 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index 2b07108..17b9deb 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/crypto/pom.xml b/crypto/pom.xml
index 46b0528..b7f0e68 100644
--- a/crypto/pom.xml
+++ b/crypto/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/event/pom.xml b/event/pom.xml
index 058e52b..19e8912 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index d0a3583..37326b4 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index 7720f40..37f45ca 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index ccf8697..6f4a8fb 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml
index 9b1981a..bcfd9fd 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/lang/pom.xml b/lang/pom.xml
index d894015..275a7d2 100644
--- a/lang/pom.xml
+++ b/lang/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index f66d233..e55d133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<packaging>pom</packaging>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Shiro</name>
<url>https://shiro.apache.org/</url>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index 96f9080..748cb0b 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index 4083fa4..d1ee44d 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml
index 85efbae..cf5dfb2 100644
--- a/samples/jaxrs/pom.xml
+++ b/samples/jaxrs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/pom.xml b/samples/pom.xml
index 55c1234..3ae24a3 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml
index 7aa2190..cdd2eb2 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml
index 3cefa73..8d781e5 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index 04f9b9b..67f79f7 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
index 4e9400e..0f64ae1 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index 558019a..e7991d5 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index 2153173..74c87dd 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index 7016193..253823d 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 8d70046..a40d458 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index 8777509..ac3ec71 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index ab488f5..68b1a87 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/cas/pom.xml b/support/cas/pom.xml
index 3f7a377..c0909ae 100644
--- a/support/cas/pom.xml
+++ b/support/cas/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
index 77b2c2f..b56cce3 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 082d84e..845b453 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index b2b4189..66ade20 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 64e063a..b5d3bb8 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index f990d64..3302e51 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/pom.xml b/support/pom.xml
index abfef8c..fdc223f 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index 3dea88d..190659f 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml
index 02da0ec..2d24a50 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
index a50f3aa..a3dc955 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml
index 9583d18..f797e6d 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml
index c8bc836..0a69002 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index aea539a..254373f 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
index 3c295f4..1abe085 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml
index 34cfb7c..9af02f8 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>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tools/pom.xml b/tools/pom.xml
index 67e8620..01c371c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/web/pom.xml b/web/pom.xml
index f049616..7de72ac 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
