Repository: shiro Updated Branches: refs/heads/1.2.x 4d5bb000a -> f961b77fd
[maven-release-plugin] prepare release shiro-root-1.2.5 Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/f961b77f Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/f961b77f Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/f961b77f Branch: refs/heads/1.2.x Commit: f961b77fdbffb0a1fd21f562ed518bb3f9ce3d98 Parents: 4d5bb00 Author: bdemers <[email protected]> Authored: Wed May 11 14:25:22 2016 -0400 Committer: bdemers <[email protected]> Committed: Wed May 11 14:25:22 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 | 178 +++++++++++++++--------------- support/ehcache/pom.xml | 2 +- support/features/pom.xml | 196 ++++++++++++++++----------------- support/guice/pom.xml | 190 ++++++++++++++++---------------- support/pom.xml | 2 +- support/quartz/pom.xml | 2 +- support/spring/pom.xml | 2 +- tools/hasher/pom.xml | 202 +++++++++++++++++----------------- tools/pom.xml | 80 +++++++------- web/pom.xml | 2 +- 21 files changed, 440 insertions(+), 440 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/all/pom.xml ---------------------------------------------------------------------- diff --git a/all/pom.xml b/all/pom.xml index 6356c5c..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 58f5730..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 92b6e6e..c8e49ed 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF8"?> +<?xml version="1.0" encoding="UTF8"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -30,7 +30,7 @@ <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> <packaging>pom</packaging> - <version>1.2.5-SNAPSHOT</version> + <version>1.2.5</version> <name>Apache Shiro</name> <url>http://shiro.apache.org/</url> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/aspectj/pom.xml ---------------------------------------------------------------------- diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml index ecc3ae5..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index 6d02637..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml index 1c43922..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/spring-client/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml index 08edad5..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/spring-hibernate/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml index 07addbc..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/spring/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index 0857bcd..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/samples/web/pom.xml ---------------------------------------------------------------------- diff --git a/samples/web/pom.xml b/samples/web/pom.xml index 6074957..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/aspectj/pom.xml ---------------------------------------------------------------------- diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml index 2885ccf..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/cas/pom.xml ---------------------------------------------------------------------- diff --git a/support/cas/pom.xml b/support/cas/pom.xml index 1ad260e..ac034e7 100644 --- a/support/cas/pom.xml +++ b/support/cas/pom.xml @@ -1,89 +1,89 @@ -<?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.5-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>shiro-cas</artifactId> - <name>Apache Shiro :: Support :: CAS</name> - <packaging>bundle</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - </dependency> - <dependency> - <groupId>org.jasig.cas.client</groupId> - <artifactId>cas-client-core</artifactId> - <version>3.2.2</version> - </dependency> - <dependency> - <!-- for Optional SAML ticket validation: --> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <!-- for Optional SAML ticket validation: --> - <groupId>org.opensaml</groupId> - <artifactId>opensaml</artifactId> - <version>1.1</version> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - <dependency> - <!-- for Optional SAML ticket validation: --> - <groupId>org.apache.santuario</groupId> - <artifactId>xmlsec</artifactId> - <version>1.4.3</version> - <scope>runtime</scope> - <optional>true</optional> - </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.cas</Bundle-SymbolicName> - <Export-Package>org.apache.shiro.cas*;version=${project.version}</Export-Package> - <Import-Package> - org.apache.shiro*;version="${shiro.osgi.importRange}", - org.jasig.cas.client*;version="[3.2, 4)", - * - </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.5</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>shiro-cas</artifactId> + <name>Apache Shiro :: Support :: CAS</name> + <packaging>bundle</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + </dependency> + <dependency> + <groupId>org.jasig.cas.client</groupId> + <artifactId>cas-client-core</artifactId> + <version>3.2.2</version> + </dependency> + <dependency> + <!-- for Optional SAML ticket validation: --> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <!-- for Optional SAML ticket validation: --> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <version>1.1</version> + <scope>runtime</scope> + <optional>true</optional> + </dependency> + <dependency> + <!-- for Optional SAML ticket validation: --> + <groupId>org.apache.santuario</groupId> + <artifactId>xmlsec</artifactId> + <version>1.4.3</version> + <scope>runtime</scope> + <optional>true</optional> + </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.cas</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.cas*;version=${project.version}</Export-Package> + <Import-Package> + org.apache.shiro*;version="${shiro.osgi.importRange}", + org.jasig.cas.client*;version="[3.2, 4)", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/ehcache/pom.xml ---------------------------------------------------------------------- diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml index 45ad87e..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/features/pom.xml ---------------------------------------------------------------------- diff --git a/support/features/pom.xml b/support/features/pom.xml index b5fd21f..19b174f 100644 --- a/support/features/pom.xml +++ b/support/features/pom.xml @@ -1,98 +1,98 @@ -<?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.5-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>shiro-features</artifactId> - <name>Apache Shiro :: Support :: Karaf Features</name> - <packaging>pom</packaging> - - <properties> - <aspectj.bundle.version>1.6.16_1</aspectj.bundle.version> - <ehcache.bundle.version>2.5.0_1</ehcache.bundle.version> - <quartz.bundle.version>1.6.1_1</quartz.bundle.version> - <!-- Not a Shiro dependency - used for quartz bundle resolution only (see features.xml): --> - <commons.collections.version>3.2.1</commons.collections.version> - </properties> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - </configuration> - <executions> - <execution> - <id>filter</id> - <phase>generate-resources</phase> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/classes/features.xml</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </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.5</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>shiro-features</artifactId> + <name>Apache Shiro :: Support :: Karaf Features</name> + <packaging>pom</packaging> + + <properties> + <aspectj.bundle.version>1.6.16_1</aspectj.bundle.version> + <ehcache.bundle.version>2.5.0_1</ehcache.bundle.version> + <quartz.bundle.version>1.6.1_1</quartz.bundle.version> + <!-- Not a Shiro dependency - used for quartz bundle resolution only (see features.xml): --> + <commons.collections.version>3.2.1</commons.collections.version> + </properties> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + </configuration> + <executions> + <execution> + <id>filter</id> + <phase>generate-resources</phase> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/classes/features.xml</file> + <type>xml</type> + <classifier>features</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/guice/pom.xml ---------------------------------------------------------------------- diff --git a/support/guice/pom.xml b/support/guice/pom.xml index 2df8790..b5e81b8 100644 --- a/support/guice/pom.xml +++ b/support/guice/pom.xml @@ -1,95 +1,95 @@ -<?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.5-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.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.5</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.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> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/pom.xml ---------------------------------------------------------------------- diff --git a/support/pom.xml b/support/pom.xml index f2f21f9..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/quartz/pom.xml ---------------------------------------------------------------------- diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml index 0a743f1..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/support/spring/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring/pom.xml b/support/spring/pom.xml index f693a1e..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/tools/hasher/pom.xml ---------------------------------------------------------------------- diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml index 83dc4dc..6db0319 100644 --- a/tools/hasher/pom.xml +++ b/tools/hasher/pom.xml @@ -1,101 +1,101 @@ -<?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.tools</groupId> - <artifactId>shiro-tools</artifactId> - <version>1.2.5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>shiro-tools-hasher</artifactId> - <name>Apache Shiro :: Tools :: Hasher</name> - <packaging>bundle</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <exclusions> - <!-- BeanUtils is for ini config - this simple command line program - does not init a shiro environment, so we don't need it: --> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/cli.assembly.xml</descriptor> - </descriptors> - <archive> - <manifest> - <mainClass>org.apache.shiro.tools.hasher.Hasher</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.shiro.tools.hasher</Bundle-SymbolicName> - <Export-Package>org.apache.shiro.tools.hasher*;version=${project.version}</Export-Package> - <Import-Package> - org.apache.shiro*;version="${shiro.osgi.importRange}", - * - </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.tools</groupId> + <artifactId>shiro-tools</artifactId> + <version>1.2.5</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>shiro-tools-hasher</artifactId> + <name>Apache Shiro :: Tools :: Hasher</name> + <packaging>bundle</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <exclusions> + <!-- BeanUtils is for ini config - this simple command line program + does not init a shiro environment, so we don't need it: --> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2.1</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/cli.assembly.xml</descriptor> + </descriptors> + <archive> + <manifest> + <mainClass>org.apache.shiro.tools.hasher.Hasher</mainClass> + </manifest> + </archive> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.shiro.tools.hasher</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.tools.hasher*;version=${project.version}</Export-Package> + <Import-Package> + org.apache.shiro*;version="${shiro.osgi.importRange}", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index ab3bd07..77fc449 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,40 +1,40 @@ -<?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.5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.shiro.tools</groupId> - <artifactId>shiro-tools</artifactId> - <name>Apache Shiro :: Tools</name> - <packaging>pom</packaging> - - <modules> - <module>hasher</module> - </modules> - -</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.5</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.shiro.tools</groupId> + <artifactId>shiro-tools</artifactId> + <name>Apache Shiro :: Tools</name> + <packaging>pom</packaging> + + <modules> + <module>hasher</module> + </modules> + +</project> + http://git-wip-us.apache.org/repos/asf/shiro/blob/f961b77f/web/pom.xml ---------------------------------------------------------------------- diff --git a/web/pom.xml b/web/pom.xml index 851169d..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.5-SNAPSHOT</version> + <version>1.2.5</version> <relativePath>../pom.xml</relativePath> </parent>
