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 <[email protected]> Authored: Mon Oct 17 17:28:17 2016 -0400 Committer: Brian Demers <[email protected]> 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 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <artifactId>shiro-its-guice3</artifactId> 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 @@ <parent> <groupId>org.apache.shiro.integrationtests</groupId> <artifactId>shiro-integration-tests</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.apache.shiro</groupId> <artifactId>shiro-root</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <groupId>org.apache.shiro.integrationtests</groupId> 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 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-lang</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-cache</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config-core</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-config-ogdl</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto-core</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto-hash</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-crypto-cipher</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-event</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-web</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-all</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-servlet-plugin</artifactId> - <version>${project.version}</version> + <version>2.alpha.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>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-ehcache</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-faces</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-guice</artifactId> - <version>${project.version}</version> + <artifactId>shiro-quartz</artifactId> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-hazelcast</artifactId> - <version>${project.version}</version> + <artifactId>shiro-spring</artifactId> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-quartz</artifactId> - <version>${project.version}</version> + <artifactId>shiro-guice</artifactId> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-spring</artifactId> - <version>${project.version}</version> + <artifactId>shiro-hazelcast</artifactId> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-jaxrs</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-all</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <!-- Shiro samples: --> <dependency> <groupId>org.apache.shiro.samples</groupId> <artifactId>samples-spring-client</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot-starter</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring-boot-web-starter</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> </dependency> @@ -754,7 +749,7 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>${project.version}</version> + <version>2.alpha.0-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/samples/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml index ad3716e..bfe191a 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/samples/servlet-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml index c03d4f1..4f32143 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/samples/spring-boot-web/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml index a45952e..82ed75e 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <artifactId>samples-spring-boot-web</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/AccountInfoController.java ---------------------------------------------------------------------- diff --git a/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/AccountInfoController.java b/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/AccountInfoController.java index fa721f5..3171983 100644 --- a/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/AccountInfoController.java +++ b/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/AccountInfoController.java @@ -41,7 +41,7 @@ public class AccountInfoController { PrincipalCollection principalCollection = subject.getPrincipals(); - if (!CollectionUtils.isEmpty(principalCollection)) { + if (principalCollection != null && !principalCollection.isEmpty()) { name = principalCollection.getPrimaryPrincipal().toString(); } http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/HelloController.java ---------------------------------------------------------------------- diff --git a/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/HelloController.java b/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/HelloController.java index 45637b8..655b7b3 100644 --- a/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/HelloController.java +++ b/samples/spring-boot-web/src/main/java/org/apache/shiro/examples/HelloController.java @@ -43,7 +43,7 @@ public class HelloController { PrincipalCollection principalCollection = subject.getPrincipals(); - if (!CollectionUtils.isEmpty(principalCollection)) { + if (principalCollection != null && !principalCollection.isEmpty()) { Collection<Map> principalMaps = subject.getPrincipals().byType(Map.class); if (CollectionUtils.isEmpty(principalMaps)) { name = subject.getPrincipal().toString(); http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/support/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml index 05b3c5b..f769594 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ShiroSecurityContextTest.groovy ---------------------------------------------------------------------- diff --git a/support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ShiroSecurityContextTest.groovy b/support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ShiroSecurityContextTest.groovy index 5d7e947..b2c0c96 100644 --- a/support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ShiroSecurityContextTest.groovy +++ b/support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ShiroSecurityContextTest.groovy @@ -73,13 +73,15 @@ class ShiroSecurityContextTest { def originalSecurityContext = mock(SecurityContext) def shrioContext = new ShiroSecurityContext(requestContext) def subject = mock(Subject) - ThreadContext.bind(subject) + expect(subject.getPrincipal()).andReturn("TestUser") expect(requestContext.getSecurityContext()).andReturn(originalSecurityContext).anyTimes() expect(subject.getPrincipals()).andReturn(new SimplePrincipalCollection("TestUser", "realm")) replay requestContext, originalSecurityContext, subject + ThreadContext.bind(subject) + def resultPrincipal = shrioContext.getUserPrincipal() assertSame "TestUser", resultPrincipal.getName() @@ -92,14 +94,16 @@ class ShiroSecurityContextTest { def originalSecurityContext = mock(SecurityContext) def shrioContext = new ShiroSecurityContext(requestContext) def subject = mock(Subject) - ThreadContext.bind(subject) + expect(subject.getPrincipal()).andReturn(null) expect(requestContext.getSecurityContext()).andReturn(originalSecurityContext).anyTimes() expect(subject.getPrincipals()).andReturn(null) expect(originalSecurityContext.getUserPrincipal()).andReturn(null) replay requestContext, originalSecurityContext, subject + ThreadContext.bind(subject) + assertNull shrioContext.getUserPrincipal() verify requestContext, originalSecurityContext, subject @@ -111,13 +115,16 @@ class ShiroSecurityContextTest { def originalSecurityContext = mock(SecurityContext) def shrioContext = new ShiroSecurityContext(requestContext) def subject = mock(Subject) - ThreadContext.bind(subject) + def testPrincipal = new TestPrincipal("Tester") + expect(subject.getPrincipal()).andReturn(testPrincipal) expect(requestContext.getSecurityContext()).andReturn(originalSecurityContext).anyTimes() - expect(subject.getPrincipals()).andReturn(new SimplePrincipalCollection(new TestPrincipal("Tester"), "test-realm")) + expect(subject.getPrincipals()).andReturn(new SimplePrincipalCollection(testPrincipal, "test-realm")) replay requestContext, originalSecurityContext, subject + ThreadContext.bind(subject) + def resultPrincipal = shrioContext.getUserPrincipal() assertSame "Tester", resultPrincipal.getName() @@ -130,13 +137,15 @@ class ShiroSecurityContextTest { def originalSecurityContext = mock(SecurityContext) def shrioContext = new ShiroSecurityContext(requestContext) def subject = mock(Subject) - ThreadContext.bind(subject) + expect(subject.getPrincipal()).andReturn("test-principal") expect(requestContext.getSecurityContext()).andReturn(originalSecurityContext).anyTimes() expect(subject.hasRole("test-role")).andReturn(true) replay requestContext, originalSecurityContext, subject + ThreadContext.bind(subject) + assertTrue shrioContext.isUserInRole("test-role") verify requestContext, originalSecurityContext, subject @@ -148,13 +157,15 @@ class ShiroSecurityContextTest { def originalSecurityContext = mock(SecurityContext) def shrioContext = new ShiroSecurityContext(requestContext) def subject = mock(Subject) - ThreadContext.bind(subject) + expect(subject.getPrincipal()).andReturn("test-principal") expect(requestContext.getSecurityContext()).andReturn(originalSecurityContext).anyTimes() expect(subject.hasRole("test-role")).andReturn(false) replay requestContext, originalSecurityContext, subject + ThreadContext.bind(subject) + assertFalse shrioContext.isUserInRole("test-role") verify requestContext, originalSecurityContext, subject @@ -166,14 +177,16 @@ class ShiroSecurityContextTest { def originalSecurityContext = mock(SecurityContext) def shrioContext = new ShiroSecurityContext(requestContext) def subject = mock(Subject) - ThreadContext.bind(subject) + expect(subject.getPrincipal()).andReturn(null) // we are just testing equality here expect(requestContext.getSecurityContext()).andReturn(originalSecurityContext).anyTimes() expect(subject.getPrincipals()).andReturn(new SimplePrincipalCollection("Tester", "test-realm")) expect(subject.getPrincipals()).andReturn(new SimplePrincipalCollection("Tester", "test-realm")) replay requestContext, originalSecurityContext, subject + ThreadContext.bind(subject) + def result1Principal = shrioContext.getUserPrincipal() def result2Principal = shrioContext.getUserPrincipal() http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/support/servlet-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml index 4950cea..a76cf3c 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <artifactId>shiro-servlet-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/support/spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml index 94cf20c..82d183c 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/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 d9ad99a..73847d6 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <artifactId>shiro-spring-boot-starter</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/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 15d9d9a..55b693a 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> </parent> <artifactId>shiro-spring-boot-web-starter</artifactId> http://git-wip-us.apache.org/repos/asf/shiro/blob/311041d1/test-coverage/pom.xml ---------------------------------------------------------------------- diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index f088f32..c25f9a3 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>1.4.0-SNAPSHOT</version> + <version>2.alpha.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -46,10 +46,6 @@ </dependency> <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-cas</artifactId> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> <artifactId>shiro-ehcache</artifactId> </dependency> <dependency>
