Update javax.persistence to 2.2-dev
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/antbuild.properties b/antbuild.properties
index 84b819e..c15deda 100644
--- a/antbuild.properties
+++ b/antbuild.properties
@@ -171,9 +171,10 @@
jpatest.framework.jar=eclipselink-jpatest-framework.jar
# should pull in component properties instead of redefining
-persistence22.jar=javax.persistence_2.2.0.v201510191631.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
+persistence22.src.jar=javax.persistence.source_2.2.0.v201706121819.jar
+persistence22.javadoc.jar=javax.persistence.javadoc_2.2.0.v201706121819.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
-persistence21.src.jar=javax.persistence.source_2.1.1.v201509150925.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
persistence10.jar=javax.persistence_1.0.0.v200905011740.jar
unsigned.persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
diff --git a/antbuild.xml b/antbuild.xml
index 86ff0ec..98badee 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -169,7 +169,7 @@
<pathelement path="${eclipselink.plugins}/${jaxb-api.jar}"/>
<pathelement path="${eclipselink.plugins}/${jaxb-core.jar}"/>
<pathelement path="${eclipselink.plugins}/${jaxb-xjc.jar}"/>
- <pathelement path="${eclipselink.jpa.plugins}/${persistence21.jar}"/>
+ <pathelement path="${eclipselink.jpa.plugins}/${persistence22.jar}"/>
<pathelement path="${eclipselink.plugins}/${resource.jar}"/>
<pathelement path="${eclipselink.plugins}/${json.jar}"/>
<pathelement path="${eclipselink.plugins}/${javax.validation.jar}"/>
@@ -780,7 +780,7 @@
<echo message="Implementation-Version: ${version.string}"/>
<delete dir="${build.dir}/javax.persistence/${classes.dir}" failonerror="false"/>
<mkdir dir="${build.dir}/javax.persistence/${classes.dir}"/>
- <unzip src="${eclipselink.jpa.plugins}/${persistence21.jar}" dest="${build.dir}/javax.persistence/${classes.dir}"/>
+ <unzip src="${eclipselink.jpa.plugins}/${persistence22.jar}" dest="${build.dir}/javax.persistence/${classes.dir}"/>
<mkdir dir="${build.dir}/hermes/${classes.dir}"/>
<unzip src="${eclipselink.plugins}/org.eclipse.persistence.jpa.jpql_${version.string}.jar" dest="${build.dir}/hermes/${classes.dir}"/>
<jar jarfile="${eclipselink.jar}" duplicate="preserve">
@@ -1456,8 +1456,8 @@
<zipfileset dir="${eclipselink.plugins}/" includes="${eclipselink.extension.prefix}_${version.string}.jar, ${eclipselink.extension.prefix}.source_${version.string}.jar" prefix="eclipselink/jlib/extension"/>
<!-- modelgen processor jar -->
<zipfileset dir="${eclipselink.plugins}/" includes="${eclipselink.modelgen.prefix}_${version.string}.jar, ${eclipselink.modelgen.prefix}.source_${version.string}.jar" prefix="eclipselink/jlib/jpa"/>
- <!-- jpa persistence 2.1 jars -->
- <zipfileset dir="${eclipselink.jpa.plugins}/" includes="${persistence21.jar}, ${persistence21.src.jar}" prefix="eclipselink/jlib/jpa"/>
+ <!-- jpa persistence 2.2 jars -->
+ <zipfileset dir="${eclipselink.jpa.plugins}/" includes="${persistence22.jar}, ${persistence22.src.jar}" prefix="eclipselink/jlib/jpa"/>
<!-- JPA RS jar -->
<zipfileset dir="${eclipselink.plugins}/" includes="org.eclipse.persistence.jpars_*.jar, org.eclipse.persistence.jpars.source*.jar" prefix="eclipselink/jlib/jpa"/>
<!-- moxy jar's and zips -->
diff --git a/buildsystem/compdeps/antbuild.xml b/buildsystem/compdeps/antbuild.xml
index 6065c42..96a2237 100644
--- a/buildsystem/compdeps/antbuild.xml
+++ b/buildsystem/compdeps/antbuild.xml
@@ -146,7 +146,7 @@
<property name="jms.prefix" value="javax.jms"/>
<property name="jms.criteria" value="[0.0.1,5.0.0)"/>
<property name="persistence.prefix" value="javax.persistence"/>
- <property name="persistence.criteria" value="[2.0.0,2.2.0)"/>
+ <property name="persistence.criteria" value="[2.0.0,2.3.0)"/>
<property name="resource.prefix" value="javax.resource"/>
<property name="resource.criteria" value="[0.0.1,5.0.0)"/>
<property name="transaction.prefix" value="javax.transaction"/>
diff --git a/features/antbuild.xml b/features/antbuild.xml
index b60e49f..218ad81 100644
--- a/features/antbuild.xml
+++ b/features/antbuild.xml
@@ -237,7 +237,7 @@
<property name="mail.prefix" value="javax.mail"/>
<property name="mail.criteria" value="[1.4.0,1.5.0)"/>
<property name="persistence.prefix" value="javax.persistence"/>
- <property name="persistence.criteria" value="[2.0.100,2.2.0)"/>
+ <property name="persistence.criteria" value="[2.0.100,2.3.0)"/>
<property name="resource.prefix" value="javax.resource"/>
<property name="resource.criteria" value="[1.4.0,2.0.0)"/>
<property name="servlet.prefix" value="javax.servlet"/>
diff --git a/foundation/eclipselink.extension.oracle.spatial.test/antbuild.properties b/foundation/eclipselink.extension.oracle.spatial.test/antbuild.properties
index 2fb494a..62d14ae 100644
--- a/foundation/eclipselink.extension.oracle.spatial.test/antbuild.properties
+++ b/foundation/eclipselink.extension.oracle.spatial.test/antbuild.properties
@@ -33,6 +33,7 @@
oracle.test.jar=eclipselink-oracle-tests.jar
oracle.jpa.test.jar=eclipselink-oracle-jpa-test.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
unsigned.persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
diff --git a/foundation/eclipselink.extension.oracle.spatial.test/antbuild.xml b/foundation/eclipselink.extension.oracle.spatial.test/antbuild.xml
index aaa72b4..6d2e5eb 100644
--- a/foundation/eclipselink.extension.oracle.spatial.test/antbuild.xml
+++ b/foundation/eclipselink.extension.oracle.spatial.test/antbuild.xml
@@ -260,7 +260,7 @@
<pathelement path="${junit.lib}"/>
</path>
<path id="oracle_test.public.dependency.path">
- <pathelement path="${oracle_test.2.jpa.plugins.dir}/${persistence21.jar}"/>
+ <pathelement path="${oracle_test.2.jpa.plugins.dir}/${persistence22.jar}"/>
<fileset dir="${oracle_test.2.common.plugins.dir}" includes="${eclipselink.core.depend}"/>
</path>
</target>
diff --git a/foundation/eclipselink.extension.oracle.test/antbuild.properties b/foundation/eclipselink.extension.oracle.test/antbuild.properties
index 9a71231..04bb957 100644
--- a/foundation/eclipselink.extension.oracle.test/antbuild.properties
+++ b/foundation/eclipselink.extension.oracle.test/antbuild.properties
@@ -38,6 +38,7 @@
oracle.test.jar=eclipselink-oracle-tests.jar
oracle.jpa.test.jar=eclipselink-oracle-jpa-test.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
unsigned.persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
diff --git a/foundation/eclipselink.extension.oracle.test/antbuild.xml b/foundation/eclipselink.extension.oracle.test/antbuild.xml
index 7f92fa0..04c981e 100644
--- a/foundation/eclipselink.extension.oracle.test/antbuild.xml
+++ b/foundation/eclipselink.extension.oracle.test/antbuild.xml
@@ -298,7 +298,7 @@
<pathelement path="${junit.lib}"/>
</path>
<path id="oracle_test.public.dependency.path">
- <pathelement path="${oracle_test.2.jpa.plugins.dir}/${persistence21.jar}"/>
+ <pathelement path="${oracle_test.2.jpa.plugins.dir}/${persistence22.jar}"/>
<fileset dir="${oracle_test.2.common.plugins.dir}" includes="${eclipselink.core.depend}"/>
</path>
</target>
diff --git a/foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF b/foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF
index f1a6b79..74270d7 100644
--- a/foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF
+++ b/foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF
@@ -201,8 +201,8 @@
javax.management;resolution:=optional,
javax.management.openmbean;resolution:=optional,
javax.naming;resolution:=optional,
- javax.persistence;jpa="2.1";version="[1.1.0,2.3)";resolution:=optional,
- javax.persistence.spi;jpa="2.1";version="[1.1.0,2.3)";resolution:=optional,
+ javax.persistence;jpa="2.2";version="[1.1.0,2.3)";resolution:=optional,
+ javax.persistence.spi;jpa="2.2";version="[1.1.0,2.3)";resolution:=optional,
javax.resource;version="1.5.0";resolution:=optional,
javax.resource.cci;version="1.5.0";resolution:=optional,
javax.rmi;resolution:=optional,
diff --git a/jpa/eclipselink.jaxrs.test/antbuild.properties b/jpa/eclipselink.jaxrs.test/antbuild.properties
index 9304031..b379c33 100644
--- a/jpa/eclipselink.jaxrs.test/antbuild.properties
+++ b/jpa/eclipselink.jaxrs.test/antbuild.properties
@@ -46,6 +46,7 @@
restfulws.jar=javax.ws.rs_2.0.1.v201504171603.jar
jaxb-api.jar=javax.xml.bind_2.2.12.v201410011542.jar
commonj.sdo.jar=commonj.sdo_2.1.1.v201112051852.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
diff --git a/jpa/eclipselink.jpa.test/.classpath b/jpa/eclipselink.jpa.test/.classpath
index 26e3705..bb8d6fa 100644
--- a/jpa/eclipselink.jpa.test/.classpath
+++ b/jpa/eclipselink.jpa.test/.classpath
@@ -6,7 +6,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/eclipselink.core.test"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.0.v201510191631.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.0.v201510191631.jar"/>
+ <classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.0.v201706121819.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.0.v201706121819.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.ejb_3.1.0.v201205171433.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.ejb/src"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.transaction_1.1.0.v201002051055.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.transaction/src"/>
diff --git a/jpa/eclipselink.jpa.test/antbuild.properties b/jpa/eclipselink.jpa.test/antbuild.properties
index acd0bd1..ca809c8 100644
--- a/jpa/eclipselink.jpa.test/antbuild.properties
+++ b/jpa/eclipselink.jpa.test/antbuild.properties
@@ -45,7 +45,7 @@
restfulws.jar=javax.ws.rs_2.0.1.v201504171603.jar
jaxb-api.jar=javax.xml.bind_2.2.12.v201410011542.jar
commonj.sdo.jar=commonj.sdo_2.1.1.v201112051852.jar
-persistence22.jar=javax.persistence_2.2.0.v201510191631.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
diff --git a/jpa/org.eclipse.persistence.jpa.jpql.test/antbuild.properties b/jpa/org.eclipse.persistence.jpa.jpql.test/antbuild.properties
index f0e6cef..87ef88a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql.test/antbuild.properties
+++ b/jpa/org.eclipse.persistence.jpa.jpql.test/antbuild.properties
@@ -40,5 +40,6 @@
# General 3rd-Party API jar definitions
-----------------------------------------
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/.classpath b/jpa/org.eclipse.persistence.jpa.modelgen/.classpath
index 044b97a..98cc170 100644
--- a/jpa/org.eclipse.persistence.jpa.modelgen/.classpath
+++ b/jpa/org.eclipse.persistence.jpa.modelgen/.classpath
@@ -4,6 +4,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.core"/>
- <classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.1.1.v201509150925.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.1.1.v201509150925.jar"/>
+ <classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.0.v201706121819.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.0.v201706121819.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.properties b/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.properties
index cd6eb89..67e8718 100644
--- a/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.properties
+++ b/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.properties
@@ -32,6 +32,7 @@
persistence10.jar=javax.persistence_1.0.0.v200905011740.jar
persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
plugins.dir=plugins
classes.dir=classes
diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.xml b/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.xml
index 90d3288..c55b3d1 100644
--- a/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.xml
+++ b/jpa/org.eclipse.persistence.jpa.modelgen/antbuild.xml
@@ -90,7 +90,7 @@
<property name="implementation.vendor" value="${specification.vendor}"/>
<!-- dependency properties -->
- <property name="persistence.lib" value="${modelgen.2.jpa.plugins.dir}/${persistence21.jar}"/>
+ <property name="persistence.lib" value="${modelgen.2.jpa.plugins.dir}/${persistence22.jar}"/>
<property name="core.lib" value="${modelgen.2.common.plugins.dir}/org.eclipse.persistence.core_${version.string}.jar"/>
<property name="jpa.lib" value="${modelgen.2.common.plugins.dir}/org.eclipse.persistence.jpa_${version.string}.jar"/>
diff --git a/jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF b/jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF
index 5447e7a..efb2e20 100644
--- a/jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF
+++ b/jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF
@@ -46,10 +46,10 @@
Bundle-Version: 2.7.0.qualifier
Bundle-ManifestVersion: 2
Import-Package: javax.naming;resolution:=optional,
- javax.persistence;jpa="2.1";version="[1.1.0,2.3)",
- javax.persistence.criteria;jpa="2.1";version="[1.1.0,2.3)",
- javax.persistence.metamodel;jpa="2.1";version="[1.1.0,2.3)",
- javax.persistence.spi;jpa="2.1";version="[1.1.0,2.3)",
+ javax.persistence;jpa="2.2";version="[1.1.0,2.3)",
+ javax.persistence.criteria;jpa="2.2";version="[1.1.0,2.3)",
+ javax.persistence.metamodel;jpa="2.2";version="[1.1.0,2.3)",
+ javax.persistence.spi;jpa="2.2";version="[1.1.0,2.3)",
javax.sql;resolution:=optional,
javax.transaction;version="1.1.0";resolution:=optional,
javax.transaction.xa;version="1.1.0";resolution:=optional,
@@ -124,6 +124,6 @@
org.w3c.dom;resolution:=optional,
org.xml.sax;resolution:=optional,
org.xml.sax.helpers
-Specification-Version: 2.4.0
+Specification-Version: 2.7.0
Bundle-SymbolicName: org.eclipse.persistence.jpa
Premain-Class: org.eclipse.persistence.internal.jpa.deployment.JavaSECMPInitializerAgent
diff --git a/jpa/plugins/javax.persistence.javadoc_2.2.0.v201706121819.jar b/jpa/plugins/javax.persistence.javadoc_2.2.0.v201706121819.jar
new file mode 100644
index 0000000..9f5e2b4
--- /dev/null
+++ b/jpa/plugins/javax.persistence.javadoc_2.2.0.v201706121819.jar
Binary files differ
diff --git a/jpa/plugins/javax.persistence.source_2.2.0.v201510191631.jar b/jpa/plugins/javax.persistence.source_2.2.0.v201510191631.jar
deleted file mode 100644
index b62ef89..0000000
--- a/jpa/plugins/javax.persistence.source_2.2.0.v201510191631.jar
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/javax.persistence.source_2.2.0.v201706121819.jar b/jpa/plugins/javax.persistence.source_2.2.0.v201706121819.jar
new file mode 100644
index 0000000..ee5ab16
--- /dev/null
+++ b/jpa/plugins/javax.persistence.source_2.2.0.v201706121819.jar
Binary files differ
diff --git a/jpa/plugins/javax.persistence_2.2.0.v201510191631.jar b/jpa/plugins/javax.persistence_2.2.0.v201510191631.jar
deleted file mode 100644
index 4de7ea5..0000000
--- a/jpa/plugins/javax.persistence_2.2.0.v201510191631.jar
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/javax.persistence_2.2.0.v201706121819.jar b/jpa/plugins/javax.persistence_2.2.0.v201706121819.jar
new file mode 100644
index 0000000..dee2ffa
--- /dev/null
+++ b/jpa/plugins/javax.persistence_2.2.0.v201706121819.jar
Binary files differ
diff --git a/performance/eclipselink.perf.test/antbuild.properties b/performance/eclipselink.perf.test/antbuild.properties
index a584dd2..77fc3ca 100644
--- a/performance/eclipselink.perf.test/antbuild.properties
+++ b/performance/eclipselink.perf.test/antbuild.properties
@@ -15,7 +15,7 @@
report.dir=reports
asm.jar=org.eclipse.persistence.asm_6.0.0.v201702131300.jar
-persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
+persistence22.jar=javax.persistence_2.2.0.v201706121819.jar
json.jar=org.glassfish.javax.json_1.0.4.v201311181159.jar
jmh-core.jar=jmh-core-0.9.3.jar
jmh-generator-annprocess.jar=jmh-generator-annprocess-0.9.3.jar
diff --git a/performance/eclipselink.perf.test/antbuild.xml b/performance/eclipselink.perf.test/antbuild.xml
index fb58372..b158838 100644
--- a/performance/eclipselink.perf.test/antbuild.xml
+++ b/performance/eclipselink.perf.test/antbuild.xml
@@ -94,7 +94,7 @@
<property name="asm.lib" value="${perftest.2.common.plugins.dir}/${asm.jar}"/>
<property name="eclipselink.lib" value="${perftest.2.trunk.dir}/${eclipselink.jar}"/>
<property name="javax.validation.lib" value="${perftest.2.common.plugins.dir}/${javax.validation.jar}"/>
- <property name="jpa21.lib" value="${perftest.2.trunk.dir}/jpa/plugins/${persistence21.jar}"/>
+ <property name="jpa21.lib" value="${perftest.2.trunk.dir}/jpa/plugins/${persistence22.jar}"/>
<property name="json.lib" value="${perftest.2.common.plugins.dir}/${json.jar}"/>
<property name="validation-impl.lib" value="${extensions.depend.dir}/${validation-impl.jar}"/>
<property name="jboss-logging.lib" value="${extensions.depend.dir}/${jboss-logging.jar}"/>
diff --git a/plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF b/plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF
index fdfe7d1..b0a3064 100644
--- a/plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF
@@ -30,4 +30,4 @@
nsform.sax;resolution:=optional,javax.xml.transform.stream;resolution
:=optional,org.xml.sax;resolution:=optional,org.xml.sax.ext;resolutio
n:=optional,org.xml.sax.helpers;resolution:=optional
-Bundle-SymbolicName: org.eclipse.persistence.asm
\ No newline at end of file
+Bundle-SymbolicName: org.eclipse.persistence.asm
