Merge pull request #292 from aslakknutsen/groovy

Update to Groovy 2.3.0
javaee-samples · Apr 21, 2015 · 969f1c9 · 969f1c9
2 parents 41c735e + 9a6f119
commit 969f1c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <maven.test.skip>false</maven.test.skip>
         <hamcrest.version>1.3</hamcrest.version>
         <spock.version>0.7-groovy-2.0</spock.version>
-        <groovy.version>2.1.5</groovy.version>
+        <groovy.version>2.3.0</groovy.version>
         <glassfish.version>4.0</glassfish.version>
     </properties>
 

diff --git a/...let-filters/src/test/groovy/org/javaee7/servlet/filters/FilterServletSpecification.groovy b/...let-filters/src/test/groovy/org/javaee7/servlet/filters/FilterServletSpecification.groovy
@@ -1,23 +1,23 @@
 package org.javaee7.servlet.filters
 
+import javax.ws.rs.client.Client
+import javax.ws.rs.client.ClientBuilder
+import javax.ws.rs.client.WebTarget
+import javax.ws.rs.core.Response
+
 import org.jboss.arquillian.container.test.api.Deployment
-import org.jboss.arquillian.container.test.api.RunAsClient
 import org.jboss.arquillian.spock.ArquillianSputnik
 import org.jboss.arquillian.test.api.ArquillianResource
 import org.jboss.shrinkwrap.api.ShrinkWrap
 import org.jboss.shrinkwrap.api.spec.WebArchive
 import org.junit.runner.RunWith
-import spock.lang.Specification
 
-import javax.ws.rs.client.Client
-import javax.ws.rs.client.ClientBuilder
-import javax.ws.rs.client.WebTarget
-import javax.ws.rs.core.Response
+import spock.lang.Specification
 
 @RunWith(ArquillianSputnik)
 class FilterServletSpecification extends Specification{
 
-    @Deployment
+    @Deployment(testable = false)
     def static WebArchive "create deployment"() {
         return ShrinkWrap.create(WebArchive.class)
                 .addClass(CharResponseWrapper.class)
@@ -27,7 +27,6 @@ class FilterServletSpecification extends Specification{
     @ArquillianResource
     private URL base;
 
-    @RunAsClient
     def "standard servlet should return a simple text"() {
         given:
         Client client = ClientBuilder.newClient();
@@ -40,7 +39,6 @@ class FilterServletSpecification extends Specification{
         response.readEntity(String.class) == "bar"
     }
 
-    @RunAsClient
     def "filtered servlet should return a enhanced foobar text"() {
         given:
         Client client = ClientBuilder.newClient();