fix content of eclipselink zip,

use proper API module names Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Jun 2, 2022 · a46e6d5 · a46e6d5
1 parent db0aeb0
commit a46e6d5
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 15 deletions.
diff --git a/bundles/eclipselink/pom.xml b/bundles/eclipselink/pom.xml
@@ -80,6 +80,11 @@
             <artifactId>angus-mail</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
@@ -270,6 +275,11 @@
             <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.jpars</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpars.server</artifactId>

diff --git a/bundles/eclipselink/src/main/java/module-info.java b/bundles/eclipselink/src/main/java/module-info.java
@@ -34,10 +34,13 @@
     requires static jakarta.validation;
     requires static jakarta.ws.rs;
 
-    requires static jakarta.cdi; //AM
-    requires static jakarta.el; //AM
-    requires static jakarta.inject; //AM
-    requires static jakarta.transaction; //AM
+    requires static jakarta.cdi;
+    requires static jakarta.el;
+    requires static jakarta.inject;
+    requires static jakarta.transaction;
+    requires static jakarta.interceptor;
+    requires static jakarta.messaging;
+    requires static jakarta.resource;
 
     requires static com.sun.xml.bind.core;
 

diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java b/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
@@ -22,7 +22,7 @@
     requires jakarta.xml.soap;
     requires jakarta.xml.ws;
 
-    requires jakarta.servlet; //AM
+    requires jakarta.servlet;
 
     requires org.eclipse.persistence.asm;
     requires org.eclipse.persistence.jpa;

diff --git a/foundation/org.eclipse.persistence.core/src/main/java/module-info.java b/foundation/org.eclipse.persistence.core/src/main/java/module-info.java
@@ -29,14 +29,14 @@
     requires static org.eclipse.persistence.asm;
     requires static org.eclipse.persistence.jpa.jpql;
 
-    requires static jakarta.cdi; //AM
-    requires static jakarta.el; //AM
-    requires static jakarta.inject; //AM
-    requires static jakarta.transaction; //AM
+    requires static jakarta.cdi;
+    requires static jakarta.el;
+    requires static jakarta.inject;
+    requires static jakarta.transaction;
 
-//    requires jakarta.interceptor.api;
-//    requires jakarta.jms.api;
-//    requires jakarta.resource.api;
+    requires static jakarta.interceptor;
+    requires static jakarta.messaging;
+    requires static jakarta.resource;
 //    requires glassfish.corba.omgapi;
 
     exports org.eclipse.persistence;

diff --git a/foundation/org.eclipse.persistence.oracle.nosql/pom.xml b/foundation/org.eclipse.persistence.oracle.nosql/pom.xml
@@ -46,6 +46,14 @@
             <groupId>jakarta.resource</groupId>
             <artifactId>jakarta.resource-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
         <!--Other libraries dependencies-->
         <!--Oracle proprietary dependencies-->
         <dependency>

diff --git a/foundation/org.eclipse.persistence.oracle.nosql/src/main/java/module-info.java b/foundation/org.eclipse.persistence.oracle.nosql/src/main/java/module-info.java
@@ -15,7 +15,7 @@
  */
 module org.eclipse.persistence.oracle.nosql {
 
-//    requires transitive jakarta.resource.api;
+    requires transitive jakarta.resource;
 
     requires transitive org.eclipse.persistence.core;
 

diff --git a/pom.xml b/pom.xml
@@ -1055,7 +1055,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.10.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java
@@ -18,7 +18,7 @@
     requires jakarta.persistence;
     requires jakarta.xml.bind;
 
-    requires jakarta.servlet; //AM
+    requires jakarta.servlet;
 
     requires org.eclipse.persistence.asm;
     requires transitive org.eclipse.persistence.core;