You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2023/05/06 07:18:41 UTC
[openjpa] 16/17: OPENJPA-2908 finish jakarta migration
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 0ddc38512d690bd18ea37103c6b78f5fa48127a3
Author: Mark Struberg <st...@apache.org>
AuthorDate: Fri May 5 17:31:20 2023 +0200
OPENJPA-2908 finish jakarta migration
---
openjpa-all/pom.xml | 6 +-
.../src/test/resources/META-INF/persistence.xml | 2 +-
openjpa-integration/validation/pom.xml | 22 +-----
.../openjpa/integration/validation/constraints.xml | 4 +-
.../openjpa/integration/validation/persistence.xml | 2 +-
.../org/apache/openjpa/ant/MetaDataToolTask.java | 2 +-
openjpa-persistence/pom.xml | 1 -
.../src/it/testDependencies/pom.xml | 2 +
.../src/it/testDependencies/prjB/pom.xml | 2 +-
openjpa/pom.xml | 81 ++--------------------
10 files changed, 20 insertions(+), 104 deletions(-)
diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 1e384aa09..49dc289d6 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -104,9 +104,9 @@
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>
<Implementation-Title>Apache OpenJPA Aggregate JAR with dependencies</Implementation-Title>
- <Specification-Title>JSR-338 Java Persistence</Specification-Title>
- <Specification-Vendor>ORACLE, Inc.</Specification-Vendor>
- <Specification-Version>2.2</Specification-Version>
+ <Specification-Title>Jakarta Persistence</Specification-Title>
+ <Specification-Vendor>Eclipse Foundation</Specification-Vendor>
+ <Specification-Version>3.0</Specification-Version>
</manifestEntries>
</transformer>
</transformers>
diff --git a/openjpa-examples/image-gallery/src/test/resources/META-INF/persistence.xml b/openjpa-examples/image-gallery/src/test/resources/META-INF/persistence.xml
index 8fc025517..6a8db6983 100644
--- a/openjpa-examples/image-gallery/src/test/resources/META-INF/persistence.xml
+++ b/openjpa-examples/image-gallery/src/test/resources/META-INF/persistence.xml
@@ -52,7 +52,7 @@
<property name="jakarta.persistence.validation.group.pre-update"
value="org.apache.openjpa.example.gallery.constraint.SequencedImageGroup"/>
<property name="jakarta.persistence.validation.group.pre-remove"
- value="javax.validation.groups.Default"/>
+ value="jakarta.validation.groups.Default"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 1ddfa27a1..5bc45c0da 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -81,30 +81,14 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
- <scope>test</scope>
- </dependency>
+
<!-- Hibernate that implements 1.0.0.GA -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.0.2.GA</version>
+ <version>8.0.0.Final</version>
<scope>test</scope>
- <exclusions>
- <!-- force usage of the geronimo-jpa_2.1_spec -->
- <exclusion>
- <groupId>org.hibernate.java-persistence</groupId>
- <artifactId>jpa-api</artifactId>
- </exclusion>
- <!-- force usage of the RI API level above -->
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
+
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/constraints.xml b/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/constraints.xml
index 1c01c6894..1b952b572 100644
--- a/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/constraints.xml
+++ b/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/constraints.xml
@@ -26,13 +26,13 @@
<bean class="XMLSuper" ignore-annotations="false">
<getter name="superStrValue">
<valid/>
- <constraint annotation="javax.validation.constraints.NotNull"/>
+ <constraint annotation="jakarta.validation.constraints.NotNull"/>
</getter>
</bean>
<bean class="XMLBase" ignore-annotations="false">
<getter name="strValue">
<valid/>
- <constraint annotation="javax.validation.constraints.NotNull"/>
+ <constraint annotation="jakarta.validation.constraints.NotNull"/>
</getter>
</bean>
</constraint-mappings>
\ No newline at end of file
diff --git a/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/persistence.xml b/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/persistence.xml
index dd760f8f0..6bb0f55d2 100644
--- a/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/persistence.xml
+++ b/openjpa-integration/validation/src/test/resources/org/apache/openjpa/integration/validation/persistence.xml
@@ -96,7 +96,7 @@
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
<property name="jakarta.persistence.validation.group.pre-remove"
- value="javax.validation.groups.Default"/>
+ value="jakarta.validation.groups.Default"/>
</properties>
</persistence-unit>
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java
index 07ece1188..b64c71c60 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java
@@ -89,5 +89,5 @@ public class MetaDataToolTask
public String[] getValues() {
return MetaDataTool.ACTIONS;
}
- }
+ }
}
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index 253edf5a7..e2e4e81f2 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
index 4aacbdb1e..2915c20d8 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
@@ -37,10 +37,12 @@
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta.persistence-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
+ <version>${jakarta.validation-api.version}</version>
</dependency>
</dependencies>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml
index fb4fb50a4..c1b29e049 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
+ <version>@hsqldb.version@</version>
</dependency>
</dependencies>
<build>
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 57ec31f9b..4f167e102 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -96,75 +96,6 @@
</transformers>
</configuration>
</execution>
- <execution>
- <id>shade-jakarta</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>jakarta</shadedClassifierName>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <createSourcesJar>${createSources}</createSourcesJar>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <!-- Need to add some MANIFEST.MF metadata -->
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <manifestEntries>
- <Automatic-Module-Name>org.apache.openjpa</Automatic-Module-Name>
- </manifestEntries>
- </transformer>
- </transformers>
- <artifactSet>
- <includes>
- <include>org.apache.openjpa:openjpa-lib</include>
- <include>org.apache.openjpa:openjpa-kernel</include>
- <include>org.apache.openjpa:openjpa-jdbc</include>
- <include>org.apache.openjpa:openjpa-persistence</include>
- <include>org.apache.openjpa:openjpa-persistence-jdbc</include>
- <include>org.apache.openjpa:openjpa-xmlstore</include>
- <include>org.apache.openjpa:openjpa-slice</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>jakarta.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>jakarta.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>jakarta.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -181,9 +112,9 @@
<Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>
- <Specification-Title>JSR-338 Java Persistence</Specification-Title>
- <Specification-Vendor>ORACLE, Inc.</Specification-Vendor>
- <Specification-Version>2.2</Specification-Version>
+ <Specification-Title>Jakarta Persistence</Specification-Title>
+ <Specification-Vendor>Eclipse Foundation</Specification-Vendor>
+ <Specification-Version>3.0</Specification-Version>
<Automatic-Module-Name>org.apache.openjpa</Automatic-Module-Name>
<!-- OSGi Bundle Metadata -->
<Bundle-DocURL>${project.url}</Bundle-DocURL>
@@ -202,9 +133,9 @@
org.apache.commons.logging.*;resolution:=optional,
javax.activation.xa*;resolution:=optional,
jakarta.jms.*;version="[1.1.0,1.2)";resolution:=optional,
- javax.transaction.*;version="[1.1,1.3)";resolution:=optional,
- javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,
- javax.xml.bind.*;resolution:=optional,
+ jakarta.transaction.*;version="[1.1,1.3)";resolution:=optional,
+ jakarta.validation.*;version="[1.0.0,1.1)";resolution:=optional,
+ jakarta.xml.bind.*;resolution:=optional,
serp.*;resolution:=optional,
org.apache.commons.dbcp2.*;resolution:=optional,
org.apache.commons.pool2.*;resolution:=optional,