Moving master back to 1.4 version
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/53f1f6da Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/53f1f6da Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/53f1f6da Branch: refs/heads/master Commit: 53f1f6da024d283d778f1c253bbd8fc85306dd5d Parents: 6eb070f Author: Brian Demers <[email protected]> Authored: Mon Nov 7 15:11:43 2016 -0500 Committer: Brian Demers <[email protected]> Committed: Mon Nov 7 15:11:43 2016 -0500 ---------------------------------------------------------------------- all/pom.xml | 4 +- cache/pom.xml | 2 +- config/core/pom.xml | 25 ++++- config/ogdl/pom.xml | 19 +++- config/pom.xml | 2 +- core/pom.xml | 9 +- crypto/cipher/pom.xml | 24 ++++- crypto/core/pom.xml | 24 ++++- crypto/hash/pom.xml | 2 +- crypto/pom.xml | 2 +- event/pom.xml | 2 +- integration-tests/guice3/pom.xml | 2 +- integration-tests/guice4/pom.xml | 2 +- integration-tests/pom.xml | 2 +- integration-tests/support/pom.xml | 2 +- lang/pom.xml | 26 +++++- pom.xml | 97 +++++++++++--------- samples/aspectj/pom.xml | 2 +- samples/guice/pom.xml | 2 +- samples/jaxrs/pom.xml | 2 +- samples/pom.xml | 2 +- samples/quickstart-guice/pom.xml | 2 +- samples/quickstart/pom.xml | 2 +- samples/servlet-plugin/pom.xml | 2 +- samples/spring-boot-web/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/ehcache/pom.xml | 2 +- support/features/pom.xml | 2 +- support/guice/pom.xml | 2 +- support/hazelcast/pom.xml | 2 +- support/jaxrs/pom.xml | 2 +- support/pom.xml | 2 +- support/quartz/pom.xml | 2 +- support/servlet-plugin/pom.xml | 2 +- support/spring-boot/pom.xml | 2 +- support/spring-boot/spring-boot-starter/pom.xml | 2 +- .../spring-boot/spring-boot-web-starter/pom.xml | 2 +- support/spring/pom.xml | 2 +- test-coverage/pom.xml | 2 +- tools/hasher/pom.xml | 2 +- tools/pom.xml | 2 +- web/pom.xml | 2 +- 46 files changed, 207 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/all/pom.xml ---------------------------------------------------------------------- diff --git a/all/pom.xml b/all/pom.xml index cde82cc..7fa265a 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -103,7 +103,7 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <!-- <version>2.4</version> --> + <version>2.6</version> <configuration> <descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/cache/pom.xml ---------------------------------------------------------------------- diff --git a/cache/pom.xml b/cache/pom.xml index f7e815f..0e15cd4 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/config/core/pom.xml ---------------------------------------------------------------------- diff --git a/config/core/pom.xml b/config/core/pom.xml index 5d5e003..2c6fd25 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -22,14 +22,35 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>shiro-config-core</artifactId> <name>Apache Shiro :: Configuration :: Core</name> - <packaging>jar</packaging> + + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package> + <Import-Package> + org.apache.shiro*;version="${shiro.osgi.importRange}", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/config/ogdl/pom.xml ---------------------------------------------------------------------- diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml index cdfa47e..9db98a9 100644 --- a/config/ogdl/pom.xml +++ b/config/ogdl/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -31,7 +31,7 @@ <name>Apache Shiro :: Configuration :: OGDL</name> <description>Support for Shiro's Object Graph Definition Language (mostly used in Ini configuration) where declared name/value pairs are interpreted to create an object graph</description> - <packaging>jar</packaging> + <packaging>bundle</packaging> <build> <plugins> @@ -47,6 +47,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package> + <Import-Package> + org.apache.shiro*;version="${shiro.osgi.importRange}", + * + </Import-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/config/pom.xml ---------------------------------------------------------------------- diff --git a/config/pom.xml b/config/pom.xml index d4b81e5..6bf1451 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 0fa72b7..a9343c5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>shiro-core</artifactId> <name>Apache Shiro :: Core</name> - <packaging>jar</packaging> + <packaging>bundle</packaging> <build> <plugins> @@ -45,7 +45,7 @@ </execution> </executions> </plugin> - <!-- <plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> @@ -55,11 +55,12 @@ <Export-Package>org.apache.shiro*;version=${project.version}</Export-Package> <Import-Package> org.apache.shiro*;version="${shiro.osgi.importRange}", + org.apache.commons.beanutils*;resolution:=optional, * </Import-Package> </instructions> </configuration> - </plugin> --> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/crypto/cipher/pom.xml ---------------------------------------------------------------------- diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml index 89e1d9a..b6b7800 100644 --- a/crypto/cipher/pom.xml +++ b/crypto/cipher/pom.xml @@ -22,14 +22,34 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>shiro-crypto-cipher</artifactId> <name>Apache Shiro :: Cryptography :: Ciphers</name> - <packaging>jar</packaging> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.shiro.crypto.cipher</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.crypto.*;version=${project.version}</Export-Package> + <Import-Package> + org.apache.shiro.crypto**;version="${shiro.osgi.importRange}", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/crypto/core/pom.xml ---------------------------------------------------------------------- diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml index 700430d..4adbe7f 100644 --- a/crypto/core/pom.xml +++ b/crypto/core/pom.xml @@ -22,14 +22,34 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>shiro-crypto-core</artifactId> <name>Apache Shiro :: Cryptography :: Core</name> - <packaging>jar</packaging> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.shiro.crypto.core</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.crypto*;version=${project.version}</Export-Package> + <Import-Package> + org.apache.shiro.crypto*;version="${shiro.osgi.importRange}", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/crypto/hash/pom.xml ---------------------------------------------------------------------- diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml index 26b7b99..5f61175 100644 --- a/crypto/hash/pom.xml +++ b/crypto/hash/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/crypto/pom.xml ---------------------------------------------------------------------- diff --git a/crypto/pom.xml b/crypto/pom.xml index ca83cf3..7908fb0 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/event/pom.xml ---------------------------------------------------------------------- diff --git a/event/pom.xml b/event/pom.xml index 3bca375..6077699 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/integration-tests/guice3/pom.xml ---------------------------------------------------------------------- diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml index 1d4d5b8..5139cef 100644 --- a/integration-tests/guice3/pom.xml +++ b/integration-tests/guice3/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>shiro-its-guice3</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/integration-tests/guice4/pom.xml ---------------------------------------------------------------------- diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml index be7d85f..0abad4f 100644 --- a/integration-tests/guice4/pom.xml +++ b/integration-tests/guice4/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 82dede2..2f94436 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.apache.shiro.integrationtests</groupId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/integration-tests/support/pom.xml ---------------------------------------------------------------------- diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml index 3ab1244..13901fe 100644 --- a/integration-tests/support/pom.xml +++ b/integration-tests/support/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>shiro-its-support</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/lang/pom.xml ---------------------------------------------------------------------- diff --git a/lang/pom.xml b/lang/pom.xml index 87f071b..2f27ee8 100644 --- a/lang/pom.xml +++ b/lang/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -34,7 +34,7 @@ The lang module encapsulates only language-specific utilities that are used by various other modules. It exists to augment what we would have liked to see in the JDK but does not exist. </description> - <packaging>jar</packaging> + <packaging>bundle</packaging> <dependencies> @@ -53,4 +53,26 @@ </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.lang</Bundle-SymbolicName> + <Export-Package>org.apache.shiro.*;version=${project.version}</Export-Package> + <!-- javax.servlet.jsp* marked as optional per SHIRO-390: --> + <Import-Package> + org.apache.shiro*;version="${shiro.osgi.importRange}", + javax.servlet.jsp*;resolution:=optional, + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 03dc937..11d27bf 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> <packaging>pom</packaging> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <name>Apache Shiro</name> <url>http://shiro.apache.org/</url> @@ -69,7 +69,7 @@ <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber> <!-- non-dependency-based properties: --> - <shiro.osgi.importRange>[2, 3)</shiro.osgi.importRange> + <shiro.osgi.importRange>[1.2, 2)</shiro.osgi.importRange> <!-- Compile 3rd party dependencies: --> <!-- Don't change this version without also changing the shiro-aspect and shiro-features @@ -236,14 +236,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.5</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>2.2</version> - </dependency> - </dependencies> + <version>3.5.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.0</version> </plugin> <plugin> <groupId>org.apache.rat</groupId> @@ -568,18 +566,31 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.3.2</version> + <version>2.5.1</version> <configuration> + <!-- do not update upstream, with a pending release. --> + <pushChanges>false</pushChanges> + <localCheckout>true</localCheckout> <!-- "install" needed because we have interrelated dependencies between the modules and we are releasing them all the same - especially consider shiro-all --> - <preparationGoals>clean apache-rat:rat install</preparationGoals> + <preparationGoals>clean apache-rat:check install</preparationGoals> <autoVersionSubmodules>true</autoVersionSubmodules> <!-- This configuration copied from apache:apache:7 parent pom --> <useReleaseProfile>false</useReleaseProfile> - <goals>deploy site-deploy</goals> + <goals>deploy site site:stage</goals> <arguments>-Pdocs,apache-release</arguments> <mavenExecutorId>forked-path</mavenExecutorId> </configuration> </plugin> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>https://repository.apache.org</nexusUrl> + <serverId>apache.releases.https</serverId> + </configuration> + </plugin> </plugins> </build> @@ -632,121 +643,121 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-lang</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-cache</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config-core</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config-ogdl</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto-core</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto-hash</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto-cipher</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-event</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-web</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-servlet-plugin</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <!-- Shiro 3rd party support (keep this alphabetically ordered based on the artifactId please): --> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-aspectj</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-ehcache</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <artifactId>shiro-cas</artifactId> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-faces</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <artifactId>shiro-ehcache</artifactId> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-quartz</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-guice</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-hazelcast</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-jaxrs</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-all</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <!-- Shiro samples: --> <dependency> <groupId>org.apache.shiro.samples</groupId> <artifactId>samples-spring-client</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot-starter</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot-web-starter</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> @@ -754,21 +765,21 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config-ogdl</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-its-support</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </dependency> <!-- 3rd party dependencies --> @@ -1332,7 +1343,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> + <version>2.2.1</version> <executions> <execution> <id>attach-sources</id> @@ -1352,7 +1363,7 @@ <site> <id>shiro.website</id> <name>Apache Shiro Site</name> - <url>scp://people.apache.org/www/shiro.apache.org/static/${project.version}</url> + <url>scm:svn:https://svn.apache.org/repos/asf/shiro/site/publish/static/${project.version}</url> </site> </distributionManagement> </profile> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/aspectj/pom.xml ---------------------------------------------------------------------- diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml index 7102685..154af00 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/guice/pom.xml ---------------------------------------------------------------------- diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml index 417966a..95bde54 100644 --- a/samples/guice/pom.xml +++ b/samples/guice/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml index 33758e5..da02fed 100644 --- a/samples/jaxrs/pom.xml +++ b/samples/jaxrs/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index bd7102b..7bd9e83 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/quickstart-guice/pom.xml ---------------------------------------------------------------------- diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml index 1070789..de43abd 100644 --- a/samples/quickstart-guice/pom.xml +++ b/samples/quickstart-guice/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml index c950d61..70978ac 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/servlet-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml index 66cce9c..95388d7 100644 --- a/samples/servlet-plugin/pom.xml +++ b/samples/servlet-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/spring-boot-web/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml index 82ed75e..a45952e 100644 --- a/samples/spring-boot-web/pom.xml +++ b/samples/spring-boot-web/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro.samples</groupId> <artifactId>shiro-samples</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>samples-spring-boot-web</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/spring-client/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml index 19660fd..bd55849 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/spring-hibernate/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml index c8ec313..a93edda 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/spring/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index 90eb451..30361fa 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/samples/web/pom.xml ---------------------------------------------------------------------- diff --git a/samples/web/pom.xml b/samples/web/pom.xml index b2b2e28..58f94e1 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/aspectj/pom.xml ---------------------------------------------------------------------- diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml index 3857516..4df8c09 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/ehcache/pom.xml ---------------------------------------------------------------------- diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml index 012aea1..0bd278d 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/features/pom.xml ---------------------------------------------------------------------- diff --git a/support/features/pom.xml b/support/features/pom.xml index 281c801..2d18ad7 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/guice/pom.xml ---------------------------------------------------------------------- diff --git a/support/guice/pom.xml b/support/guice/pom.xml index 295243b..f91cb4e 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml index a2c27e8..7a81aaf 100644 --- a/support/hazelcast/pom.xml +++ b/support/hazelcast/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml index f769594..05b3c5b 100644 --- a/support/jaxrs/pom.xml +++ b/support/jaxrs/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/pom.xml ---------------------------------------------------------------------- diff --git a/support/pom.xml b/support/pom.xml index f54016e..001f8a6 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/quartz/pom.xml ---------------------------------------------------------------------- diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml index 73862d5..78b0058 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/servlet-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml index a76cf3c..4950cea 100644 --- a/support/servlet-plugin/pom.xml +++ b/support/servlet-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-support</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>shiro-servlet-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml index 82d183c..94cf20c 100644 --- a/support/spring-boot/pom.xml +++ b/support/spring-boot/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/spring-boot/spring-boot-starter/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml index 73847d6..d9ad99a 100644 --- a/support/spring-boot/spring-boot-starter/pom.xml +++ b/support/spring-boot/spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>shiro-spring-boot-starter</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/spring-boot/spring-boot-web-starter/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml index 55b693a..15d9d9a 100644 --- a/support/spring-boot/spring-boot-web-starter/pom.xml +++ b/support/spring-boot/spring-boot-web-starter/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>shiro-spring-boot-web-starter</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/support/spring/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring/pom.xml b/support/spring/pom.xml index ff61e4b..3aa7155 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/test-coverage/pom.xml ---------------------------------------------------------------------- diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index c25f9a3..8705d61 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/tools/hasher/pom.xml ---------------------------------------------------------------------- diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml index 4c15405..4579b56 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>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index b21a2cc..c2c0324 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/53f1f6da/web/pom.xml ---------------------------------------------------------------------- diff --git a/web/pom.xml b/web/pom.xml index 2971c9d..a099f6a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>2.alpha.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>
