Skip to content

Commit

Permalink
Eclipselink.jar - JPMS fixes (#1954)
Browse files Browse the repository at this point in the history
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 <radek.felcman@oracle.com>
  • Loading branch information
rfelcman committed Oct 3, 2023
1 parent a9014f7 commit 265b5ef
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions antbuild.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
4 changes: 4 additions & 0 deletions antbuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 5 additions & 0 deletions features/bundles/eclipselink/src/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 265b5ef

Please sign in to comment.