You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/01/19 07:10:34 UTC
svn commit: r1233193 - in /shiro/branches/1.2.x: ./ all/ core/ samples/
samples/aspectj/ samples/quickstart/ samples/spring-client/
samples/spring-hibernate/ samples/spring/ samples/web/ support/
support/aspectj/ support/cas/ support/ehcache/ support/f...
Author: lhazlewood
Date: Thu Jan 19 06:10:33 2012
New Revision: 1233193
URL: http://svn.apache.org/viewvc?rev=1233193&view=rev
Log:
SHIRO-339: reverted to 1.2.0-SNAPSHOT to retry the release. Updated maven-site-plugin to include the wagon-ssh dependency for scp
Modified:
shiro/branches/1.2.x/all/pom.xml
shiro/branches/1.2.x/core/pom.xml
shiro/branches/1.2.x/pom.xml
shiro/branches/1.2.x/samples/aspectj/pom.xml
shiro/branches/1.2.x/samples/pom.xml
shiro/branches/1.2.x/samples/quickstart/pom.xml
shiro/branches/1.2.x/samples/spring-client/pom.xml
shiro/branches/1.2.x/samples/spring-hibernate/pom.xml
shiro/branches/1.2.x/samples/spring/pom.xml
shiro/branches/1.2.x/samples/web/pom.xml
shiro/branches/1.2.x/support/aspectj/pom.xml
shiro/branches/1.2.x/support/cas/pom.xml
shiro/branches/1.2.x/support/ehcache/pom.xml
shiro/branches/1.2.x/support/features/pom.xml
shiro/branches/1.2.x/support/guice/pom.xml
shiro/branches/1.2.x/support/openid4j/pom.xml
shiro/branches/1.2.x/support/pom.xml
shiro/branches/1.2.x/support/quartz/pom.xml
shiro/branches/1.2.x/support/spring/pom.xml
shiro/branches/1.2.x/tools/hasher/pom.xml
shiro/branches/1.2.x/tools/pom.xml
shiro/branches/1.2.x/web/pom.xml
Modified: shiro/branches/1.2.x/all/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/all/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/all/pom.xml (original)
+++ shiro/branches/1.2.x/all/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/core/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/core/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/core/pom.xml (original)
+++ shiro/branches/1.2.x/core/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/pom.xml (original)
+++ shiro/branches/1.2.x/pom.xml Thu Jan 19 06:10:33 2012
@@ -30,7 +30,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<packaging>pom</packaging>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>Apache Shiro</name>
<url>http://shiro.apache.org/</url>
@@ -209,7 +209,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0-beta-7</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Modified: shiro/branches/1.2.x/samples/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/aspectj/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/aspectj/pom.xml (original)
+++ shiro/branches/1.2.x/samples/aspectj/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/samples/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/pom.xml (original)
+++ shiro/branches/1.2.x/samples/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/samples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/quickstart/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/quickstart/pom.xml (original)
+++ shiro/branches/1.2.x/samples/quickstart/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/samples/spring-client/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/spring-client/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring-client/pom.xml (original)
+++ shiro/branches/1.2.x/samples/spring-client/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/samples/spring-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/spring-hibernate/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring-hibernate/pom.xml (original)
+++ shiro/branches/1.2.x/samples/spring-hibernate/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/samples/spring/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/spring/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring/pom.xml (original)
+++ shiro/branches/1.2.x/samples/spring/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/web/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/web/pom.xml (original)
+++ shiro/branches/1.2.x/samples/web/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/aspectj/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/aspectj/pom.xml (original)
+++ shiro/branches/1.2.x/support/aspectj/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/cas/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/cas/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/cas/pom.xml (original)
+++ shiro/branches/1.2.x/support/cas/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/ehcache/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/ehcache/pom.xml (original)
+++ shiro/branches/1.2.x/support/ehcache/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/features/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/features/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/features/pom.xml (original)
+++ shiro/branches/1.2.x/support/features/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/guice/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/guice/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/guice/pom.xml (original)
+++ shiro/branches/1.2.x/support/guice/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/openid4j/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/openid4j/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/openid4j/pom.xml (original)
+++ shiro/branches/1.2.x/support/openid4j/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/pom.xml (original)
+++ shiro/branches/1.2.x/support/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/quartz/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/quartz/pom.xml (original)
+++ shiro/branches/1.2.x/support/quartz/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/support/spring/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/spring/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/spring/pom.xml (original)
+++ shiro/branches/1.2.x/support/spring/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/tools/hasher/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/tools/hasher/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/tools/hasher/pom.xml (original)
+++ shiro/branches/1.2.x/tools/hasher/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro.tools</groupId>
<artifactId>shiro-tools</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/tools/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/tools/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/tools/pom.xml (original)
+++ shiro/branches/1.2.x/tools/pom.xml Thu Jan 19 06:10:33 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shiro/branches/1.2.x/web/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/web/pom.xml?rev=1233193&r1=1233192&r2=1233193&view=diff
==============================================================================
--- shiro/branches/1.2.x/web/pom.xml (original)
+++ shiro/branches/1.2.x/web/pom.xml Thu Jan 19 06:10:33 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>