Merge pull request #152 from aslakknutsen/gf_jaxrs_neo

Change to use Client.target(URI) to be compatible with JAX-RS 1.0

Author: arun-gupta

jaxrs/server-negotiation/pom.xml

@@ -8,8 +8,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.javaee7.jaxrs</groupId>
     <artifactId>server-negotiation</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
 </project>

jaxrs/server-negotiation/src/test/java/org/javaee7/jaxrs/server/negotiation/MyResourceTest.java

@@ -8,6 +8,7 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.ws.rs.client.Client;
@@ -48,7 +49,7 @@ public static WebArchive createDeployment() {
     @Before
     public void setUp() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
-        target = client.target(new URL(base, "webresources/persons").toExternalForm());
+        target = client.target(URI.create(new URL(base, "webresources/persons").toExternalForm()));
     }
 
     @Test

pom.xml

@@ -243,12 +243,12 @@
             <id>glassfish-remote-arquillian</id>
             <dependencies>
                 <dependency>
-                   <groupId>org.glassfish</groupId>
-                   <artifactId>javax.json</artifactId>
-                   <version>1.0.4</version>
-                   <scope>test</scope>
-                </dependency>
-                <dependency>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>javax.json</artifactId>
+                    <version>1.0.4</version>
+                    <scope>test</scope>
+                 </dependency>
+                 <dependency>
                     <groupId>org.glassfish.tyrus</groupId>
                     <artifactId>tyrus-client</artifactId>
                     <version>1.3</version>
@@ -266,6 +266,18 @@
                     <version>2.4</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.glassfish.jersey.media</groupId>
+                    <artifactId>jersey-media-json-jackson</artifactId>
+                    <version>2.4</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.glassfish.jersey.media</groupId>
+                    <artifactId>jersey-media-json-processing</artifactId>
+                    <version>2.4</version>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                    <groupId>org.jboss.arquillian.container</groupId>
                    <artifactId>arquillian-glassfish-remote-3.1</artifactId>