Merge pull request #172 from coheigea/gmavenplus
Switch to gmavenplus and update groovy
diff --git a/pom.xml b/pom.xml
index 7d5c144..f17ad4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,8 +107,8 @@
<!-- Test 3rd-party dependencies: -->
<easymock.version>4.0.2</easymock.version>
- <gmaven.version>1.5</gmaven.version>
- <groovy.version>2.4.9</groovy.version>
+ <gmaven.version>1.8.0</gmaven.version>
+ <groovy.version>2.5.8</groovy.version>
<junit.version>4.12</junit.version>
<junit.server.jetty.version>0.11.0</junit.server.jetty.version>
<hibernate.version>5.4.3.Final</hibernate.version>
@@ -296,28 +296,13 @@
</plugin>
<!-- Allow writing tests in Groovy: -->
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<version>${gmaven.version}</version>
- <configuration>
- <providerSelection>1.7</providerSelection>
- <source>src/main/groovy</source>
- </configuration>
<dependencies>
<dependency>
- <groupId>org.codehaus.gmaven.runtime</groupId>
- <artifactId>gmaven-runtime-1.7</artifactId>
- <version>${gmaven.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
</dependencies>
@@ -480,14 +465,16 @@
</plugin>
<!-- Allow Groovy tests to run: -->
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<version>${gmaven.version}</version>
<executions>
<execution>
<goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
+ <goal>addTestSources</goal>
+ <goal>generateTestStubs</goal>
+ <goal>compileTests</goal>
+ <goal>removeTestStubs</goal>
</goals>
</execution>
</executions>
@@ -656,7 +643,7 @@
<!-- Writing tests in groovy is fast!: -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<scope>test</scope>
</dependency>
@@ -961,11 +948,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/ShiroSpringAutoConfigurationTest.groovy b/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/ShiroSpringAutoConfigurationTest.groovy
index d2c6b12..2e55fbe 100644
--- a/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/ShiroSpringAutoConfigurationTest.groovy
+++ b/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/ShiroSpringAutoConfigurationTest.groovy
@@ -18,8 +18,9 @@
*/
package org.apache.shiro.spring.boot.autoconfigure
-import org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfigurationTestApplication.EventBusAwareObject;
-import org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfigurationTestApplication.SubscribedListener;
+import org.apache.shiro.spring.boot.autoconfigure.application.ShiroAutoConfigurationTestApplication
+import org.apache.shiro.spring.boot.autoconfigure.application.ShiroAutoConfigurationTestApplication.EventBusAwareObject
+import org.apache.shiro.spring.boot.autoconfigure.application.ShiroAutoConfigurationTestApplication.SubscribedListener
import org.apache.shiro.authc.UsernamePasswordToken
import org.apache.shiro.event.EventBus
diff --git a/support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAutoConfigurationTestApplication.java b/support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/application/ShiroAutoConfigurationTestApplication.java
similarity index 97%
rename from support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAutoConfigurationTestApplication.java
rename to support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/application/ShiroAutoConfigurationTestApplication.java
index 914e48e..30a66f5 100644
--- a/support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAutoConfigurationTestApplication.java
+++ b/support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/application/ShiroAutoConfigurationTestApplication.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.boot.autoconfigure;
+package org.apache.shiro.spring.boot.autoconfigure.application;
import org.apache.shiro.event.EventBus;
diff --git a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy b/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy
index db1b384..e69d052 100644
--- a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy
+++ b/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy
@@ -18,8 +18,9 @@
*/
package org.apache.shiro.spring.boot.autoconfigure.web
-import org.apache.shiro.spring.boot.autoconfigure.web.ShiroWebAutoConfigurationTestApplication.EventBusAwareObject
-import org.apache.shiro.spring.boot.autoconfigure.web.ShiroWebAutoConfigurationTestApplication.SubscribedListener
+import org.apache.shiro.spring.boot.autoconfigure.web.application.ShiroWebAutoConfigurationTestApplication
+import org.apache.shiro.spring.boot.autoconfigure.web.application.ShiroWebAutoConfigurationTestApplication.EventBusAwareObject
+import org.apache.shiro.spring.boot.autoconfigure.web.application.ShiroWebAutoConfigurationTestApplication.SubscribedListener
import org.apache.shiro.event.EventBus
import org.apache.shiro.mgt.DefaultSecurityManager
diff --git a/support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebAutoConfigurationTestApplication.java b/support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java
similarity index 97%
rename from support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebAutoConfigurationTestApplication.java
rename to support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java
index 8fdcc1a..c1fdc43 100644
--- a/support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebAutoConfigurationTestApplication.java
+++ b/support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.boot.autoconfigure.web;
+package org.apache.shiro.spring.boot.autoconfigure.web.application;
import org.apache.shiro.event.EventBus;
diff --git a/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroBeanConfigurationTest.groovy b/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroBeanConfigurationTest.groovy
index 6c9b893..dae1f9f 100644
--- a/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroBeanConfigurationTest.groovy
+++ b/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroBeanConfigurationTest.groovy
@@ -19,6 +19,7 @@
package org.apache.shiro.spring.config
import org.apache.shiro.event.EventBus
+import org.apache.shiro.spring.testconfig.EventBusConsumersTestConfiguration
import org.junit.Test
import org.junit.runner.RunWith
import org.springframework.beans.factory.annotation.Autowired
diff --git a/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationTest.groovy b/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationTest.groovy
index 12640e5..b8def1b 100644
--- a/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationTest.groovy
+++ b/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationTest.groovy
@@ -25,6 +25,7 @@
import org.apache.shiro.mgt.SecurityManager
import org.apache.shiro.realm.text.TextConfigurationRealm
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor
+import org.apache.shiro.spring.testconfig.RealmTestConfiguration
import org.apache.shiro.subject.Subject
import org.junit.Assert
import org.junit.Test
diff --git a/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationWithOptionalComponentsTest.groovy b/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationWithOptionalComponentsTest.groovy
index ec42297..12dff58 100644
--- a/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationWithOptionalComponentsTest.groovy
+++ b/support/spring/src/test/groovy/org/apache/shiro/spring/config/ShiroConfigurationWithOptionalComponentsTest.groovy
@@ -23,6 +23,8 @@
import org.apache.shiro.mgt.DefaultSecurityManager
import org.apache.shiro.mgt.SecurityManager
import org.apache.shiro.realm.text.TextConfigurationRealm
+import org.apache.shiro.spring.testconfig.OptionalComponentsTestConfiguration
+import org.apache.shiro.spring.testconfig.RealmTestConfiguration
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor
import org.apache.shiro.subject.Subject
import org.junit.Test
diff --git a/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationTest.groovy b/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationTest.groovy
index 584a837..eb52198 100644
--- a/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationTest.groovy
+++ b/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationTest.groovy
@@ -28,6 +28,8 @@
import org.apache.shiro.spring.config.ShiroAnnotationProcessorConfiguration
import org.apache.shiro.spring.config.ShiroBeanConfiguration
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor
+import org.apache.shiro.spring.testconfig.EventBusTestConfiguration
+import org.apache.shiro.spring.testconfig.RealmTestConfiguration
import org.apache.shiro.web.mgt.CookieRememberMeManager
import org.apache.shiro.web.mgt.DefaultWebSessionStorageEvaluator
import org.apache.shiro.web.mgt.WebSecurityManager
diff --git a/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationWithCacheTest.groovy b/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationWithCacheTest.groovy
index 296b519..9cb77e7 100644
--- a/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationWithCacheTest.groovy
+++ b/support/spring/src/test/groovy/org/apache/shiro/spring/web/config/ShiroWebConfigurationWithCacheTest.groovy
@@ -24,6 +24,10 @@
import org.apache.shiro.spring.config.RealmTestConfiguration
import org.apache.shiro.spring.config.ShiroAnnotationProcessorConfiguration
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor
+import org.apache.shiro.spring.testconfig.EventBusTestConfiguration
+import org.apache.shiro.spring.testconfig.RealmTestConfiguration
+import org.apache.shiro.spring.web.testconfig.CacheManagerConfiguration
+
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/support/spring/src/test/java/org/apache/shiro/spring/config/EventBusConsumersTestConfiguration.java b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/EventBusConsumersTestConfiguration.java
similarity index 97%
rename from support/spring/src/test/java/org/apache/shiro/spring/config/EventBusConsumersTestConfiguration.java
rename to support/spring/src/test/java/org/apache/shiro/spring/testconfig/EventBusConsumersTestConfiguration.java
index 83d35be..0792ab5 100644
--- a/support/spring/src/test/java/org/apache/shiro/spring/config/EventBusConsumersTestConfiguration.java
+++ b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/EventBusConsumersTestConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.config;
+package org.apache.shiro.spring.testconfig;
import org.apache.shiro.event.EventBus;
diff --git a/support/spring/src/test/java/org/apache/shiro/spring/config/EventBusTestConfiguration.java b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/EventBusTestConfiguration.java
similarity index 96%
rename from support/spring/src/test/java/org/apache/shiro/spring/config/EventBusTestConfiguration.java
rename to support/spring/src/test/java/org/apache/shiro/spring/testconfig/EventBusTestConfiguration.java
index 2050b0f..130e042 100644
--- a/support/spring/src/test/java/org/apache/shiro/spring/config/EventBusTestConfiguration.java
+++ b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/EventBusTestConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.config;
+package org.apache.shiro.spring.testconfig;
import org.apache.shiro.event.EventBus;
diff --git a/support/spring/src/test/java/org/apache/shiro/spring/config/OptionalComponentsTestConfiguration.java b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/OptionalComponentsTestConfiguration.java
similarity index 97%
rename from support/spring/src/test/java/org/apache/shiro/spring/config/OptionalComponentsTestConfiguration.java
rename to support/spring/src/test/java/org/apache/shiro/spring/testconfig/OptionalComponentsTestConfiguration.java
index 2f71751..22fba1b 100644
--- a/support/spring/src/test/java/org/apache/shiro/spring/config/OptionalComponentsTestConfiguration.java
+++ b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/OptionalComponentsTestConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.config;
+package org.apache.shiro.spring.testconfig;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.permission.PermissionResolver;
diff --git a/support/spring/src/test/java/org/apache/shiro/spring/config/RealmTestConfiguration.java b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/RealmTestConfiguration.java
similarity index 97%
rename from support/spring/src/test/java/org/apache/shiro/spring/config/RealmTestConfiguration.java
rename to support/spring/src/test/java/org/apache/shiro/spring/testconfig/RealmTestConfiguration.java
index 55d7164..761fcfc 100644
--- a/support/spring/src/test/java/org/apache/shiro/spring/config/RealmTestConfiguration.java
+++ b/support/spring/src/test/java/org/apache/shiro/spring/testconfig/RealmTestConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.config;
+package org.apache.shiro.spring.testconfig;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.realm.text.TextConfigurationRealm;
diff --git a/support/spring/src/test/java/org/apache/shiro/spring/web/config/CacheManagerConfiguration.java b/support/spring/src/test/java/org/apache/shiro/spring/web/testconfig/CacheManagerConfiguration.java
similarity index 95%
rename from support/spring/src/test/java/org/apache/shiro/spring/web/config/CacheManagerConfiguration.java
rename to support/spring/src/test/java/org/apache/shiro/spring/web/testconfig/CacheManagerConfiguration.java
index afaf00b..d7dc87a 100644
--- a/support/spring/src/test/java/org/apache/shiro/spring/web/config/CacheManagerConfiguration.java
+++ b/support/spring/src/test/java/org/apache/shiro/spring/web/testconfig/CacheManagerConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shiro.spring.web.config;
+package org.apache.shiro.spring.web.testconfig;
import org.apache.shiro.cache.CacheManager;
import org.apache.shiro.cache.MemoryConstrainedCacheManager;
