Merge branch 'master' into dependabot/maven/org.hsqldb-hsqldb-2.7.1

.github/workflows/pr-validation.yml

@@ -21,13 +21,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: 'Set up JDK 1.8'
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: '1.8'
+          distribution: 'zulu'
+          java-version: 11
       - name: 'Cache Maven packages'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: 'cache'

.gitignore

@@ -9,4 +9,5 @@ dependency-reduced-pom.xml
 nb-configuration.xml
 nbactions*.xml
 .checkstyle
+.vscode
 

NOTICE

@@ -9,10 +9,6 @@ The Apache Software Foundation (http://www.apache.org/).
 The following copyright notice(s) were affixed to portions of this code
 with which this file is now or was at one time distributed.
 
-
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
 OpenJPA includes the persistence and orm schemas from the JPA specifications.
 Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
 OpenJPA elects to include this software in this distribution under the

README.adoc

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

openjpa-all/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-all</artifactId>
@@ -91,7 +91,7 @@
                             <transformers>
                                 <!-- Need to concatinate the services resources:
                                  org.apache.openjpa.lib.conf.ProductDerivation
-                                 javax.persistence.spi.PersistenceProvider
+                                 jakarta.persistence.spi.PersistenceProvider
                                  org.apache.openjpa.kernel.exps.ExpressionParser
                                 -->
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
@@ -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>
@@ -139,8 +139,8 @@
 
         <!-- bean validation includes -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.1_spec</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.bval</groupId>

openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm

@@ -232,36 +232,6 @@ and resource files are also released under the ASF license above.
 
 The exceptions are as follows:
 
-=============================
-serp-1.13.1.jar - BSD License
-=============================
-
-Copyright (c) 2002, A. Abram White
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of 'serp' nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ===========================
 openjpa-persistence -
   orm-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:

openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm

@@ -32,9 +32,6 @@ openjpa-all includes software developed by the:
 The following copyright notice(s) were affixed to portions of this code
 with which this file is now or was at one time distributed.
 
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
 OpenJPA includes the persistence and orm schemas from the JPA specifications.
 Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
 OpenJPA elects to include this software in this distribution under the

openjpa-examples/image-gallery/pom.xml

@@ -27,7 +27,7 @@
   <parent>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-examples</artifactId>
-      <version>3.2.3-SNAPSHOT</version>
+      <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.openjpa.openjpa-examples</groupId>
@@ -38,7 +38,6 @@
   <description>Apache OpenJPA Examples - image-gallery</description>
 
   <properties>
-    <test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
     <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
     <test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments>
     <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/TestJPAValidation.java

@@ -21,11 +21,11 @@
 
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 
 import org.apache.openjpa.example.gallery.model.Image;
 import org.apache.openjpa.example.gallery.model.Location;

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java

@@ -27,8 +27,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import org.apache.openjpa.example.gallery.ImageType;
 

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java

@@ -28,8 +28,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import org.apache.openjpa.example.gallery.ImageType;
 

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java

@@ -21,8 +21,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import org.apache.openjpa.example.gallery.ImageType;
 

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java

@@ -21,8 +21,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import org.apache.openjpa.example.gallery.ImageType;
 import org.apache.openjpa.example.gallery.model.Image;

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/SequencedImageGroup.java

@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.example.gallery.constraint;
 
-import javax.validation.GroupSequence;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.groups.Default;
 
 /**
  * Sequenced validation group definition.  When this validation group is

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java

@@ -20,12 +20,12 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * Album entity.  Contains references to zero or more images and zero or more

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Creator.java

@@ -20,13 +20,13 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * Creator entity.  Contains a reference to one or more images authored by

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Image.java

@@ -18,15 +18,15 @@
  */
 package org.apache.openjpa.example.gallery.model;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 import org.apache.openjpa.example.gallery.ImageType;
 import org.apache.openjpa.example.gallery.constraint.ImageConstraint;

openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Location.java

@@ -19,11 +19,11 @@
 
 package org.apache.openjpa.example.gallery.model;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  * Location embeddable with several BV constraints applied.

openjpa-examples/image-gallery/src/test/resources/META-INF/persistence.xml

@@ -47,12 +47,12 @@
           <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true,SchemaAction='add,deleteTableContents')"/>
           <property name="openjpa.DynamicEnhancementAgent" value="false"/>
 
-          <property name="javax.persistence.validation.group.pre-persist"
+          <property name="jakarta.persistence.validation.group.pre-persist"
               value="org.apache.openjpa.example.gallery.constraint.SequencedImageGroup"/>
-          <property name="javax.persistence.validation.group.pre-update"
+          <property name="jakarta.persistence.validation.group.pre-update"
               value="org.apache.openjpa.example.gallery.constraint.SequencedImageGroup"/>
-          <property name="javax.persistence.validation.group.pre-remove"
-              value="javax.validation.groups.Default"/>
+          <property name="jakarta.persistence.validation.group.pre-remove"
+              value="jakarta.validation.groups.Default"/>
         </properties>
     </persistence-unit>
 </persistence>

openjpa-examples/jest/src/main/java/demo/Actor.java

@@ -23,10 +23,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 
 import org.apache.openjpa.persistence.FetchAttribute;
 import org.apache.openjpa.persistence.FetchGroup;

openjpa-examples/jest/src/main/java/demo/DataLoader.java

@@ -21,7 +21,7 @@
 
 import java.util.Date;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * Loads some example Actor-Movie data.

openjpa-examples/jest/src/main/java/demo/Movie.java

@@ -22,10 +22,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 import org.apache.openjpa.persistence.FetchAttribute;
 import org.apache.openjpa.persistence.FetchGroup;

openjpa-examples/jest/src/main/java/demo/SimpleApp.java

@@ -30,9 +30,9 @@
 import java.util.Map;
 import java.util.Random;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;

openjpa-examples/jest/src/main/resources/META-INF/persistence.xml

@@ -27,10 +27,10 @@
         <class>demo.Actor</class>
 
         <properties>
-        <property name="javax.persistence.jdbc.driver"   value="com.mysql.jdbc.Driver"/>
-        <property name="javax.persistence.jdbc.url"      value="jdbc:mysql://localhost/jest"/>
-        <property name="javax.persistence.jdbc.user"     value="root"/>
-        <property name="javax.persistence.jdbc.password" value=""/>
+        <property name="jakarta.persistence.jdbc.driver"   value="com.mysql.jdbc.Driver"/>
+        <property name="jakarta.persistence.jdbc.url"      value="jdbc:mysql://localhost/jest"/>
+        <property name="jakarta.persistence.jdbc.user"     value="root"/>
+        <property name="jakarta.persistence.jdbc.password" value=""/>
         <property name="openjpa.ConnectionFactoryProperties" value="PrintParameters=true"/>
         <property name="openjpa.Log" value="Tool=Trace,SQL=TRACE,Remote=TRACE"/>
         <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>