Implements Jakarta Persistence 3.2

.github/workflows/ci.yml

@@ -25,15 +25,15 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
       - name: 'Cache Maven packages'
         uses: actions/cache@v4
         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 -B clean install --file pom.xml
+      - name: 'Remove snapshots before caching'
         run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf

.github/workflows/pr-validation.yml

@@ -25,15 +25,15 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
       - name: 'Cache Maven packages'
         uses: actions/cache@v4
         with:
           path: ~/.m2
           key: 'cache'
           restore-keys: 'cache'
       - name: 'Build with Maven'
-        run: mvn -B install --file pom.xml
+        run: mvn -Ptest-h2-2 -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
+tck-dev
+docker-compose.yml
+pgdata

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

docker-compose-test-mariadb.yml

@@ -0,0 +1,46 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.  The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this
+# file except in compliance with the License.  You may obtain a copy of the License
+# at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# MariaDB test environment matching the test-mariadb-docker Maven profile.
+# Usage:
+#   docker compose -f docker-compose-test-mariadb.yml up -d
+#   mvn test -pl openjpa-persistence-jdbc -Ptest-mariadb-docker -Dcheckstyle.skip=true
+#
+services:
+  mariadb:
+    # Track the current MariaDB LTS (:lts resolves to 11.8 at the time of
+    # writing). Pinned to an explicit version so local runs match what
+    # reviewers and CI see when they pull mariadb:lts.
+    image: mariadb:11.8
+    restart: unless-stopped
+    environment:
+      MARIADB_DATABASE: openjpatst
+      MARIADB_ROOT_PASSWORD: openjpatst
+      MARIADB_AUTO_UPGRADE: "1"
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
+    ports:
+      - "127.0.0.1:3306:3306"
+    volumes:
+      - mariadbdata:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+volumes:
+  mariadbdata:

docker-compose-test-mysql.yml

@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.  The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this
+# file except in compliance with the License.  You may obtain a copy of the License
+# at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# MySQL test environment matching the test-mysql-docker Maven profile.
+# Usage:
+#   docker compose -f docker-compose-test-mysql.yml up -d
+#   mvn test -pl openjpa-persistence-jdbc -Ptest-mysql-docker -Ddocker.skip=true \
+#       -Ddocker.external.mysql.port=3307 -Dcheckstyle.skip=true
+#
+# Uses host port 3307 so MySQL can run in parallel with MariaDB (3306).
+#
+services:
+  mysql:
+    image: mysql:8.4
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: openjpatst
+      MYSQL_USER: openjpatst
+      MYSQL_PASSWORD: openjpatst
+      MYSQL_ROOT_PASSWORD: openjpatst
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
+    ports:
+      - "127.0.0.1:3307:3306"
+    volumes:
+      - mysqldata:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-popenjpatst"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+volumes:
+  mysqldata:

docker-compose-test-pg17.yml

@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.  The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this
+# file except in compliance with the License.  You may obtain a copy of the License
+# at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# PostgreSQL 17 test environment matching Christof's setup for PR #142 testing.
+# Usage: docker compose -f docker-compose-test-pg17.yml up -d
+#
+services:
+  postgres17:
+    image: postgres:17
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: openjpatst
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--locale=en_US.UTF-8"
+    ports:
+      - "127.0.0.1:5432:5432"
+    volumes:
+      - pg17data:/var/lib/postgresql/data
+
+volumes:
+  pg17data:

docker-compose-test-pg18.yml

@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.  The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this
+# file except in compliance with the License.  You may obtain a copy of the License
+# at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# PostgreSQL 17 test environment matching Christof's setup for PR #142 testing.
+# Usage: docker compose -f docker-compose-test-pg17.yml up -d
+#
+services:
+  postgres17:
+    image: postgres:18
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: openjpatst
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--locale=en_US.UTF-8"
+    ports:
+      - "127.0.0.1:5432:5432"
+    volumes:
+      - pg18:/var/lib/postgresql
+
+volumes:
+  pg18:

docker-compose.yml

@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.  The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this
+# file except in compliance with the License.  You may obtain a copy of the License
+# at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+services:
+  postgres:
+    image: postgres:18
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: openjpa_tck
+      POSTGRES_USER: openjpa
+      POSTGRES_PASSWORD: openjpa
+    ports:
+      - "127.0.0.1:5433:5432"
+    volumes:
+      - ./pgdata:/var/lib/postgresql

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>