Merge pull request #149 from aslakknutsen/gf_jaxrs_as

Change to use Client.target(String) to avoid JAX-RS 1 vs 2 conflict

Author: arun-gupta

jaxrs/singleton/pom.xml

@@ -8,9 +8,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.javaee7.jaxrs</groupId>
     <artifactId>singleton</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>singleton</name>
 </project>

jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java

@@ -5,23 +5,27 @@
  */
 package org.javaee7.jaxrs.singleton;
 
+import static org.junit.Assert.assertEquals;
+
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.StringTokenizer;
+
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
 import org.junit.FixMethodOrder;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 
@@ -41,7 +45,7 @@ public class ApplicationSingletonResourceTest {
     @Before
     public void setUp() throws MalformedURLException {
         client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/application").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/application").toExternalForm()));
     }
 
     @After