JAX-RS 2.1-m07 + Jersey 2.26-b04 (#21789)

Author: pavelbucek

main/appserver/packager/jersey/pom.xml

@@ -91,6 +91,10 @@
             <type>zip</type>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-moxy</artifactId>

main/appserver/packager/jersey/src/main/resources/pkg_proto.py

@@ -46,7 +46,7 @@
 
 pkg = {
     "name"          : "jersey",
-    "version"       : "2.10.4,0-0",
+    "version"       : "2.26.0,0-1",
     "attributes"    : { "pkg.summary" : "Jersey 2 Core, RESTful Web services for GlassFish",
                         "pkg.description" : 
 "Jersey core runtime libraries including some 3rd party dependencies. \

main/nucleus/admin/rest/rest-service/pom.xml

@@ -99,9 +99,15 @@
             <artifactId>jersey-server</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-sse</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.flashlight</groupId>

main/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java

@@ -70,8 +70,8 @@
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.internal.api.InternalSystemAdministrator;
 import org.glassfish.internal.api.ServerContext;
+import org.glassfish.jersey.inject.hk2.Hk2ReferencingFactory;
 import org.glassfish.jersey.internal.ServiceFinder;
-import org.glassfish.jersey.internal.inject.ReferencingFactory;
 import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.process.internal.RequestScoped;
 import org.glassfish.jersey.server.ContainerFactory;
@@ -185,7 +185,7 @@ private Set<? extends Binder> getAdditionalBinders() {
             protected void configure() {
                 bindFactory(RestAdapter.SubjectReferenceFactory.class).to(new TypeLiteral<Ref<Subject>>() {
                 }).in(PerLookup.class);
-                bindFactory(ReferencingFactory.<Subject>referenceFactory()).to(new TypeLiteral<Ref<Subject>>() {
+                bindFactory(Hk2ReferencingFactory.<Subject>referenceFactory()).to(new TypeLiteral<Ref<Subject>>() {
                 }).in(RequestScoped.class);
             }
         });

main/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java

@@ -82,7 +82,7 @@
 import org.glassfish.internal.api.AdminAccessController;
 import org.glassfish.internal.api.RemoteAdminAccessException;
 import org.glassfish.internal.api.ServerContext;
-import org.glassfish.jersey.internal.inject.ReferencingFactory;
+import org.glassfish.jersey.inject.hk2.Hk2ReferencingFactory;
 import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.internal.util.collection.Refs;
 import org.glassfish.jersey.process.internal.RequestScoped;
@@ -279,7 +279,7 @@ protected Set<? extends Binder> getAdditionalBinders(){
             protected void configure() {
                 bindFactory(SubjectReferenceFactory.class).to(new TypeLiteral<Ref<Subject>>() {
                 }).in(PerLookup.class);
-                bindFactory(ReferencingFactory.<Subject>referenceFactory()).to(new TypeLiteral<Ref<Subject>>() {
+                bindFactory(Hk2ReferencingFactory.<Subject>referenceFactory()).to(new TypeLiteral<Ref<Subject>>() {
                 }).in(RequestScoped.class);
             }
         });

main/nucleus/packager/nucleus-jersey/pom.xml

@@ -62,10 +62,6 @@
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-            <artifactId>jersey-guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-grizzly2-http</artifactId>
@@ -102,6 +98,10 @@
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
        <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>

main/nucleus/pom.xml

@@ -129,7 +129,7 @@
         <grizzly.version>2.4.0-beta2</grizzly.version>
         <grizzly.npn.version>1.7</grizzly.npn.version>
         <saaj-api.version>1.3.4</saaj-api.version>
-        <hk2.version>2.5.0-b33</hk2.version>
+        <hk2.version>2.5.0-b36</hk2.version>
         <hk2.plugin.version>2.5.0-b33</hk2.plugin.version>
         <jboss.logging.version>3.3.0.Final</jboss.logging.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
@@ -143,11 +143,11 @@
         <gmbal.version>4.0.0-b001</gmbal.version>
         <woodstox.version>4.1.2</woodstox.version>
         <antlr.version>2.7.6</antlr.version>
-        <jersey.version>2.26-b02</jersey.version>
+        <jersey.version>2.26-b04</jersey.version>
         <jackson.version>2.8.4</jackson.version>
         <jettison.version>1.3.3</jettison.version>
         <jax-rs-api.spec.version>2.1</jax-rs-api.spec.version>
-        <jax-rs-api.impl.version>2.1-m03</jax-rs-api.impl.version>
+        <jax-rs-api.impl.version>2.1-m07</jax-rs-api.impl.version>
         <mimepull.version>1.9.4</mimepull.version>
         <jbi.version>1.0</jbi.version>
         <glassfish-management-api.version>3.2.1-b002</glassfish-management-api.version>

main/nucleus/tests/admin/pom.xml

@@ -160,6 +160,11 @@ of COPY_LIB map constant.)
             <artifactId>jersey-server</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.main.admin</groupId>
             <artifactId>rest-client</artifactId>

main/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java

@@ -66,7 +66,7 @@
 import org.glassfish.admin.rest.client.utils.MarshallingUtils;
 
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.glassfish.jersey.filter.LoggingFilter;
+import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
 import static org.testng.AssertJUnit.*;
@@ -148,7 +148,7 @@ protected Client getClient() {
         if (client == null) {
             client = new ClientWrapper(new HashMap<String, String>(), adminUser, adminPass);
             if (Boolean.parseBoolean(System.getProperty("DEBUG"))) {
-                client.register(new LoggingFilter());
+                client.register(LoggingFeature.class);
             }
         }
         return client;