Review request: upgrading EclipseLink package to version 2.5.0-RC1.
1. EclipseLink 2.5.0-M13 -> 2.5.0-RC1
2. javax.persistence artifact id change, revert to "javax.persistence"
3. Update org.eclipse.persistence.jpa.modelgen to "modelgen.processor" artifact id. The canonical modelgen service file (included in the processor jar) is now being included in glassfish modules (as of M10). Including this bundle in the classpath at compile time, will cause the Canonical model generation process to be activated
- appserver/pom.xml
- appserver/deployment/schemas/pom.xml
- appserver/deployment/dol/pom.xml
- appserver/javaee-api/javax.javaee-web-api/pom.xml
- appserver/transaction/jta/pom.xml
- appserver/transaction/internal-api/pom.xml
- appserver/packager/glassfish-common-web/pom.xml
- appserver/persistence/eclipselink-wrapper/pom.xml
- appserver/packager/glassfish-jpa/pom.xml
Tests run:
- Quicklook
- SQE JPA test suite
- EJB Cluster test suite
===================================================================
--- appserver/pom.xml (revision 61645)
+++ appserver/pom.xml (working copy)
@@ -109,8 +109,8 @@
<jaxb.version>2.2.7-b63</jaxb.version>
<stax2-api.version>3.1.1</stax2-api.version>
<javax.xml.registry-api.version>1.0.4</javax.xml.registry-api.version>
- <eclipselink.version>2.5.0-M13</eclipselink.version>
- <javax-persistence-api.version>2.1.0-M13</javax-persistence-api.version>
+ <eclipselink.version>2.5.0-RC1</eclipselink.version>
+ <javax-persistence-api.version>2.1.0-RC1</javax-persistence-api.version>
<dbschema.version>3.1.1</dbschema.version>
<dbschema.osgi.version>6.0</dbschema.osgi.version>
<schema2beans.version>3.1.1</schema2beans.version>
@@ -550,7 +550,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <artifactId>javax.persistence</artifactId>
<version>${javax-persistence-api.version}</version>
</dependency>
<dependency>
===================================================================
--- appserver/persistence/eclipselink-wrapper/pom.xml (revision 61645)
+++ appserver/persistence/eclipselink-wrapper/pom.xml (working copy)
@@ -90,14 +90,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa.modelgen</artifactId>
+ <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
<version>${eclipselink.version}</version>
- <exclusions> <!-- We do not use the processor in GlassFish -->
- <exclusion>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
- </exclusion>
- </exclusions>
<scope>compile</scope>
</dependency>
<dependency>
===================================================================
--- appserver/packager/glassfish-jpa/pom.xml (revision 61645)
+++ appserver/packager/glassfish-jpa/pom.xml (working copy)
@@ -155,7 +155,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa.modelgen</artifactId>
+ <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
<version>${eclipselink.version}</version>
</dependency>
<dependency>
Regards,
David