Implements Jakarta Persistence 3.2

.github/workflows/ci.yml

@@ -14,26 +14,37 @@
 # specific language governing permissions and limitations under the License.
 #
 name: Java CI
-on: [push]
+on:
+  push:
+    branches: [master]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   MAVEN_OPTS: -Dmaven.artifact.threads=256 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [17, 21]
+        profile: [test-derby, test-h2]
+    name: build (Java ${{ matrix.java }}, ${{ matrix.profile }})
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Java JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: ${{ matrix.java }}
       - name: 'Cache Maven packages'
-        uses: actions/cache@v4
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         with:
           path: ~/.m2
           key: 'cache'
           restore-keys: 'cache'
       - name: 'Build with Maven'
-        run: mvn -B install --file pom.xml
-      - name: 'Remove Snapshots Before Caching'
+        run: mvn -P${{ matrix.profile }} -B clean install --file pom.xml
+      - name: 'Remove snapshots before caching'
         run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf

.github/workflows/pr-validation.yml

@@ -15,25 +15,34 @@
 #
 name: Pull Request
 on: [pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   MAVEN_OPTS: -Dmaven.artifact.threads=256 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [17, 21]
+        profile: [test-derby, test-h2]
+    name: build (Java ${{ matrix.java }}, ${{ matrix.profile }})
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Java JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: ${{ matrix.java }}
       - name: 'Cache Maven packages'
-        uses: actions/cache@v4
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         with:
           path: ~/.m2
           key: 'cache'
           restore-keys: 'cache'
       - name: 'Build with Maven'
-        run: mvn -B install --file pom.xml
+        run: mvn -P${{ matrix.profile }} -B clean install --file pom.xml
       - name: 'Remove Snapshots Before Caching'
         run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf

.gitignore

@@ -11,3 +11,8 @@ nbactions*.xml
 .checkstyle
 .vscode
 
+.claude
+CLAUDE.md
+openjpa-xmlstore/jdbc*
+scripts/.report/
+

README.adoc

@@ -3,7 +3,7 @@
 == Preface
 Thank you for downloading this release of Apache OpenJPA.
 
-Apache OpenJPA is an implementation of the Jakarta Persistence API 3.0 specification.
+Apache OpenJPA is an implementation of the Jakarta Persistence API 3.2 specification.
 
 
 == License

openjpa-all/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-all</artifactId>

openjpa-examples/image-gallery/pom.xml

@@ -27,7 +27,7 @@
   <parent>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-examples</artifactId>
-      <version>4.1.2-SNAPSHOT</version>
+      <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.openjpa.openjpa-examples</groupId>

openjpa-examples/openbooks/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-examples</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.openjpa.openjpa-examples</groupId>
@@ -70,8 +70,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -129,6 +129,7 @@
                             <execution>
                                 <id>genmodel</id>
                                 <phase>process-resources</phase>
+								<?m2e execute onConfiguration,onIncremental?>
                                 <configuration>
                                     <target>
                                         <echo>Running OpenBooks genmodel</echo>
@@ -146,6 +147,7 @@
                             <execution>
                                 <id>enhance</id>
                                 <phase>process-classes</phase>
+								<?m2e execute onConfiguration,onIncremental?>
                                 <configuration>
                                     <target>
                                         <echo>Running OpenBooks Enhance</echo>
@@ -163,6 +165,7 @@
                             <execution>
                                 <id>generate-source</id>
                                 <phase>prepare-package</phase>
+								<?m2e execute onConfiguration,onIncremental?>
                                 <configuration>
                                     <target>
                                         <echo>Running OpenBooks Generate Source</echo>
@@ -184,6 +187,24 @@
                             </execution>
                         </executions>
                     </plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>add-source</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>add-source</goal>
+								</goals>
+								<configuration>
+									<sources>
+										<source>${project.build.directory}/generated-metamodel/java</source>
+									</sources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>

openjpa-examples/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-examples</artifactId>

openjpa-examples/simple/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-examples</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.openjpa.openjpa-examples</groupId>

openjpa-features/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-features</artifactId>

openjpa-integration/daytrader/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-daytrader</artifactId>
@@ -94,6 +94,7 @@
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <?m2e ignore?>
                         <configuration>
                             <artifactItems>
                                 <artifactItem>

openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java

@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 import jakarta.persistence.EntityManagerFactory;
 
@@ -37,6 +38,8 @@
  *
  */
 public class TradeAction extends TradeJPADirect {
+
+	private static final Logger logger = Logger.getLogger(TradeAction.class.getCanonicalName());
 
     public TradeAction(Log log, EntityManagerFactory emf, boolean poolEm) {
         super(log, emf, poolEm);
@@ -382,7 +385,7 @@ fullname, address, email, ccn, new BigDecimal(
             } else {
                 // Password validation failed
                 results = "Registration operation failed, your passwords did not match";
-                System.out.println(results);
+                logger.warning(results);
                 setAttribute(sb, "results", results);
                 // requestDispatch(ctx, req, resp, userID, TradeConfig.getPage(TradeConfig.REGISTER_PAGE));
             }

openjpa-integration/examples/pom.xml

@@ -37,7 +37,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-examples</artifactId>

openjpa-integration/jmx/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-jmx</artifactId>
@@ -81,6 +81,7 @@
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <?m2e ignore?>
                         <configuration>
                             <artifactItems>
                                 <artifactItem>

openjpa-integration/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration</artifactId>

openjpa-integration/slf4j/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-slf4j</artifactId>
@@ -76,6 +76,7 @@
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <?m2e ignore?>
                         <configuration>
                             <artifactItems>
                                 <artifactItem>