[22/23] shiro git commit: replaced project.version with actual version in root pom

2016-10-18 Thread bdemers 
replaced project.version with actual version in root pom

This allows reuse of the parent pom outside of the source tree


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/311041d1
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/311041d1
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/311041d1

Branch: refs/heads/master
Commit: 311041d1ad1e81bb8c3ab250a45303071bced7b7
Parents: 6c5701a
Author: Brian Demers 
Authored: Mon Oct 17 17:28:17 2016 -0400
Committer: Brian Demers 
Committed: Tue Oct 18 14:43:35 2016 -0400

--
 integration-tests/guice3/pom.xml|  2 +-
 integration-tests/guice4/pom.xml|  2 +-
 integration-tests/pom.xml   |  2 +-
 pom.xml | 61 +---
 samples/jaxrs/pom.xml   |  2 +-
 samples/servlet-plugin/pom.xml  |  2 +-
 samples/spring-boot-web/pom.xml |  2 +-
 .../shiro/examples/AccountInfoController.java   |  2 +-
 .../apache/shiro/examples/HelloController.java  |  2 +-
 support/jaxrs/pom.xml   |  2 +-
 .../web/jaxrs/ShiroSecurityContextTest.groovy   | 27 ++---
 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 +-
 test-coverage/pom.xml   |  6 +-
 16 files changed, 62 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/integration-tests/guice3/pom.xml
--
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index 1f4b674..92efc51 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -23,7 +23,7 @@

org.apache.shiro.integrationtests
shiro-integration-tests
-   1.4.0-SNAPSHOT
+   2.alpha.0-SNAPSHOT

 
shiro-its-guice3

http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/integration-tests/guice4/pom.xml
--
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index da761ce..1ff877b 100644
--- a/integration-tests/guice4/pom.xml
+++ b/integration-tests/guice4/pom.xml
@@ -23,7 +23,7 @@

org.apache.shiro.integrationtests
shiro-integration-tests
-   1.4.0-SNAPSHOT
+   2.alpha.0-SNAPSHOT
 ../pom.xml

 

http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1b8dd19..1f72a99 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.shiro
 shiro-root
-1.4.0-SNAPSHOT
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro.integrationtests

http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bc1996f..8873c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,126 +627,121 @@
 
 org.apache.shiro
 shiro-lang
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-cache
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-core
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-config-core
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-config-ogdl
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-crypto-core
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-crypto-hash
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-crypto-cipher
-${project.version}
+2.alpha.0-SNAPSHOT
 
 
 org.apache.shiro

shiro git commit: replaced project.version with actual version in root pom

2016-10-17 Thread bdemers 
Repository: shiro
Updated Branches:
  refs/heads/1.4.x 2cb70e725 -> 9830f8732


replaced project.version with actual version in root pom

This allows reuse of the parent pom outside of the source tree


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/9830f873
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/9830f873
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/9830f873

Branch: refs/heads/1.4.x
Commit: 9830f8732c401713a94f110bfa4f0bf1fea190a2
Parents: 2cb70e7
Author: Brian Demers 
Authored: Mon Oct 17 17:28:17 2016 -0400
Committer: Brian Demers 
Committed: Mon Oct 17 17:28:17 2016 -0400

--
 pom.xml | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/shiro/blob/9830f873/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d85823e..4dcefa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -607,79 +607,79 @@
 
 org.apache.shiro
 shiro-core
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-web
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-servlet-plugin
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-ehcache
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-quartz
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-spring
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-guice
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-aspectj
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-cas
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-jaxrs
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-all
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro.samples
 samples-spring-client
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-spring-boot-starter
-${project.version}
+1.4.0-SNAPSHOT
 
 
 org.apache.shiro
 shiro-spring-boot-web-starter
-${project.version}
+1.4.0-SNAPSHOT
 
 
 
 
 org.apache.shiro
 shiro-core
-${project.version}
+1.4.0-SNAPSHOT
 test-jar
 test