change artifactId to jakarta.persistence, bump version to 2.2.2
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 5d20d6c..4cee6a6 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,24 +1,23 @@
Manifest-Version: 1.0
-Export-Package: javax.persistence;jpa="2.2";version="2.2.0",
- javax.persistence.criteria;jpa="2.2";version="2.2.0",
- javax.persistence.metamodel;jpa="2.2";version="2.2.0",
- javax.persistence.spi;jpa="2.2";version="2.2.0",
+Export-Package: javax.persistence;jpa="2.2";version="2.2.2",
+ javax.persistence.criteria;jpa="2.2";version="2.2.2",
+ javax.persistence.metamodel;jpa="2.2";version="2.2.2",
+ javax.persistence.spi;jpa="2.2";version="2.2.2",
org.osgi.service.jpa;version="1.1.0"
-Implementation-Version: 2.2.1
+Implementation-Version: 2.2.2
Bundle-ClassPath: .
Specification-Vendor: Oracle
Bundle-Name: Java Persistence API 2.2
-Created-By: 1.6.0_35 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version>=1.8))"
Implementation-Vendor: Eclipse.org - EclipseLink Project
Bundle-Vendor: Eclipse.org - EclipseLink Project
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.2.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.persistence.javax.persistence.osgi.Activator
Import-Package: javax.sql;resolution:=optional,
org.osgi.framework;resolution:=optional,
org.osgi.service.jpa;version="1.1.0"
Specification-Version: 2.2
-Bundle-SymbolicName: javax.persistence
+Bundle-SymbolicName: jakarta.persistence
Extension-Name: javax.persistence
Automatic-Module-Name: java.persistence
diff --git a/build-api.xml b/build-api.xml
index 8a99478..f8a610c 100644
--- a/build-api.xml
+++ b/build-api.xml
@@ -12,7 +12,7 @@
-->
-<project name="javax.persistence-api" basedir="." default="info">
+<project name="jakarta.persistence-api" basedir="." default="info">
<target name="info" depends="init">
<!-- IMPL properties -->
@@ -131,9 +131,9 @@
<format property="build.date" pattern="yyyyMMdd"/>
<format property="build.time" pattern="HHmm"/>
</tstamp>
- <property name="API_PACKAGE" value="javax.persistence"/>
+ <property name="API_PACKAGE" value="jakarta.persistence"/>
<property name="SPEC_VERSION" value="2.2"/>
- <property name="SPEC_IMPL_VERSION" value="2.2.0"/>
+ <property name="SPEC_IMPL_VERSION" value="2.2.2"/>
<property name="API_QUALIFIER" value="b01"/>
<property name="API_JAR" value="${API_PACKAGE}-api.jar"/>
@@ -157,7 +157,7 @@
<property name="Maven_API_javadoc_file" value="${API_PACKAGE}-api-${SPEC_IMPL_VERSION}-javadoc.jar"/>
<property name="Maven_API_source_file" value="${API_PACKAGE}-api-${SPEC_IMPL_VERSION}-sources.jar"/>
- <dirname property="build.location_temp" file="${ant.file.javax.persistence-api}"/>
+ <dirname property="build.location_temp" file="${ant.file.jakarta.persistence-api}"/>
<pathconvert targetos="unix" property="build.location">
<path>
<pathelement location="${build.location_temp}"/>
diff --git a/pom.xml b/pom.xml
index 4fe1bcb..bac9b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,20 +19,22 @@
<name>JPA Spec OSGi Bundle</name>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <artifactId>jakarta.persistence</artifactId>
+ <version>2.2.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<!-- TOOL Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho.version>1.0.0</tycho.version>
- <release.version>2.2.1</release.version>
+ <tycho.version>1.2.0</tycho.version>
+ <release.version>2.2.2</release.version>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<build.qualifier>v${maven.build.timestamp}</build.qualifier>
<forceContextQualifier>${build.qualifier}</forceContextQualifier>
<!-- BUILD Properties -->
- <eclipse.drop>luna</eclipse.drop>
+ <eclipse.drop>photon</eclipse.drop>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<organization>
diff --git a/pom.xml.template b/pom.xml.template
index 0769bc2..4b2f129 100644
--- a/pom.xml.template
+++ b/pom.xml.template
@@ -16,11 +16,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
<version>@version@</version>
<packaging>jar</packaging>
<name>@artifactName@</name>
- <description>javax.persistence build based upon git transaction @git.hash@</description>
+ <description>jakarta.persistence build based upon git transaction @git.hash@</description>
<url>http://www.eclipse.org/eclipselink</url>
<organization>
<name>Eclipse.org - EclipseLink Project</name>
diff --git a/uploadToMaven.xml b/uploadToMaven.xml
index 0ac3ac3..400ffa5 100644
--- a/uploadToMaven.xml
+++ b/uploadToMaven.xml
@@ -110,9 +110,9 @@
<taskdef name="selectbundle" classname="${custom.selectbundle.task.class}" classpath="${custom.tasks.lib}"/>
<taskdef name="stripQualifier" classname="${custom.stripqualifier.task.class}" classpath="${custom.tasks.lib}"/>
- <property name="bundle.prefix" value="javax.persistence"/>
+ <property name="bundle.prefix" value="jakarta.persistence"/>
<property name="bundle.criteria" value="[2.0.100, 2.2)"/>
- <property name="bundle.name" value="Javax Persistence"/>
+ <property name="bundle.name" value="Java Persistence"/>
<!-- Determine Version info from built bundle filename -->
<selectbundle basename="${bundle.prefix}" directory="${maven.2.target.dir}"
diff --git a/uploadToNexus.xml b/uploadToNexus.xml
index e6b6ead..ad1092b 100644
--- a/uploadToNexus.xml
+++ b/uploadToNexus.xml
@@ -107,9 +107,9 @@
<taskdef name="selectbundle" classname="${custom.selectbundle.task.class}" classpath="${custom.tasks.lib}"/>
<taskdef name="stripQualifier" classname="${custom.stripqualifier.task.class}" classpath="${custom.tasks.lib}"/>
- <property name="bundle.prefix" value="javax.persistence"/>
+ <property name="bundle.prefix" value="jakarta.persistence"/>
<property name="bundle.criteria" value="[2.0.100, 2.3)"/>
- <property name="bundle.name" value="Javax Persistence"/>
+ <property name="bundle.name" value="Java Persistence"/>
<!-- Determine Version info from built bundle filename -->
<selectbundle basename="${bundle.prefix}" directory="${maven.2.target.dir}"
