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 05:29:10 UTC
svn commit: r1233159 - in /shiro/trunk: pom.xml
samples/spring-client/pom.xml support/ehcache/pom.xml
support/features/pom.xml support/guice/pom.xml support/openid4j/pom.xml
support/quartz/pom.xml tools/hasher/pom.xml
Author: lhazlewood
Date: Thu Jan 19 04:29:10 2012
New Revision: 1233159
URL: http://svn.apache.org/viewvc?rev=1233159&view=rev
Log:
SHIRO-339 Maven:prepare branch 1.2.x
Modified:
shiro/trunk/pom.xml
shiro/trunk/samples/spring-client/pom.xml
shiro/trunk/support/ehcache/pom.xml
shiro/trunk/support/features/pom.xml
shiro/trunk/support/guice/pom.xml
shiro/trunk/support/openid4j/pom.xml
shiro/trunk/support/quartz/pom.xml
shiro/trunk/tools/hasher/pom.xml
Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Thu Jan 19 04:29:10 2012
@@ -41,9 +41,9 @@
<inceptionYear>2004</inceptionYear>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/shiro/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shiro/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/shiro/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/shiro/branches/1.2.x</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shiro/branches/1.2.x</developerConnection>
+ <url>http://svn.apache.org/repos/asf/shiro/branches/1.2.x</url>
</scm>
<issueManagement>
<system>Jira</system>
@@ -283,7 +283,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -302,7 +302,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -321,7 +321,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
Modified: shiro/trunk/samples/spring-client/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/spring-client/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/samples/spring-client/pom.xml (original)
+++ shiro/trunk/samples/spring-client/pom.xml Thu Jan 19 04:29:10 2012
@@ -18,8 +18,7 @@
~ under the License.
-->
<!--suppress osmorcNonOsgiMavenDependency -->
-<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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro.samples</groupId>
Modified: shiro/trunk/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/ehcache/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/support/ehcache/pom.xml (original)
+++ shiro/trunk/support/ehcache/pom.xml Thu Jan 19 04:29:10 2012
@@ -17,8 +17,7 @@
~ 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro</groupId>
Modified: shiro/trunk/support/features/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/features/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/support/features/pom.xml (original)
+++ shiro/trunk/support/features/pom.xml Thu Jan 19 04:29:10 2012
@@ -17,8 +17,7 @@
~ 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro</groupId>
Modified: shiro/trunk/support/guice/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/guice/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/support/guice/pom.xml (original)
+++ shiro/trunk/support/guice/pom.xml Thu Jan 19 04:29:10 2012
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ 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/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shiro-guice</artifactId>
- <name>Apache Shiro :: Support :: Guice</name>
- <packaging>bundle</packaging>
-
- <properties>
- <guice.version>3.0</guice.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.shiro.guice</Bundle-SymbolicName>
- <Export-Package>org.apache.shiro.guice*;version=${project.version}</Export-Package>
- <Import-Package>
- org.apache.shiro*;version="${shiro.osgi.importRange}",
- org.aopalliance*;version="[1.0.0, 2.0.0)",
- com.google.inject*;version="[3.0.0, 4.0.0)",
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ 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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-root</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>shiro-guice</artifactId>
+ <name>Apache Shiro :: Support :: Guice</name>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <guice.version>3.0</guice.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.guice</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro.guice*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.shiro*;version="${shiro.osgi.importRange}",
+ org.aopalliance*;version="[1.0.0, 2.0.0)",
+ com.google.inject*;version="[3.0.0, 4.0.0)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: shiro/trunk/support/openid4j/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/openid4j/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/support/openid4j/pom.xml (original)
+++ shiro/trunk/support/openid4j/pom.xml Thu Jan 19 04:29:10 2012
@@ -17,8 +17,7 @@
~ 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro</groupId>
Modified: shiro/trunk/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/quartz/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/support/quartz/pom.xml (original)
+++ shiro/trunk/support/quartz/pom.xml Thu Jan 19 04:29:10 2012
@@ -17,8 +17,7 @@
~ 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro</groupId>
Modified: shiro/trunk/tools/hasher/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/tools/hasher/pom.xml?rev=1233159&r1=1233158&r2=1233159&view=diff
==============================================================================
--- shiro/trunk/tools/hasher/pom.xml (original)
+++ shiro/trunk/tools/hasher/pom.xml Thu Jan 19 04:29:10 2012
@@ -17,8 +17,7 @@
~ 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro.tools</groupId>