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/20 06:17:17 UTC
svn commit: r1233773 - 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: Fri Jan 20 05:17:16 2012
New Revision: 1233773
URL: http://svn.apache.org/viewvc?rev=1233773&view=rev
Log:
SHIRO-339: removed openid4j module from source tree (it is in the trunk, to be worked on for a 1.3 milestone). Reverted pom versions to 1.2.0-SNAPSHOT to re-release.
Removed:
shiro/branches/1.2.x/support/openid4j/pom.xml
shiro/branches/1.2.x/support/openid4j/src/
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/features/src/main/resources/features.xml
shiro/branches/1.2.x/support/guice/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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/all/pom.xml (original)
+++ shiro/branches/1.2.x/all/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/core/pom.xml (original)
+++ shiro/branches/1.2.x/core/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/pom.xml (original)
+++ shiro/branches/1.2.x/pom.xml Fri Jan 20 05:17:16 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>
@@ -80,7 +80,6 @@
<hsqldb.version>1.8.0.7</hsqldb.version>
<jdk.version>1.5</jdk.version>
<jetty.version>6.1.26</jetty.version>
- <openid4j.version>0.9.5</openid4j.version>
<!-- Don't change this version without also changing the shiro-quartz and shiro-features
modules' OSGi metadata: -->
<quartz.version>1.6.1</quartz.version>
@@ -541,15 +540,6 @@
<version>${aspectj.version}</version>
</dependency>
<dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java-consumer</artifactId>
- <!--artifactId>openid4java-server</artifactId-->
- <!--artifactId>openid4java-infocard</artifactId-->
- <!--artifactId>openid4java-xri</artifactId-->
- <!--artifactId>openid4java</artifactId-->
- <version>${openid4j.version}</version>
- </dependency>
- <dependency>
<!-- Used for Atlassian Crowd Realm - not required for the framework: -->
<groupId>com.atlassian.crowd</groupId>
<artifactId>crowd-integration-client</artifactId>
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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/aspectj/pom.xml (original)
+++ shiro/branches/1.2.x/samples/aspectj/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/pom.xml (original)
+++ shiro/branches/1.2.x/samples/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/quickstart/pom.xml (original)
+++ shiro/branches/1.2.x/samples/quickstart/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring-client/pom.xml (original)
+++ shiro/branches/1.2.x/samples/spring-client/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring-hibernate/pom.xml (original)
+++ shiro/branches/1.2.x/samples/spring-hibernate/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring/pom.xml (original)
+++ shiro/branches/1.2.x/samples/spring/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/web/pom.xml (original)
+++ shiro/branches/1.2.x/samples/web/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/aspectj/pom.xml (original)
+++ shiro/branches/1.2.x/support/aspectj/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/cas/pom.xml (original)
+++ shiro/branches/1.2.x/support/cas/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/ehcache/pom.xml (original)
+++ shiro/branches/1.2.x/support/ehcache/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/features/pom.xml (original)
+++ shiro/branches/1.2.x/support/features/pom.xml Fri Jan 20 05:17:16 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/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/features/src/main/resources/features.xml?rev=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/features/src/main/resources/features.xml (original)
+++ shiro/branches/1.2.x/support/features/src/main/resources/features.xml Fri Jan 20 05:17:16 2012
@@ -53,18 +53,6 @@
<bundle>mvn:org.apache.shiro/shiro-ehcache/${project.version}</bundle>
</feature>
- <!--
- TODO enable when openid4j module is done
- <feature name="shiro-openid4j" version="${project.version}" resolver="(obr)">
- <feature version="${project.version}">shiro-core</feature>
- <feature version="${project.version}">shiro-web</feature>
- <feature version="[3,4)">spring</feature>
- TODO: is there an openid4j OSGi bundle?
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openid4j/${openid4j.version}</bundle>
- <bundle>mvn:org.apache.shiro/shiro-openid4j/${project.version}</bundle>
- </feature>
- -->
-
<feature name="shiro-quartz" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">shiro-core</feature>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/guice/pom.xml (original)
+++ shiro/branches/1.2.x/support/guice/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/pom.xml (original)
+++ shiro/branches/1.2.x/support/pom.xml Fri Jan 20 05:17:16 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>
@@ -37,8 +37,6 @@
<module>quartz</module>
<module>spring</module>
<module>guice</module>
- <!-- This module's development is slated for 1.3.0 M1: -->
- <!-- <module>openid4j</module> -->
<module>features</module>
<module>cas</module>
</modules>
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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/quartz/pom.xml (original)
+++ shiro/branches/1.2.x/support/quartz/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/spring/pom.xml (original)
+++ shiro/branches/1.2.x/support/spring/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/tools/hasher/pom.xml (original)
+++ shiro/branches/1.2.x/tools/hasher/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/tools/pom.xml (original)
+++ shiro/branches/1.2.x/tools/pom.xml Fri Jan 20 05:17:16 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=1233773&r1=1233772&r2=1233773&view=diff
==============================================================================
--- shiro/branches/1.2.x/web/pom.xml (original)
+++ shiro/branches/1.2.x/web/pom.xml Fri Jan 20 05:17:16 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>