Skip to content

Commit 578734d

Browse files
rfelcmanlukasj
rfelcman
authored and
lukasj
committed
[nobug] org.eclipse.persistence:javax.persistence:2.2.1 change into org.eclipse.persistence:jakarta.persistence:2.2.2 (#327)
Signed-off-by: Radek Felcman <[email protected]>
1 parent 2b85c19 commit 578734d

File tree

56 files changed

+92
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+92
-125
lines changed

‎.gitignore

+15-53
Original file line numberDiff line numberDiff line change
@@ -36,56 +36,18 @@ test_*.properties
3636
.sonar
3737
/coverage-report/
3838
/jacoco.out
39-
cdi.api*.jar
40-
ch.qos.logback.classic*.jar
41-
ch.qos.logback.core*.jar
42-
ch.qos.logback.slf4j*.jar
43-
com.sun.xml.bind*.jar
44-
gmbal-api-only*.jar
45-
javax.annotation*.jar
46-
javax.ejb*.jar
47-
javax.inject*.jar
48-
javax.interceptor*.jar
49-
javax.jms*.jar
50-
javax.json*.jar
51-
javax.mail*.jar
52-
javax.resource*.jar
53-
javax.servlet*.jar
54-
javax.transaction*.jar
55-
javax.validation*.jar
56-
javax.ws.rs*.jar
57-
javax.xml.bind*.jar
58-
javax.xml.rpc*.zip
59-
javax.xml.soap*.jar
60-
javax.xml.ws*.jar
61-
jakarta.annotation*.jar
62-
jakarta.ejb*.jar
63-
jakarta.inject*.jar
64-
jakarta.interceptor*.jar
65-
jakarta.jms*.jar
66-
jakarta.json*.jar
67-
jakarta.mail*.jar
68-
jakarta.resource*.jar
69-
jakarta.servlet*.jar
70-
jakarta.transaction*.jar
71-
jakarta.validation*.jar
72-
jakarta.ws.rs*.jar
73-
jakarta.xml.bind*.jar
74-
jakarta.xml.rpc*.zip
75-
jakarta.xml.soap*.jar
76-
jakarta.xml.ws*.jar
77-
jaxb-core*.jar
78-
jaxb-xjc*.jar
79-
management-api*.jar
80-
org.apache.ant*.zip
81-
org.eclipse.orbit.mongodb*.jar
82-
org.glassfish.corba*.jar
83-
org.glassfish.gmbal*.jar
84-
org.glassfish.hk2*.jar
85-
org.glassfish.jersey*.jar
86-
org.glassfish.pfl*.jar
87-
org.mongodb.mongo-java-driver*.jar
88-
org.osgi.core*.jar
89-
org.slf4j.api*.jar
90-
osgi.cmpn*.jar
91-
osgi.core.zip
39+
jpa/plugins/jakarta*.jar
40+
plugins/cdi.api*.jar
41+
plugins/ch.qos.logback*.jar
42+
plugins/com.sun*.jar
43+
plugins/javax*.jar
44+
plugins/jakarta*.jar
45+
plugins/management*.jar
46+
plugins/org.eclipse.persistence.sun-misc*.jar
47+
plugins/org.glassfish*.jar
48+
plugins/org.osgi*.jar
49+
plugins/osgi*.jar
50+
plugins/org.apache.ant*.zip
51+
plugins/org.eclipse.orbit.mongodb*.jar
52+
plugins/org.mongodb*.jar
53+
plugins/org.slf4j*.jar

‎antbuild.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ coretest.framework.jar=eclipselink-coretest-framework.jar
185185
jpatest.framework.jar=eclipselink-jpatest-framework.jar
186186

187187
# should pull in component properties instead of redefining
188-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
189-
persistence22.src.jar=javax.persistence.source_2.2.1.v201807122140.jar
190-
persistence22.javadoc.jar=javax.persistence.javadoc_2.2.1.v201807122140.jar
188+
persistence22.jar=jakarta.persistence_2.2.2.jar
189+
persistence22.src.jar=jakarta.persistence.source_2.2.2.jar
190+
persistence22.javadoc.jar=jakarta.persistence.javadoc_2.2.2.jar
191191
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
192192
jaxb-api.src.jar=javax.xml.bind.source_2.2.12.v1410011542.jar
193193
jaxb-api.jar=jakarta.xml.bind-api.jar

‎antbuild.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,9 @@
596596
<macrodef name="copy-plugin">
597597
<attribute name="from"/>
598598
<attribute name="to"/>
599+
<attribute name="todir" default="${eclipselink.plugins}"/>
599600
<sequential>
600-
<copy todir="${eclipselink.plugins}" overwrite="true">
601+
<copy todir="@{todir}" overwrite="true">
601602
<fileset dir="${eclipselink.compdeps.p2repo}"/>
602603
<globmapper from="@{from}" to="@{to}"/>
603604
</copy>
@@ -616,6 +617,7 @@
616617
<copy-plugin from="jakarta.jms-api*.jar" to="jakarta.jms-api.jar"/>
617618
<copy-plugin from="org.glassfish.jakarta.json*.jar" to="org.glassfish.jakarta.json.jar"/>
618619
<copy-plugin from="com.sun.mail.jakarta.mail*.jar" to="com.sun.mail.jakarta.mail.jar"/>
620+
<copy-plugin from="jakarta.persistence_2.2.2*.jar" to="jakarta.persistence_2.2.2.jar" todir="${eclipselink.jpa.plugins}"/>
619621
<copy-plugin from="jakarta.resource-api*.jar" to="jakarta.resource-api.jar"/>
620622
<copy-plugin from="jakarta.servlet-api*.jar" to="jakarta.servlet-api.jar"/>
621623
<copy-plugin from="jakarta.transaction-api*.jar" to="jakarta.transaction-api.jar"/>
@@ -658,6 +660,7 @@
658660

659661
<!-- Copy source jars -->
660662
<copy-plugin from="jakarta.xml.bind-api*sources.jar" to="javax.xml.bind.source_2.2.12.v1410011542.jar"/>
663+
<copy-plugin from="jakarta.persistence-2.2.2*sources.jar" to="jakarta.persistence.source_2.2.2.jar" todir="${eclipselink.jpa.plugins}"/>
661664
</target>
662665

663666
<!-- Compiles all runtime components (excluding Tests, Oracle extensions). -->
@@ -974,7 +977,7 @@
974977
</zipfileset>
975978
<zipfileset dir="${eclipselink.plugins}">
976979
<include name="**.jar"/>
977-
<exclude name="javax.persistence*.jar"/>
980+
<exclude name="jakarta.persistence*.jar"/>
978981
<exclude name="*nosql*"/>
979982
<exclude name="osgi.cmpn*.jar"/>
980983
<exclude name="org.apache.ant*.zip"/>

‎buildsystem/compdeps/org.eclipse.persistence.compdeps.internal/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
<include name="org.eclipse.persistence.antlr_*"/>
4949
<include name="org.eclipse.persistence.antlr.source_*"/>
5050
</fileset>
51-
<fileset dir="../../../jpa/plugins">
52-
<include name="javax.persistence_*"/>
53-
<include name="javax.persistence.source_*"/>
54-
</fileset>
5551
<fileset dir="../../../utils/plugins">
5652
<include name="org.eclipse.persistence.oracleddlparser_*"/>
5753
<include name="org.eclipse.persistence.oracleddlparser.source_*"/>

‎buildsystem/compdeps/org.eclipse.persistence.compdeps.p2repo/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
<version>${jakarta.xml.bind.version}</version>
6060
<classifier>sources</classifier>
6161
</artifactItem>
62+
<artifactItem>
63+
<groupId>${project.groupId}</groupId>
64+
<artifactId>jakarta.persistence</artifactId>
65+
<version>${jakarta.persistence.version}</version>
66+
<classifier>sources</classifier>
67+
</artifactItem>
6268
</artifactItems>
6369
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
6470
</configuration>

‎buildsystem/compdeps/org.eclipse.persistence.compdeps/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
unpack="false"/>
118118

119119
<plugin
120-
id="javax.persistence"
120+
id="jakarta.persistence"
121121
download-size="0"
122122
install-size="0"
123123
version="0.0.0"

‎buildsystem/compdeps/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<jakarta.jms.version>2.0.2</jakarta.jms.version>
8282
<jakarta.json.version>1.1.5</jakarta.json.version>
8383
<jakarta.mail.version>1.6.3 </jakarta.mail.version>
84-
<javax.persistence.version>2.2.1</javax.persistence.version>
84+
<jakarta.persistence.version>2.2.2</jakarta.persistence.version>
8585
<jakarta.resource.version>1.7.3</jakarta.resource.version>
8686
<jakarta.servlet.version>4.0.2</jakarta.servlet.version>
8787
<jakarta.transaction.version>1.3.2-SNAPSHOT</jakarta.transaction.version>
@@ -289,8 +289,8 @@
289289
</dependency>
290290
<dependency>
291291
<groupId>${project.groupId}</groupId>
292-
<artifactId>javax.persistence</artifactId>
293-
<version>${javax.persistence.version}</version>
292+
<artifactId>jakarta.persistence</artifactId>
293+
<version>${jakarta.persistence.version}</version>
294294
</dependency>
295295
<dependency>
296296
<groupId>org.glassfish.external</groupId>

‎dbws/eclipselink.dbws.test.oracle/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ javac.deprecation=false
3636
test.junit.jvm.modules=java.xml.bind
3737

3838
#Classpath
39-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
39+
persistence22.jar=jakarta.persistence_2.2.2.jar
4040
asm.jar=org.eclipse.persistence.asm_7.0.0.v201811131354.jar
4141

4242
#JaCoCo

‎dbws/eclipselink.dbws.test/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ javac.deprecation=false
3636
test.junit.jvm.modules=java.xml.bind
3737

3838
#Classpath
39-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
39+
persistence22.jar=jakarta.persistence_2.2.2.jar
4040
javax.mail.jar=com.sun.mail.jakarta.mail.jar
4141
javax.xml.soap.jar=jakarta.xml.soap-api.jar
4242
javax.xml.ws.jar=javax.xml.ws_2.0.0.v200902170419.jar

‎dbws/org.eclipse.persistence.dbws/dbws.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<orderEntry type="module-library">
1717
<library>
1818
<CLASSES>
19-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence_2.2.1.v201807122140.jar!/" />
19+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence_2.2.2.jar!/" />
2020
</CLASSES>
2121
<JAVADOC />
2222
<SOURCES>
23-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar!/" />
23+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence.source_2.2.2.jar!/" />
2424
</SOURCES>
2525
</library>
2626
</orderEntry>

‎features/antbuild.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<property name="sdo.criteria" value="[2.1.1,2.2.0)"/>
248248
<property name="mail.prefix" value="com.sun.mail.jakarta.mail"/>
249249
<property name="mail.criteria" value="(1.6.2,2.0.0)"/>
250-
<property name="persistence.prefix" value="javax.persistence"/>
250+
<property name="persistence.prefix" value="jakarta.persistence"/>
251251
<property name="persistence.criteria" value="[2.0.100,2.3.0)"/>
252252
<property name="resource.prefix" value="jakarta.resource-api"/>
253253
<property name="resource.criteria" value="(1.7.2,2.0.0)"/>
@@ -637,7 +637,7 @@
637637
<zipfileset dir="${feature.2.common.plugins.dir}" prefix="plugins" includes="org.eclipse.persistence*.jar"/>
638638
<zipfileset dir="${feature.2.util.plugins.dir}" prefix="plugins" includes="org.eclipse.persistence*.jar"/>
639639
<!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=348829 -->
640-
<zipfileset dir="${feature.2.jpa.plugins.dir}" prefix="plugins" includes="javax.persistence*.jar"/>
640+
<zipfileset dir="${feature.2.jpa.plugins.dir}" prefix="plugins" includes="jakarta.persistence*.jar"/>
641641
</zip>
642642
</target>
643643

‎features/org.eclipse.persistence.jpa/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
unpack="false"/>
4949

5050
<plugin
51-
id="javax.persistence"
51+
id="jakarta.persistence"
5252
download-size="0"
5353
install-size="0"
5454
version="@PERSISTENCE_VERSION@"

‎features/org.eclipse.persistence.moxy/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
unpack="false"/>
4545

4646
<plugin
47-
id="javax.persistence"
47+
id="jakarta.persistence"
4848
download-size="0"
4949
install-size="0"
5050
version="@PERSISTENCE_VERSION@"

‎foundation/eclipselink.core.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<classpathentry kind="src" path="src"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.core"/>
88
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.transaction-api.jar" />
9-
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.1.v201807122140.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar"/>
9+
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.2.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence.source_2.2.2.jar"/>
1010
<classpathentry kind="output" path="classes"/>
1111
</classpath>

‎foundation/eclipselink.core.test/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ test.properties=test.properties
4646
eclipselink.core=../org.eclipse.persistence.core
4747

4848
# Modules
49-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
49+
persistence22.jar=jakarta.persistence_2.2.2.jar
5050
transaction.jar=jakarta.transaction-api.jar
5151

5252
#Classpath

‎foundation/eclipselink.core.test/core.test.iml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<component name="EclipseModuleManager">
44
<varelement var="jar://$MODULE_DIR$/../../plugins/jakarta.transaction-api.jar!/" value="MODULE_DIR/../../plugins/jakarta.transaction-api.jar" />
55
<varelement var="file://$MODULE_DIR$/../../plugins/javax.transaction/src" value="src:/MODULE_DIR/../../plugins/javax.transaction/src" />
6-
<varelement var="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence_2.2.1.v201807122140.jar!/" value="MODULE_DIR/../../jpa/plugins/javax.persistence_2.2.1.v201807122140.jar" />
6+
<varelement var="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence_2.2.2.jar!/" value="MODULE_DIR/../../jpa/plugins/jakarta.persistence_2.2.2.jar" />
77
<varelement var="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar!/" value="src:/MODULE_DIR/../../jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar" />
88
<src_description expected_position="2">
99
<src_folder value="file://$MODULE_DIR$/" expected_position="2" />
@@ -43,11 +43,11 @@
4343
<orderEntry type="module-library">
4444
<library>
4545
<CLASSES>
46-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence_2.2.1.v201807122140.jar!/" />
46+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence_2.2.2.jar!/" />
4747
</CLASSES>
4848
<JAVADOC />
4949
<SOURCES>
50-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar!/" />
50+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence.source_2.2.2.jar!/" />
5151
</SOURCES>
5252
</library>
5353
</orderEntry>

‎foundation/eclipselink.extension.nosql.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa"/>
99
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.nosql"/>
1010
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
11-
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.1.v201807122140.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar"/>
11+
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.2.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence.source_2.2.2.jar"/>
1212
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.mongodb.mongo-java-driver_3.2.0.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.slf4j.api.source_1.7.2.v20121108-1250.jar"/>
1313
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.resource-api.jar"/>
1414
<classpathentry kind="output" path="classes"/>

‎foundation/eclipselink.extension.oracle.nosql.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.oracle.nosql"/>
1010
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.nosql"/>
1111
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
12-
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.1.v201807122140.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar"/>
12+
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.2.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence.source_2.2.2.jar"/>
1313
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.resource-api.jar"/>
1414
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.jms-api.jar"/>
1515
<classpathentry kind="var" path="EXTENSION_LIB_EXTERNAL/aqapi.jar"/>

‎foundation/eclipselink.extension.oracle.spatial.test/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ oracle.test.jar=eclipselink-oracle-tests.jar
5050
oracle.spatial.test.jar=eclipselink-oracle-spatial-tests.jar
5151
oracle.spatial.jpa.test.jar=eclipselink-oracle-spatial-jpa-test.jar
5252

53-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
53+
persistence22.jar=jakarta.persistence_2.2.2.jar
5454
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
5555

5656
#JaCoCo

‎foundation/eclipselink.extension.oracle.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
1111
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.transaction-api.jar"/>
1212
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.jms-api.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.jms/src"/>
13-
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.1.v201807122140.jar"/>
13+
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.2.jar"/>
1414
<classpathentry kind="var" path="EXTENSION_LIB_EXTERNAL/ojdbc8.jar"/>
1515
<classpathentry kind="var" path="EXTENSION_LIB_EXTERNAL/ucp.jar"/>
1616
<classpathentry kind="var" path="EXTENSION_LIB_EXTERNAL/aqapi.jar"/>

‎foundation/eclipselink.extension.oracle.test/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ core.test.jar=eclipselink-core-tests.jar
5454
oracle.test.jar=eclipselink-oracle-tests.jar
5555
oracle.jpa.test.jar=eclipselink-oracle-jpa-test.jar
5656

57-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
57+
persistence22.jar=jakarta.persistence_2.2.2.jar
5858
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
5959

6060
test.properties=test.properties

‎foundation/eclipselink.extension.oracle.test/oracle.test.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@
110110
<orderEntry type="module-library">
111111
<library>
112112
<CLASSES>
113-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence_2.2.1.v201807122140.jar!/" />
113+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence_2.2.2.jar!/" />
114114
</CLASSES>
115115
<JAVADOC />
116116
<SOURCES>
117-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar!/" />
117+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence.source_2.2.2.jar!/" />
118118
</SOURCES>
119119
</library>
120120
</orderEntry>

‎foundation/eclipselink.extension.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<classpathentry combineaccessrules="false" kind="src" path="/eclipselink.core.test"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.core"/>
77
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
8-
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.1.v201807122140.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar"/>
8+
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.2.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence.source_2.2.2.jar"/>
99
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.slf4j.api_1.7.2.v20121108-1250.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.slf4j.api.source_1.7.2.v20121108-1250.jar"/>
1010
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/ch.qos.logback.core_1.0.7.v20121108-1250.jar" sourcepath="/ECLIPSELINK_HOME/plugins/ch.qos.logback.core.source_1.0.7.v20121108-1250.jar"/>
1111
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/ch.qos.logback.classic_1.0.7.v20121108-1250.jar" sourcepath="/ECLIPSELINK_HOME/plugins/ch.qos.logback.classic.source_1.0.7.v20121108-1250.jar"/>

‎foundation/org.eclipse.persistence.core/core.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@
9999
<orderEntry type="module-library">
100100
<library>
101101
<CLASSES>
102-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence_2.2.1.v201807122140.jar!/" />
102+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence_2.2.2.jar!/" />
103103
</CLASSES>
104104
<JAVADOC />
105105
<SOURCES>
106-
<root url="jar://$MODULE_DIR$/../../jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar!/" />
106+
<root url="jar://$MODULE_DIR$/../../jpa/plugins/jakarta.persistence.source_2.2.2.jar!/" />
107107
</SOURCES>
108108
</library>
109109
</orderEntry>

‎jpa/eclipselink.jaxrs.test/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ transaction.jar=jakarta.transaction-api.jar
5858
restfulws.jar=jakarta.ws.rs-api.jar
5959
jaxb-api.jar=jakarta.xml.bind-api.jar
6060
commonj.sdo.jar=commonj.sdo_2.1.1.v201112051852.jar
61-
persistence22.jar=javax.persistence_2.2.1.v201807122140.jar
61+
persistence22.jar=jakarta.persistence_2.2.2.jar
6262
persistence21.jar=javax.persistence_2.1.1.v201509150925.jar
6363
#TODO in master there will be jakarta.json-api.jar
6464
json-api.jar=org.glassfish.jakarta.json.jar

‎jpa/eclipselink.jpa.spring.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<classpathentry combineaccessrules="false" kind="src" path="/eclipselink.jpa.test"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.core"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa"/>
8-
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.1.v201807122140.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.1.v201807122140.jar"/>
8+
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.2.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence.source_2.2.2.jar"/>
99
<classpathentry kind="var" path="SPRING_CGLIB_LIB"/>
1010
<classpathentry kind="var" path="SPRING_COMMONS_LOGGING_LIB"/>
1111
<classpathentry kind="var" path="SPRING_JOTM_CLIENT_LIB"/>

‎jpa/eclipselink.jpa.spring.test/antbuild.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ eclipselink.core.test.trunk=../../foundation/eclipselink.core.test
4242
asm=org.eclipse.persistence.asm
4343
antlr=org.eclipse.persistence.antlr
4444

45-
persistence.jar=javax.persistence_2.2.1.v201807122140.jar
45+
persistence.jar=jakarta.persistence_2.2.2.jar
4646

4747
test.properties=./test.properties
4848
src.dir=src

0 commit comments

Comments
 (0)