Complete #128 by adding CBOR, Smile, XML and YAML backend module-info…

… changes too
FasterXML · Nov 10, 2020 · 18511b0 · 18511b0
1 parent d4f31e4
commit 18511b0
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 0 deletions.
diff --git a/base/src/moditect/module-info.java b/base/src/moditect/module-info.java
@@ -11,7 +11,14 @@
     requires com.fasterxml.jackson.databind;
 
     //Allow multiple implementations of ws.rs
+    //oracle location
     requires static javax.ws.rs.api;
+    //oracle location
     requires static java.ws.rs;
+    //jakarta initial location - 2.x
+    requires static javax.ws.rs;
+    //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec
+    requires static jakarta.ws.rs;
+    //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api
     requires static jakarta.ws.rs.api;
 }
diff --git a/cbor/src/moditect/module-info.java b/cbor/src/moditect/module-info.java
@@ -11,8 +11,16 @@
 
     requires com.fasterxml.jackson.jaxrs.base;
 
+    //Allow multiple implementations of ws.rs
+    //oracle location
     requires static javax.ws.rs.api;
+    //oracle location
     requires static java.ws.rs;
+    //jakarta initial location - 2.x
+    requires static javax.ws.rs;
+    //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec
+    requires static jakarta.ws.rs;
+    //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api
     requires static jakarta.ws.rs.api;
 
     provides javax.ws.rs.ext.MessageBodyReader with

diff --git a/datatypes/src/moditect/module-info.java b/datatypes/src/moditect/module-info.java
@@ -5,8 +5,16 @@
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;
 
+    //Allow multiple implementations of ws.rs
+    //oracle location
     requires static javax.ws.rs.api;
+    //oracle location
     requires static java.ws.rs;
+    //jakarta initial location - 2.x
+    requires static javax.ws.rs;
+    //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec
+    requires static jakarta.ws.rs;
+    //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api
     requires static jakarta.ws.rs.api;
 
     provides com.fasterxml.jackson.databind.Module with

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -73,6 +73,8 @@ Marc Magon (GedMarc@github)
 
 * Contributed #119: CXF, RESTEasy, and OpenAPI require reflective access to the package
  (2.10.2)
+* Contributed #128: Module-Info Enhancements - JAX-RS updates for Jakarta Release version
+ (2.12.0)
 
 James R. Perkins (jamezp@github)
 

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,8 @@ Sub-modules:
 
 #127: Allow multiple implementations of JAX-RS for all providers
  (requested by fenixcitizen@github)
+#128: Module-Info Enhancements - JAX-RS updates for Jakarta Release version
+ (contributed by Marc M)
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 - Upgrade Woodstox dependency to 6.2.3
 

diff --git a/smile/src/moditect/module-info.java b/smile/src/moditect/module-info.java
@@ -11,8 +11,16 @@
 
     requires com.fasterxml.jackson.jaxrs.base;
 
+    //Allow multiple implementations of ws.rs
+    //oracle location
     requires static javax.ws.rs.api;
+    //oracle location
     requires static java.ws.rs;
+    //jakarta initial location - 2.x
+    requires static javax.ws.rs;
+    //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec
+    requires static jakarta.ws.rs;
+    //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api
     requires static jakarta.ws.rs.api;
 
     provides javax.ws.rs.ext.MessageBodyReader with

diff --git a/xml/src/moditect/module-info.java b/xml/src/moditect/module-info.java
@@ -11,8 +11,16 @@
 
     requires com.fasterxml.jackson.jaxrs.base;
 
+    //Allow multiple implementations of ws.rs
+    //oracle location
     requires static javax.ws.rs.api;
+    //oracle location
     requires static java.ws.rs;
+    //jakarta initial location - 2.x
+    requires static javax.ws.rs;
+    //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec
+    requires static jakarta.ws.rs;
+    //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api
     requires static jakarta.ws.rs.api;
 
     provides javax.ws.rs.ext.MessageBodyReader with

diff --git a/yaml/src/moditect/module-info.java b/yaml/src/moditect/module-info.java
@@ -11,8 +11,16 @@
 
     requires com.fasterxml.jackson.jaxrs.base;
 
+    //Allow multiple implementations of ws.rs
+    //oracle location
     requires static javax.ws.rs.api;
+    //oracle location
     requires static java.ws.rs;
+    //jakarta initial location - 2.x
+    requires static javax.ws.rs;
+    //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec
+    requires static jakarta.ws.rs;
+    //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api
     requires static jakarta.ws.rs.api;
 
     provides javax.ws.rs.ext.MessageBodyReader with