Repository: shiro Updated Branches: refs/heads/1.2.x 61aa3930e -> 9f36ed43f
Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 61aa3930e647050e3b867f0f4f14391e0601d0fa. Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/f6f79548 Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/f6f79548 Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/f6f79548 Branch: refs/heads/1.2.x Commit: f6f7954808c095842af9f5d1de3cac889a9d2c7e Parents: 61aa393 Author: bdemers <[email protected]> Authored: Wed May 18 16:55:15 2016 -0400 Committer: bdemers <[email protected]> Committed: Wed May 18 16:55:15 2016 -0400 ---------------------------------------------------------------------- all/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 4 ++-- samples/aspectj/pom.xml | 2 +- samples/pom.xml | 2 +- samples/quickstart/pom.xml | 2 +- samples/spring-client/pom.xml | 2 +- samples/spring-hibernate/pom.xml | 2 +- samples/spring/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/pom.xml | 2 +- support/quartz/pom.xml | 2 +- support/spring/pom.xml | 2 +- tools/hasher/pom.xml | 2 +- tools/pom.xml | 2 +- web/pom.xml | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/all/pom.xml ---------------------------------------------------------------------- diff --git a/all/pom.xml b/all/pom.xml index d217fa7..ca3d42b 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 7282780..2cebb01 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a37148a..ed4e178 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <name>Apache Shiro</name> <url>http://shiro.apache.org/</url> @@ -44,7 +44,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/shiro.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/shiro.git</developerConnection> <url>https://github.com/apache/shiro/tree/${project.scm.tag}</url> - <tag>1.2.x</tag> + <tag>shiro-root-1.2.5</tag> </scm> <issueManagement> <system>Jira</system> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/aspectj/pom.xml ---------------------------------------------------------------------- diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml index df7981f..04f82b8 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index 941621e..c11ea0e 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml index ad87333..00c5c59 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/spring-client/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml index 03f35cb..668398c 100644 --- a/samples/spring-client/pom.xml +++ b/samples/spring-client/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/spring-hibernate/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml index 542df06..ad4f84c 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/spring/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index 88bb06c..2bcd357 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/samples/web/pom.xml ---------------------------------------------------------------------- diff --git a/samples/web/pom.xml b/samples/web/pom.xml index f77e048..e9b9949 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/aspectj/pom.xml ---------------------------------------------------------------------- diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml index b32b388..9a9bfd7 100644 --- a/support/aspectj/pom.xml +++ b/support/aspectj/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/cas/pom.xml ---------------------------------------------------------------------- diff --git a/support/cas/pom.xml b/support/cas/pom.xml index af97d64..ac034e7 100644 --- a/support/cas/pom.xml +++ b/support/cas/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/ehcache/pom.xml ---------------------------------------------------------------------- diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml index f4e18f2..7c8684e 100644 --- a/support/ehcache/pom.xml +++ b/support/ehcache/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/features/pom.xml ---------------------------------------------------------------------- diff --git a/support/features/pom.xml b/support/features/pom.xml index 5dfaee8..19b174f 100644 --- a/support/features/pom.xml +++ b/support/features/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/guice/pom.xml ---------------------------------------------------------------------- diff --git a/support/guice/pom.xml b/support/guice/pom.xml index 39543d9..b5e81b8 100644 --- a/support/guice/pom.xml +++ b/support/guice/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/pom.xml ---------------------------------------------------------------------- diff --git a/support/pom.xml b/support/pom.xml index 499aba3..d6fc217 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/quartz/pom.xml ---------------------------------------------------------------------- diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml index e2cd9cd..b74713e 100644 --- a/support/quartz/pom.xml +++ b/support/quartz/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/support/spring/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring/pom.xml b/support/spring/pom.xml index a90e7ba..6b07832 100644 --- a/support/spring/pom.xml +++ b/support/spring/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/tools/hasher/pom.xml ---------------------------------------------------------------------- diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml index 81a5e0a..6db0319 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index 132212c..77fc449 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f6f79548/web/pom.xml ---------------------------------------------------------------------- diff --git a/web/pom.xml b/web/pom.xml index 5d90b97..3f99b7d 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.2.6-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent>
