Eclipselink.jar - JPMS fixes (eclipse-ee4j#1954)

This change contains two fixes: - opens some packages in module-info.java as there are some resource files needed to read - eclipselink source bundle to include there correct module-info.java file Signed-off-by: Radek Felcman <[email protected]>
rfelcman · Oct 3, 2023 · 265b5ef · 265b5ef
1 parent a9014f7
commit 265b5ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/antbuild.properties b/antbuild.properties
@@ -286,6 +286,7 @@ about-file=about.html
 readme-file=readme.html
 license-files=license.*
 module-info-file=module-info.class
+module-info-file.src=module-info.java
 setenv-scripts=setenv.*
 package-rename-scripts=packageRename.*
 jaxb-compiler-scripts=jaxb-compiler.*

diff --git a/antbuild.xml b/antbuild.xml
@@ -1304,6 +1304,10 @@
                 <exclude name="*jpars*.jar"/>
                 <exclude name="*nosql*.jar"/>
             </zipgroupfileset>
+            <!-- Include module-info.class -->
+            <fileset dir="${eclipselink.features.base}/bundles/eclipselink/${src.dir}">
+                <include name="${module-info-file.src}"/>
+            </fileset>
         </jar>
     </target>
 

diff --git a/features/bundles/eclipselink/src/module-info.java b/features/bundles/eclipselink/src/module-info.java
@@ -223,6 +223,7 @@
     exports org.eclipse.persistence.internal.jpa.rs.metadata.model.v2;
     exports org.eclipse.persistence.internal.libraries.asm;
     exports org.eclipse.persistence.internal.localization;
+    exports org.eclipse.persistence.internal.localization.i18n;
     exports org.eclipse.persistence.internal.oxm;
     exports org.eclipse.persistence.internal.oxm.mappings;
     exports org.eclipse.persistence.internal.oxm.record;
@@ -290,6 +291,10 @@
     exports org.eclipse.persistence.internal.sessions.factories.model.transport.naming;
     exports org.eclipse.persistence.internal.xr.sxf;
 
+    opens org.eclipse.persistence.internal.helper;
+    opens org.eclipse.persistence.jaxb.xmlmodel;
+    opens org.eclipse.persistence.jpa.jpql;
+
     uses org.eclipse.persistence.jpa.rs.PersistenceContextFactoryProvider;
 
     provides javax.persistence.spi.PersistenceProvider with org.eclipse.persistence.jpa.PersistenceProvider;