Integrate REST 4.0.0 and Jersey 4.x

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Apr 4, 2024 · df76a95 · df76a95
1 parent d082870
commit df76a95
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 1,806 deletions.
diff --git a/...glassfish/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java b/...glassfish/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java
diff --git a/appserver/distributions/web/pom.xml b/appserver/distributions/web/pom.xml
@@ -124,11 +124,6 @@
                                     destfile="${glassfish.modules}/hibernate-validator.jar"
                                 />
 
-                                <jarupdate
-                                    basedir="${patches}/jakarta.enterprise.cdi-el-api" includes="META-INF/MANIFEST.MF"
-                                    destfile="${glassfish.modules}/jakarta.enterprise.cdi-el-api.jar"
-                                />
-
 
                                 <!-- To support Jakarta Annotations 3 -->
                                 <jarupdate

diff --git a/...tions/web/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java b/...tions/web/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java
diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -101,9 +101,9 @@
         <jakarta.authorization-api.version>3.0.0-M4</jakarta.authorization-api.version>
         <jakarta.authentication-api.version>3.1.0-M1</jakarta.authentication-api.version>
         <!-- Implementations -->
-        <soteria.version>4.0.0-M2</soteria.version>
+        <soteria.version>4.0.0-M3</soteria.version>
         <exousia.version>3.0.0-M3</exousia.version>
-        <epicyro.version>3.1.0-M1</epicyro.version>
+        <epicyro.version>3.1.0-M2</epicyro.version>
         <!-- Dependencies -->
         <nimbus.version>9.38-rc3</nimbus.version>
         <jcip.version>1.0.2</jcip.version>

diff --git a/appserver/web/jersey-ejb-component-provider/pom.xml b/appserver/web/jersey-ejb-component-provider/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -57,6 +58,11 @@
             <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.main.ejb</groupId>
             <artifactId>ejb-container</artifactId>

diff --git a/...ent-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java b/...ent-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java
@@ -1,7 +1,7 @@
 /*
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2019 Payara Foundation and/or its affiliates. All rights reserved.
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -54,11 +54,10 @@
 import org.glassfish.internal.data.ApplicationInfo;
 import org.glassfish.internal.data.ApplicationRegistry;
 import org.glassfish.internal.data.ModuleInfo;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.inject.hk2.AbstractBinder;
 import org.glassfish.jersey.internal.inject.Binding;
-import org.glassfish.jersey.internal.inject.Bindings;
+import org.glassfish.jersey.inject.hk2.Bindings;
 import org.glassfish.jersey.internal.inject.InjectionManager;
-import org.glassfish.jersey.internal.inject.InstanceBinding;
 import org.glassfish.jersey.server.model.Invocable;
 import org.glassfish.jersey.server.spi.ComponentProvider;
 import org.glassfish.jersey.server.spi.internal.ResourceMethodInvocationHandlerProvider;
@@ -91,9 +90,9 @@ public final class EjbComponentProvider implements ComponentProvider, ResourceMe
     @Override
     public void initialize(final InjectionManager injectionManager) {
         this.injectionManager = injectionManager;
-        final InstanceBinding<EjbComponentProvider> descriptor = Bindings.service(EjbComponentProvider.this)
-            .to(ResourceMethodInvocationHandlerProvider.class);
-        this.injectionManager.register(descriptor);
+        this.injectionManager.register(
+            Bindings.service(EjbComponentProvider.this)
+                    .to(ResourceMethodInvocationHandlerProvider.class));
     }
 
 

diff --git a/.../rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyUriInfo.java b/.../rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyUriInfo.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -313,4 +314,9 @@ public UriBuilder resolveTemplatesFromEncoded(Map<String, Object> templateValues
             throw new UnsupportedOperationException("Not supported yet.");
         }
     }
+
+    @Override
+    public String getMatchedResourceTemplate() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -100,8 +100,8 @@
         <jakarta.jaxb-impl.version>4.0.5</jakarta.jaxb-impl.version>
 
         <!-- Jakarta REST -->
-        <jakarta.rest-api.version>3.1.0</jakarta.rest-api.version>
-        <jersey.version>4.0-M1-GF1</jersey.version>
+        <jakarta.rest-api.version>4.0.0</jakarta.rest-api.version>
+        <jersey.version>4.0.0-M1</jersey.version>
 
         <!-- Jakarta Mail -->
         <jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>