diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml index 845a334a3..1e384aa09 100644 --- a/openjpa-all/pom.xml +++ b/openjpa-all/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-all @@ -91,7 +91,7 @@ @@ -139,8 +139,8 @@ - org.apache.geronimo.specs - geronimo-validation_1.1_spec + jakarta.validation + jakarta.validation-api org.apache.bval diff --git a/openjpa-examples/image-gallery/pom.xml b/openjpa-examples/image-gallery/pom.xml index 02fd5c10d..624c23c0d 100644 --- a/openjpa-examples/image-gallery/pom.xml +++ b/openjpa-examples/image-gallery/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-examples - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT org.apache.openjpa.openjpa-examples @@ -38,7 +38,6 @@ Apache OpenJPA Examples - image-gallery - 256m 1024m -Xmx${test.jvm.maxheapsize} ${test.jvm.arguments} diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/TestJPAValidation.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/TestJPAValidation.java index 735f38e3f..4525843c6 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/TestJPAValidation.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/TestJPAValidation.java @@ -21,11 +21,11 @@ package org.apache.openjpa.example.gallery; 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; diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java index 2605fda13..5893ce74a 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java @@ -27,8 +27,8 @@ import java.lang.annotation.Documented; 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; diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java index fb663a981..cc24b7804 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java @@ -28,8 +28,8 @@ import java.lang.annotation.Documented; 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; diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java index 16eabc558..85e92afbd 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java @@ -21,8 +21,8 @@ package org.apache.openjpa.example.gallery.constraint; 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; diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java index 7424dddd5..fa871ad8a 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java @@ -21,8 +21,8 @@ package org.apache.openjpa.example.gallery.constraint; 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; diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/SequencedImageGroup.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/SequencedImageGroup.java index bcd78be65..479e527ef 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/SequencedImageGroup.java +++ b/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 diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java index 89e977e70..fe724873a 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java @@ -20,12 +20,12 @@ package org.apache.openjpa.example.gallery.model; 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 diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Creator.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Creator.java index 414fb129c..25bdaac5c 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Creator.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Creator.java @@ -20,13 +20,13 @@ package org.apache.openjpa.example.gallery.model; 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 diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Image.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Image.java index c62aebac9..8977f742d 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Image.java +++ b/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; diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Location.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Location.java index f1984e79d..71ffb13b5 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Location.java +++ b/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. 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 b13b10bc7..8fc025517 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 @@ -47,11 +47,11 @@ - - - diff --git a/openjpa-examples/jest/src/main/java/demo/Actor.java b/openjpa-examples/jest/src/main/java/demo/Actor.java index 54a9966ba..a7cf18f9a 100644 --- a/openjpa-examples/jest/src/main/java/demo/Actor.java +++ b/openjpa-examples/jest/src/main/java/demo/Actor.java @@ -23,10 +23,10 @@ import java.util.Date; 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; diff --git a/openjpa-examples/jest/src/main/java/demo/DataLoader.java b/openjpa-examples/jest/src/main/java/demo/DataLoader.java index de30d81f4..e04ea1a7d 100644 --- a/openjpa-examples/jest/src/main/java/demo/DataLoader.java +++ b/openjpa-examples/jest/src/main/java/demo/DataLoader.java @@ -21,7 +21,7 @@ package demo; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Loads some example Actor-Movie data. diff --git a/openjpa-examples/jest/src/main/java/demo/Movie.java b/openjpa-examples/jest/src/main/java/demo/Movie.java index cc0584cbf..0923533f6 100644 --- a/openjpa-examples/jest/src/main/java/demo/Movie.java +++ b/openjpa-examples/jest/src/main/java/demo/Movie.java @@ -22,10 +22,10 @@ package demo; 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; diff --git a/openjpa-examples/jest/src/main/java/demo/SimpleApp.java b/openjpa-examples/jest/src/main/java/demo/SimpleApp.java index 2d9f3de59..65511f87c 100644 --- a/openjpa-examples/jest/src/main/java/demo/SimpleApp.java +++ b/openjpa-examples/jest/src/main/java/demo/SimpleApp.java @@ -30,9 +30,9 @@ import java.util.List; 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; diff --git a/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml b/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml index a56118075..b45bc3372 100644 --- a/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml +++ b/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml @@ -27,10 +27,10 @@ demo.Actor - - - - + + + + diff --git a/openjpa-examples/openbooks/index.html b/openjpa-examples/openbooks/index.html index b85b600bf..11ee2ece7 100644 --- a/openjpa-examples/openbooks/index.html +++ b/openjpa-examples/openbooks/index.html @@ -119,8 +119,8 @@ font-size:16px;
  1. Edit persistence.xml located in resources/META-INF directory. - Modify the javax.persistence.jdbc.driver - and javax.persistence.jdbc.url property to suit your local database and its driver. + Modify the jakarta.persistence.jdbc.driver + and jakarta.persistencejdbc.url property to suit your local database and its driver.
    The example persistence.xml provided is primarily for a JSE environment. In JEE environment, you may already have a JTA data source configured and registered in JNDI. diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml index bbd1a501e..770cf061d 100644 --- a/openjpa-examples/openbooks/pom.xml +++ b/openjpa-examples/openbooks/pom.xml @@ -29,7 +29,7 @@ org.apache.openjpa openjpa-examples - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT org.apache.openjpa.openjpa-examples diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java index 3fd5bf400..8eb9b4a93 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java @@ -17,7 +17,7 @@ import java.awt.Color; import java.awt.GridLayout; import java.awt.image.BufferedImage; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JComponent; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java index 8c131f7b9..bd22aa505 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java @@ -15,7 +15,7 @@ package jpa.tools.swing; import java.awt.Color; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import javax.swing.JLabel; /** diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java index 927b85cbb..0b2ba3ed9 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java @@ -20,11 +20,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java index 3434ce431..6723f3d14 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java @@ -18,9 +18,9 @@ import java.awt.Component; import java.awt.Dimension; import java.util.List; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.metamodel.Attribute; import javax.swing.DefaultCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java index 3f499ab90..580d3e802 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java @@ -18,10 +18,10 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JPanel; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java index 14ff81e7a..f8a6f34d3 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java @@ -19,8 +19,8 @@ import java.awt.GridLayout; import java.awt.Point; import java.util.List; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java index 62005bc11..c9e868168 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java @@ -15,8 +15,8 @@ package jpa.tools.swing; import java.util.List; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; import javax.swing.table.AbstractTableModel; public class InstanceDataModel extends AbstractTableModel { diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java index 906e4dd87..556204189 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java @@ -13,7 +13,7 @@ */ package jpa.tools.swing; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import javax.swing.JTable; public class InstanceView extends JTable { diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java index 39b401665..254e3ddf3 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java @@ -25,12 +25,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; /** * Static utility for analyzing persistent metadata model using JPA 2.0. diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java index f29576b0b..14d47bbaf 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java @@ -24,10 +24,10 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.SingularAttribute; import javax.swing.JPanel; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryDecorator.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryDecorator.java index bf0165b8b..76004d576 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryDecorator.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryDecorator.java @@ -13,7 +13,7 @@ */ package jpa.tools.swing; -import javax.persistence.Query; +import jakarta.persistence.Query; /** * Decorates an executable query. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java index b685c07dd..769e30311 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java @@ -17,11 +17,11 @@ package openbook.domain; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; /** * A persistent entity to represent an author of one or more Book. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java index 78c653140..6d2508f2c 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java @@ -18,13 +18,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; /** * diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java index 2e24083dd..1ee261301 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java @@ -16,10 +16,10 @@ package openbook.domain; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * A persistent entity represents a Customer. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java index f60149693..209856eac 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java @@ -16,11 +16,11 @@ package openbook.domain; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; /** * A mutable persistent entity. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java index 7dd791c80..283c4ece7 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java @@ -16,13 +16,13 @@ package openbook.domain; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; /** * An immutable persistent entity with complex primary key. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java index 3c59f784c..5c1d9af34 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java @@ -21,15 +21,15 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * A persistent entity to demonstrate Master in a Master-Details or Composite pattern for diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java index 06d9a8f5a..bc4cb4819 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java @@ -16,7 +16,7 @@ package openbook.server; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import openbook.domain.Book; import openbook.domain.Customer; diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java index 75c42656b..3549a867e 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java @@ -19,17 +19,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContextType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceContextType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder; diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java b/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java index 6317b099f..6b3a6a613 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java @@ -16,9 +16,9 @@ package openbook.server; import java.io.Serializable; import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContextType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceContextType; /** * An abstract utility for JPA based service. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/QueryDecorator.java b/openjpa-examples/openbooks/src/main/java/openbook/server/QueryDecorator.java index 3f41af710..248a9eca3 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/QueryDecorator.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/QueryDecorator.java @@ -13,7 +13,7 @@ */ package openbook.server; -import javax.persistence.Query; +import jakarta.persistence.Query; /** * Decorates an executable query. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/QueryParameterBinder.java b/openjpa-examples/openbooks/src/main/java/openbook/server/QueryParameterBinder.java index 8baf188f1..8558d7a12 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/QueryParameterBinder.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/QueryParameterBinder.java @@ -13,7 +13,7 @@ */ package openbook.server; -import javax.persistence.Query; +import jakarta.persistence.Query; /** * Decorates a query by binding parameters. diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java b/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java index 6000b8260..21028a0df 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java @@ -16,9 +16,9 @@ package openbook.server; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceContextType; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceContextType; /** * A container of persistence units. Typically a JEE container will create, manage and inject diff --git a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml index c7a6ddd3b..8df0b4779 100644 --- a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml +++ b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml @@ -36,17 +36,17 @@ - - - - + + + + diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingServiceAdapter.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingServiceAdapter.java index 471a06ceb..c7b0a9d5e 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingServiceAdapter.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingServiceAdapter.java @@ -41,7 +41,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; *
  2. a) the delegator adds RuntimeException to each of the original service methods. * The original {@link TradingService} has not defined the exception in its method signature, * However, the actual implementation of {@link TradingService} is based on - * JPA and hence will throw javax.persistence.PersistenceException. To propagate + * JPA and hence will throw jakarta.persistence.PersistenceException. To propagate * these exceptions to the client, these exceptions need to be translated for serialization by * GWT compiler and will bring in heavier dependency. *
    @@ -51,7 +51,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; * com.google.gwt.user.client.rpc.RemoteService. But the discipline used for this * application dictates that the service interface be independent of either * how it is implemented or how it will be accessed. That is why original {@link TradingService} - * definition neither depends on javax.persistence.* nor on com.google.gwt.*. + * definition neither depends on jakarta.persistence.* nor on com.google.gwt.*. *

    * Because the interface is delegated, it is not necessary to have the same method name or * even signature. It may not have to declare all the original service interface methods either. diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java index eab8c6264..af2b3af60 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.trader.domain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * An offer to sell a financial instrument. diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java index 752b85039..cc816c6fb 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.trader.domain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * An offer to buy a financial instrument. * The only mutable state of an offer is its expiration. diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java index efe67d83d..157ad7475 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java @@ -20,9 +20,9 @@ package org.apache.openjpa.trader.domain; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * A stock is a typical financial instrument that is bought and sold by {@linkplain Trader}. diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java index b9c10692a..8dc53ac96 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java @@ -20,15 +20,15 @@ package org.apache.openjpa.trader.domain; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; /** * An abstract root for domain objects in OpenTrader designates a {@link Stock financial instrument} diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java index 0a2e10a8e..9b83a4e27 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java @@ -20,12 +20,12 @@ package org.apache.openjpa.trader.domain; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Trade implements Serializable { diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java index a2aad6b0c..4d12cf0ad 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java @@ -20,11 +20,11 @@ package org.apache.openjpa.trader.domain; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; @Entity @Table(name="TRADER", diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java index 5ea3cde59..c496c8499 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContextType; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContextType; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.lib.log.LogFactory; import org.apache.openjpa.trader.domain.Ask; diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/MarketFeed.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/MarketFeed.java index 1f375b0eb..3d0bdc878 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/MarketFeed.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/MarketFeed.java @@ -23,7 +23,7 @@ import java.util.Random; import java.util.Timer; import java.util.TimerTask; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.trader.domain.Stock; diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java index 5f44e3447..7a2f0fa60 100644 --- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java +++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java @@ -23,10 +23,10 @@ import java.util.Map; import java.util.Observable; import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceContextType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceContextType; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml index 88c9a6c17..4ff524dda 100644 --- a/openjpa-examples/pom.xml +++ b/openjpa-examples/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-examples diff --git a/openjpa-examples/simple/pom.xml b/openjpa-examples/simple/pom.xml index 03475dee1..db215c0ed 100644 --- a/openjpa-examples/simple/pom.xml +++ b/openjpa-examples/simple/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-examples - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT org.apache.openjpa.openjpa-examples diff --git a/openjpa-examples/simple/src/main/java/embeddables/Address.java b/openjpa-examples/simple/src/main/java/embeddables/Address.java index 230ce7b1b..670d85bdd 100644 --- a/openjpa-examples/simple/src/main/java/embeddables/Address.java +++ b/openjpa-examples/simple/src/main/java/embeddables/Address.java @@ -18,10 +18,10 @@ */ package embeddables; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class Address { diff --git a/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java b/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java index f49f78ec7..9bf5a57aa 100644 --- a/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java +++ b/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java @@ -18,8 +18,8 @@ */ package embeddables; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class ContactInfo { diff --git a/openjpa-examples/simple/src/main/java/embeddables/Coordinates.java b/openjpa-examples/simple/src/main/java/embeddables/Coordinates.java index 526304a26..594853d29 100644 --- a/openjpa-examples/simple/src/main/java/embeddables/Coordinates.java +++ b/openjpa-examples/simple/src/main/java/embeddables/Coordinates.java @@ -18,11 +18,11 @@ */ package embeddables; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class Coordinates { diff --git a/openjpa-examples/simple/src/main/java/embeddables/Main.java b/openjpa-examples/simple/src/main/java/embeddables/Main.java index 2901566c5..0e5ce6c2b 100644 --- a/openjpa-examples/simple/src/main/java/embeddables/Main.java +++ b/openjpa-examples/simple/src/main/java/embeddables/Main.java @@ -20,10 +20,10 @@ package embeddables; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; public class Main { diff --git a/openjpa-examples/simple/src/main/java/embeddables/Phone.java b/openjpa-examples/simple/src/main/java/embeddables/Phone.java index b64a1b1b9..6c2b4210a 100644 --- a/openjpa-examples/simple/src/main/java/embeddables/Phone.java +++ b/openjpa-examples/simple/src/main/java/embeddables/Phone.java @@ -18,8 +18,8 @@ */ package embeddables; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; @Embeddable public class Phone { diff --git a/openjpa-examples/simple/src/main/java/embeddables/User.java b/openjpa-examples/simple/src/main/java/embeddables/User.java index f752a75ec..7abf66e0a 100644 --- a/openjpa-examples/simple/src/main/java/embeddables/User.java +++ b/openjpa-examples/simple/src/main/java/embeddables/User.java @@ -21,15 +21,15 @@ package embeddables; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity // User is a reserved keyword for derby, so use a different table name. diff --git a/openjpa-examples/simple/src/main/java/hellojpa/Main.java b/openjpa-examples/simple/src/main/java/hellojpa/Main.java index 15161eb58..55a686d83 100644 --- a/openjpa-examples/simple/src/main/java/hellojpa/Main.java +++ b/openjpa-examples/simple/src/main/java/hellojpa/Main.java @@ -20,10 +20,10 @@ package hellojpa; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; /** diff --git a/openjpa-examples/simple/src/main/java/hellojpa/Message.java b/openjpa-examples/simple/src/main/java/hellojpa/Message.java index bb3d4af79..c6e2d868e 100644 --- a/openjpa-examples/simple/src/main/java/hellojpa/Message.java +++ b/openjpa-examples/simple/src/main/java/hellojpa/Message.java @@ -20,9 +20,9 @@ package hellojpa; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** diff --git a/openjpa-examples/simple/src/main/java/mapping/BuildSchemaPC.java b/openjpa-examples/simple/src/main/java/mapping/BuildSchemaPC.java index b6763e97b..90de9cdcb 100644 --- a/openjpa-examples/simple/src/main/java/mapping/BuildSchemaPC.java +++ b/openjpa-examples/simple/src/main/java/mapping/BuildSchemaPC.java @@ -18,12 +18,12 @@ */ package mapping; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** *

    Persistent type used in testing the mappingtool's buildSchema action diff --git a/openjpa-examples/simple/src/main/java/mapping/BuildUTF8SchemaPC.java b/openjpa-examples/simple/src/main/java/mapping/BuildUTF8SchemaPC.java index 42e3dddc0..97dc93f2b 100644 --- a/openjpa-examples/simple/src/main/java/mapping/BuildUTF8SchemaPC.java +++ b/openjpa-examples/simple/src/main/java/mapping/BuildUTF8SchemaPC.java @@ -18,12 +18,12 @@ */ package mapping; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** *

    Persistent type used in testing the mappingtool's buildSchema action diff --git a/openjpa-examples/simple/src/main/java/relations/Deity.java b/openjpa-examples/simple/src/main/java/relations/Deity.java index 721243d09..f43fe3487 100644 --- a/openjpa-examples/simple/src/main/java/relations/Deity.java +++ b/openjpa-examples/simple/src/main/java/relations/Deity.java @@ -22,16 +22,16 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; /** diff --git a/openjpa-examples/simple/src/main/java/relations/Main.java b/openjpa-examples/simple/src/main/java/relations/Main.java index fec2df094..a228785f3 100644 --- a/openjpa-examples/simple/src/main/java/relations/Main.java +++ b/openjpa-examples/simple/src/main/java/relations/Main.java @@ -24,10 +24,10 @@ import static relations.Deity.Gender.MALE; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; /** diff --git a/openjpa-examples/simple/src/main/java/reversemapping/Main.java b/openjpa-examples/simple/src/main/java/reversemapping/Main.java index c6f5d98bf..23609a7eb 100644 --- a/openjpa-examples/simple/src/main/java/reversemapping/Main.java +++ b/openjpa-examples/simple/src/main/java/reversemapping/Main.java @@ -20,7 +20,7 @@ package reversemapping; import java.text.*; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; /** diff --git a/openjpa-features/pom.xml b/openjpa-features/pom.xml index 2fff3f440..d11b45575 100644 --- a/openjpa-features/pom.xml +++ b/openjpa-features/pom.xml @@ -18,7 +18,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-features diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml index fa9834d82..24c73a2b0 100644 --- a/openjpa-features/src/main/feature/feature.xml +++ b/openjpa-features/src/main/feature/feature.xml @@ -21,7 +21,7 @@

    Apache OpenJPA persistence engine
    mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 - mvn:org.eclipse.persistence/javax.persistence/2.1.0 + mvn:org.eclipse.persistence/jakarta.persistence/2.1.0 mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1 mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1 mvn:org.apache.commons/commons-pool2/${pool2.version} @@ -30,7 +30,7 @@ mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.version} mvn:org.apache.openjpa/openjpa/${project.version} - osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl + osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml index 730e98145..eb8a7c3b0 100644 --- a/openjpa-integration/daytrader/pom.xml +++ b/openjpa-integration/daytrader/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-integration - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration-daytrader diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java index 35480b368..c368349ed 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java @@ -22,22 +22,22 @@ import java.sql.Timestamp; import java.util.Collection; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; @Entity(name = "accountejb") @Table(name = "accountejb") diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java index 8b8c8ef48..ca979c160 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java @@ -16,14 +16,14 @@ */ package org.apache.openjpa.integration.daytrader; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity(name = "accountprofileejb") @Table(name = "accountprofileejb") diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java index f10d1ef0f..488f53ab3 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java @@ -20,21 +20,21 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; // import org.apache.geronimo.samples.daytrader.util.Log; // import org.apache.geronimo.samples.daytrader.util.TradeConfig; diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java index 4e98d34b7..161df2f0e 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java @@ -20,22 +20,22 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; // import org.apache.geronimo.samples.daytrader.util.Log; // import org.apache.geronimo.samples.daytrader.util.TradeConfig; diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java index d2567d24b..d2fa9cdd2 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java @@ -19,14 +19,14 @@ package org.apache.openjpa.integration.daytrader; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; // import org.apache.geronimo.samples.daytrader.util.Log; // import org.apache.geronimo.samples.daytrader.util.TradeConfig; diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java index 59aa821d9..2c0667d9c 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java @@ -21,9 +21,9 @@ package org.apache.openjpa.integration.daytrader; import java.util.HashMap; import java.util.Map; -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 org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.LogFactoryImpl; diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java index d0593660e..c2609bdbe 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java index 233e8ea54..7ce563e9c 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java @@ -22,10 +22,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.Query; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml index 39ab6b5c6..d5e45d9de 100644 --- a/openjpa-integration/examples/pom.xml +++ b/openjpa-integration/examples/pom.xml @@ -37,7 +37,7 @@ org.apache.openjpa openjpa-integration - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration-examples diff --git a/openjpa-integration/jmx/pom.xml b/openjpa-integration/jmx/pom.xml index 169aba817..b82bf9dd0 100644 --- a/openjpa-integration/jmx/pom.xml +++ b/openjpa-integration/jmx/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-integration - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration-jmx diff --git a/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java b/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java index 5edb0036b..4baf3f613 100644 --- a/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java +++ b/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.integration.jmx; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="INT_CACHED_ENT") diff --git a/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java b/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java index 512120210..d885659e8 100644 --- a/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java +++ b/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java @@ -31,7 +31,7 @@ import java.util.concurrent.Future; import javax.management.JMX; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.instrumentation.DataCacheInstrument; import org.apache.openjpa.instrumentation.InstrumentationManager; diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml index 3a270bf9d..04ea6276e 100644 --- a/openjpa-integration/pom.xml +++ b/openjpa-integration/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml index 50c3df043..00f4e747a 100644 --- a/openjpa-integration/slf4j/pom.xml +++ b/openjpa-integration/slf4j/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-integration - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration-slf4j diff --git a/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java b/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java index fb817ceec..8796b4a43 100644 --- a/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java +++ b/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.integration.slf4j; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.SLF4JLogFactory; diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml index cdcd268d6..d50e4b447 100644 --- a/openjpa-integration/tck/pom.xml +++ b/openjpa-integration/tck/pom.xml @@ -78,7 +78,7 @@ org.apache.openjpa openjpa-integration - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration-tck @@ -290,7 +290,7 @@ -javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl +jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl openjpa.ConnectionDriverName: ${db.driver} openjpa.ConnectionURL: ${db.url} openjpa.ConnectionUserName: ${db.username} diff --git a/openjpa-integration/tck/tck2-20091209.xml b/openjpa-integration/tck/tck2-20091209.xml index 73897036b..1b5d9fe01 100644 --- a/openjpa-integration/tck/tck2-20091209.xml +++ b/openjpa-integration/tck/tck2-20091209.xml @@ -103,7 +103,7 @@ -javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl +jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl openjpa.ConnectionDriverName: ${db.driver} openjpa.ConnectionURL: ${db.url} openjpa.ConnectionUserName: ${db.username} diff --git a/openjpa-integration/tck/tck2-20101205.xml b/openjpa-integration/tck/tck2-20101205.xml index 912a30be3..5b1c45858 100644 --- a/openjpa-integration/tck/tck2-20101205.xml +++ b/openjpa-integration/tck/tck2-20101205.xml @@ -108,7 +108,7 @@ -javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl +jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl openjpa.ConnectionDriverName: ${db.driver} openjpa.ConnectionURL: ${db.url} openjpa.ConnectionUserName: ${db.username} diff --git a/openjpa-integration/tck/tck2-20110815.xml b/openjpa-integration/tck/tck2-20110815.xml index 0763973d6..cc790a258 100644 --- a/openjpa-integration/tck/tck2-20110815.xml +++ b/openjpa-integration/tck/tck2-20110815.xml @@ -107,7 +107,7 @@ -javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl +jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl openjpa.ConnectionDriverName: ${db.driver} openjpa.ConnectionURL: ${db.url} openjpa.ConnectionUserName: ${db.username} @@ -153,10 +153,10 @@ toplink.properties=${toplink.properties} # actually work for a given environment. sigTestClasspath=${javart.property}${path.separator}${cp.property} persistence.unit.properties.file.full.path=${provider.properties} -javax.persistence.jdbc.driver: ${db.driver} -javax.persistence.jdbc.url: ${db.url} -javax.persistence.jdbc.user: ${db.username} -javax.persistence.jdbc.password: ${db.password} +jakarta.persistence.jdbc.driver: ${db.driver} +jakarta.persistence.jdbc.url: ${db.url} +jakarta.persistence.jdbc.user: ${db.username} +jakarta.persistence.jdbc.password: ${db.password} database.driver=${db.driver} database.url=${db.url} database.user=${db.username} diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml index 132d939e4..1ddfa27a1 100644 --- a/openjpa-integration/validation/pom.xml +++ b/openjpa-integration/validation/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-integration - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-integration-validation diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java index 9c291a638..fb451f095 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java @@ -20,8 +20,8 @@ package org.apache.openjpa.integration.persistence.provider; import java.util.List; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; public class DummyPersistenceProviderResolver implements PersistenceProviderResolver { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java index 03b073b59..952951009 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java @@ -20,10 +20,10 @@ package org.apache.openjpa.integration.persistence.provider; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; public class DummyProvider1 implements PersistenceProvider { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java index 5a9bbde2b..3068683fe 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java @@ -20,10 +20,10 @@ package org.apache.openjpa.integration.persistence.provider; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; public class DummyProvider2 implements PersistenceProvider { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java index b24251605..4db392852 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; -import javax.persistence.spi.PersistenceProviderResolverHolder; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProviderResolverHolder; import org.apache.openjpa.lib.util.J2DoPrivHelper; @@ -170,7 +170,7 @@ public class TestPersistenceProviderResolver extends TestCase { + "services"); servicesDir.mkdirs(); assertTrue(servicesDir.exists()); - persistenceProviderFile = new File(servicesDir, "javax.persistence.spi.PersistenceProvider"); + persistenceProviderFile = new File(servicesDir, "jakarta.persistence.spi.PersistenceProvider"); if (persistenceProviderFile.exists()) { persistenceProviderFile.delete(); } @@ -201,7 +201,7 @@ public class TestPersistenceProviderResolver extends TestCase { out.putNextEntry(new JarEntry("META-INF/")); out.putNextEntry(new JarEntry("META-INF/services/")); - out.putNextEntry(new JarEntry("META-INF/services/javax.persistence.spi.PersistenceProvider")); + out.putNextEntry(new JarEntry("META-INF/services/jakarta.persistence.spi.PersistenceProvider")); //write the file to the jar byte[] buf = new byte[1024]; int i; diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java index 05a824812..ac0bcb22a 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java @@ -20,15 +20,15 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Transient; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; @Entity(name="VAddress") @Inheritance(strategy=InheritanceType.SINGLE_TABLE) diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java index e9e7d5c60..59835449b 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.validation.Valid; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; @Entity(name="Vbook") public class Book { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java index b844b87bf..c81cca739 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java @@ -20,14 +20,14 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.AssertFalse; -import javax.validation.constraints.AssertTrue; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.AssertFalse; +import jakarta.validation.constraints.AssertTrue; @Entity(name = "VBOOLEAN") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDates.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDates.java index c7e705168..cdbc34921 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDates.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDates.java @@ -23,14 +23,14 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Future; -import javax.validation.constraints.Past; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Future; +import jakarta.validation.constraints.Past; @Entity(name = "VDATES") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java index 44233dbdb..6f0e4f521 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java @@ -21,14 +21,14 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.DecimalMin; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; @Entity(name = "VDECIMAL") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDigits.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDigits.java index 7e108e23d..239b5a8f1 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDigits.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDigits.java @@ -21,13 +21,13 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Digits; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Digits; @Entity(name = "VDIGITS") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java index 5cf483773..39bf74e85 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java @@ -20,14 +20,14 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Null; @Entity(name = "VNULL") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java index 0bddb87f2..60a5de1c7 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java @@ -20,14 +20,14 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; @Entity(name = "VNUMBER") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintPattern.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintPattern.java index b4eb11ca1..51f59fb04 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintPattern.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintPattern.java @@ -20,13 +20,13 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Pattern; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Pattern; @Entity(name = "VPATTERN") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java index bfc939673..1d006ff19 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java @@ -22,13 +22,13 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Size; @Entity(name = "VSIZE") diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java index 4095486eb..b694c43db 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java @@ -20,10 +20,10 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; @Entity(name="VCustomer") public class Customer extends Person implements ICustomer, Serializable { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/DefGrpEntity.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/DefGrpEntity.java index d3f93aae1..c46226088 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/DefGrpEntity.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/DefGrpEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; @Entity public class DefGrpEntity { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java index fbd8f44a5..12c48106a 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.integration.validation; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public interface IAddress { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java index 8ce3d137b..465ee713a 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.integration.validation; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public interface IPerson { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java index c5441ef44..3ad135b6e 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * Image entity which makes use of several BV constraints. diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java index db1c4dd6c..51ba78875 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java @@ -19,11 +19,11 @@ package org.apache.openjpa.integration.validation; -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. diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/MixedGrpEntity.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/MixedGrpEntity.java index f6241f0a8..3aa480775 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/MixedGrpEntity.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/MixedGrpEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; @Entity public class MixedGrpEntity { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java index 31d47f73c..4416f8326 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; @Entity public class NonDefGrpEntity { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java index f594127ef..dfd249990 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java @@ -20,17 +20,17 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Transient; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; @Entity(name="VPerson") @Inheritance(strategy=InheritanceType.SINGLE_TABLE) diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Publisher.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Publisher.java index 4ea0afdb8..1fe22d24f 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Publisher.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Publisher.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.Size; @Embeddable public class Publisher { diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java index 91a556b1b..68f5d9b77 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java @@ -20,19 +20,19 @@ package org.apache.openjpa.integration.validation; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @NamedQueries( { @NamedQuery(name="FindOne", diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java index 3542f719b..2425bef84 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java @@ -22,10 +22,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -40,7 +40,7 @@ public class TestConstraintViolation extends AbstractPersistenceTestCase { @Override public void setUp() { Map props = new HashMap<>(); - props.put("javax.persistence.validation.group.pre-remove", "javax.validation.groups.Default"); + props.put("jakarta.persistence.validation.group.pre-remove", "jakarta.validation.groups.Default"); // This test case uses a different persistence xml file because validation require 2.0 xsd. emf2 = OpenJPAPersistence.createEntityManagerFactory("ConstraintViolationTestPU", diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java index 0c5d541c2..2cb54b5f4 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java @@ -20,9 +20,9 @@ package org.apache.openjpa.integration.validation; import java.util.Set; -import javax.persistence.Query; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.Query; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMappedSuper.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMappedSuper.java index 1bfb50283..b72424922 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMappedSuper.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMappedSuper.java @@ -21,8 +21,8 @@ package org.apache.openjpa.integration.validation; import java.util.Iterator; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMerge.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMerge.java index 81a493867..f83dbad3d 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMerge.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestMerge.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.integration.validation; -import javax.persistence.EntityManager; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.EntityManager; +import jakarta.validation.ConstraintViolationException; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java index c1b36cce1..6d34e0eeb 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java @@ -25,9 +25,9 @@ import java.security.AccessController; import java.util.HashMap; import java.util.Map; -import javax.validation.ConstraintViolationException; -import javax.validation.Path; -import javax.validation.TraversableResolver; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Path; +import jakarta.validation.TraversableResolver; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.J2DoPrivHelper; diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java index d883499ca..1724f7442 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java @@ -21,10 +21,10 @@ package org.apache.openjpa.integration.validation; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.ValidationMode; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ValidationMode; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManager; @@ -149,7 +149,7 @@ public class TestValidatingLEM extends SingleEMFTestCase { // create the Map to test overrides // Just use current class object, as we have no provider to test with Map props = new HashMap<>(); - props.put("javax.persistence.validation.mode", + props.put("jakarta.persistence.validation.mode", String.valueOf(ValidationMode.CALLBACK)); // create our EMF w/ props OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI) @@ -192,13 +192,13 @@ public class TestValidatingLEM extends SingleEMFTestCase { ValidatorFactory factory = null; try { factory = Validation.buildDefaultValidatorFactory(); - } catch (javax.validation.ValidationException e) { + } catch (jakarta.validation.ValidationException e) { fail("testValidatingLEM4() - no validation providers found" + e); } assertNotNull(factory); // create the Map to test overrides Map props = new HashMap<>(); - props.put("javax.persistence.validation.factory", factory); + props.put("jakarta.persistence.validation.factory", factory); // create our EMF w/ props OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.createEntityManagerFactory( diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java index f4994418f..fd2ceacd2 100644 --- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java +++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.persistence.OpenJPAEntityManager; @@ -324,14 +324,14 @@ public class TestValidationGroups extends AbstractPersistenceTestCase { // Configure persistence properties via map Map propMap = new HashMap<>(); - propMap.put("javax.persistence.validation.group.pre-persist", + propMap.put("jakarta.persistence.validation.group.pre-persist", "org.apache.openjpa.integration.validation.ValGroup1," + "org.apache.openjpa.integration.validation.ValGroup2"); - propMap.put("javax.persistence.validation.group.pre-update", + propMap.put("jakarta.persistence.validation.group.pre-update", ""); - propMap.put("javax.persistence.validation.group.pre-remove", + propMap.put("jakarta.persistence.validation.group.pre-remove", "org.apache.openjpa.integration.validation.ValGroup2"); OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI) @@ -442,9 +442,9 @@ public class TestValidationGroups extends AbstractPersistenceTestCase { // Configure persistence properties via map Map propMap = new HashMap<>(); - propMap.put("javax.persistence.validation.group.pre-persist",""); + propMap.put("jakarta.persistence.validation.group.pre-persist",""); - propMap.put("javax.persistence.validation.group.pre-update",""); + propMap.put("jakarta.persistence.validation.group.pre-update",""); OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.createEntityManagerFactory( @@ -750,7 +750,7 @@ public class TestValidationGroups extends AbstractPersistenceTestCase { /** * verify validation occurs when the default validation group * is specified for the PreRemove lifecycle event via the - * "javax.persistence.validation.group.pre-remove" property. + * "jakarta.persistence.validation.group.pre-remove" property. */ public void verifySpecifiedDefaultPreRemove(boolean flush) { OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI) 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 b4ac51df1..dd760f8f0 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 @@ -95,7 +95,7 @@ - @@ -106,7 +106,7 @@ - @@ -117,7 +117,7 @@ - @@ -128,11 +128,11 @@ - - - @@ -154,12 +154,12 @@ - - - diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index e7027ff3e..b4a17b1c8 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-jdbc diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java index 51ca96251..fa08accda 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java @@ -26,7 +26,7 @@ import java.sql.SQLException; import java.sql.Types; import java.util.concurrent.ConcurrentHashMap; -import javax.transaction.NotSupportedException; +import jakarta.transaction.NotSupportedException; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java index e92907fcc..8776d3526 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java @@ -2276,7 +2276,7 @@ public class ReverseMappingTool @Override public Set getImportPackages() { Set pkgs = super.getImportPackages(); - pkgs.add("javax.persistence"); + pkgs.add("jakarta.persistence"); return pkgs; } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java index d788add9e..3aa56176a 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java @@ -205,7 +205,7 @@ public class DataSourceFactory { new ConfiguringConnectionDecorator(); ccd.setTransactionIsolation(conf.getTransactionIsolationConstant()); - //OPENJPA-2517: Allow a javax.persistence.query.timeout to apply to all + //OPENJPA-2517: Allow a jakarta.persistence.query.timeout to apply to all //EM operations (not just Query operations). Convert from milliseconds //to seconds. See DBDictionary.setQueryTimeout for similar conversions. //DBDictionary.setQueryTimeout will log warnings for invalid values, diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java index 7deaea7c9..eb087b666 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java @@ -187,7 +187,7 @@ public class OracleDictionary log.warn("Both 'supportsAutoAssign' and 'useTriggersForAutoAssign' were specified, such configuration will never work," + " please use 'supportsAutoAssign'"); } - // support auto increment columns javax.persistence.GenerationType#IDENTITY + // support auto increment columns jakarta.persistence.GenerationType#IDENTITY supportsAutoAssign = true; autoAssignClause = "GENERATED ALWAYS AS IDENTITY"; diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties index c75794e0b..31a08151c 100644 --- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties +++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties @@ -20,7 +20,7 @@ bad-join: The following error was detected when creating a foreign key: \ no-driver: The persistence provider is attempting to use properties in the \ persistence.xml file to resolve the data source. A Java Database Connectivity \ (JDBC) driver or data source class name must be specified in the \ - openjpa.ConnectionDriverName or javax.persistence.jdbc.driver property. \ + openjpa.ConnectionDriverName or jakarta.persistence.jdbc.driver property. \ The following properties are available in the configuration: "{0}". bad-driver: The specified driver "{0}" is neither a java.sql.Driver \ nor a javax.sql.DataSource class name. diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml index 5cc39e4fa..b2e3732fb 100644 --- a/openjpa-jest/pom.xml +++ b/openjpa-jest/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-jest @@ -42,8 +42,9 @@ ${project.version} - org.apache.geronimo.specs - geronimo-jpa_2.2_spec + jakarta.persistence + jakarta.persistence-api + provided org.apache.openjpa diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java index e99adfaaf..58e626216 100644 --- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java +++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jest; import java.io.IOException; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java index 9a0266173..5a50d0ade 100644 --- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java +++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java @@ -37,8 +37,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Metamodel; import org.apache.openjpa.json.JSON; import org.apache.openjpa.json.JSONObject; diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java index b48b9649b..3db86e18e 100644 --- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java +++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java @@ -24,12 +24,12 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.meta.JavaTypes; diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java index f1209f8f4..891d4bef7 100644 --- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java +++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java @@ -24,7 +24,7 @@ import java.io.OutputStream; import java.text.SimpleDateFormat; import java.util.Collection; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.Metamodel; import javax.servlet.http.HttpServletResponse; import org.apache.openjpa.kernel.OpenJPAStateManager; diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java index 64b3ddcd9..748b22790 100644 --- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java +++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java index 21aa4a2c1..6cce9739f 100644 --- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java +++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java @@ -58,11 +58,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.PluralAttribute; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/openjpa-jest/src/main/resources/org/apache/openjpa/persistence/jest/jest-instance.xsd b/openjpa-jest/src/main/resources/org/apache/openjpa/persistence/jest/jest-instance.xsd index 1e28443f4..323a764cc 100644 --- a/openjpa-jest/src/main/resources/org/apache/openjpa/persistence/jest/jest-instance.xsd +++ b/openjpa-jest/src/main/resources/org/apache/openjpa/persistence/jest/jest-instance.xsd @@ -43,7 +43,7 @@ - + diff --git a/openjpa-jest/src/test/java/demo/Actor.java b/openjpa-jest/src/test/java/demo/Actor.java index df6c8f2c9..6a7c3c33d 100644 --- a/openjpa-jest/src/test/java/demo/Actor.java +++ b/openjpa-jest/src/test/java/demo/Actor.java @@ -23,10 +23,10 @@ import java.util.Date; 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; diff --git a/openjpa-jest/src/test/java/demo/DataLoader.java b/openjpa-jest/src/test/java/demo/DataLoader.java index bc011aff6..b530a0949 100644 --- a/openjpa-jest/src/test/java/demo/DataLoader.java +++ b/openjpa-jest/src/test/java/demo/DataLoader.java @@ -21,7 +21,7 @@ package demo; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Loads some example Actor-Movie data. diff --git a/openjpa-jest/src/test/java/demo/Movie.java b/openjpa-jest/src/test/java/demo/Movie.java index be6f0ff53..e080a34a3 100644 --- a/openjpa-jest/src/test/java/demo/Movie.java +++ b/openjpa-jest/src/test/java/demo/Movie.java @@ -22,10 +22,10 @@ package demo; 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; diff --git a/openjpa-junit5/pom.xml b/openjpa-junit5/pom.xml index 5e5dcdf80..13ab74fdf 100644 --- a/openjpa-junit5/pom.xml +++ b/openjpa-junit5/pom.xml @@ -24,7 +24,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-junit5 @@ -34,8 +34,8 @@ - org.apache.geronimo.specs - geronimo-jpa_2.2_spec + jakarta.persistence + jakarta.persistence-api provided diff --git a/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java b/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java index d86f2bd73..284212efe 100644 --- a/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java +++ b/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java @@ -36,9 +36,9 @@ import org.apache.xbean.finder.ClassLoaders; import serp.bytecode.BCClass; import serp.bytecode.Project; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/openjpa-junit5/src/test/java/org/apache/openjpa/junit5/MyEntity.java b/openjpa-junit5/src/test/java/org/apache/openjpa/junit5/MyEntity.java index 2db80ce91..da36d6969 100644 --- a/openjpa-junit5/src/test/java/org/apache/openjpa/junit5/MyEntity.java +++ b/openjpa-junit5/src/test/java/org/apache/openjpa/junit5/MyEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.junit5; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyEntity { diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 6f5d14edc..71b7fe094 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-kernel @@ -42,12 +42,12 @@ ${project.version} - org.apache.geronimo.specs - geronimo-jms_1.1_spec + jakarta.jms + jakarta.jms-api - org.apache.geronimo.specs - geronimo-jta_1.1_spec + jakarta.transaction + jakarta.transaction-api org.apache.commons diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java index 1f7cb2b37..d9496ecea 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java @@ -1986,7 +1986,7 @@ public interface OpenJPAConfiguration /** * database action from the persistence unit. - * See 'javax.persistence.schema-generation.database.action' + * See 'jakarta.persistence.schema-generation.database.action' * @return openjpa internal schemaAction which corresponds to the JPA action. * @since 3.0.0 */ diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java index a85d2dc52..38116b898 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java @@ -378,19 +378,19 @@ public class OpenJPAConfigurationImpl connectionUserName = addString("ConnectionUserName"); - connectionUserName.addEquivalentKey("javax.persistence.jdbc.user"); + connectionUserName.addEquivalentKey("jakarta.persistence.jdbc.user"); connectionPassword = addString("ConnectionPassword"); - connectionPassword.addEquivalentKey("javax.persistence.jdbc.password"); + connectionPassword.addEquivalentKey("jakarta.persistence.jdbc.password"); connectionPassword.hide(); encryptionProvider = addPlugin("EncryptionProvider",true); connectionURL = addString("ConnectionURL"); - connectionURL.addEquivalentKey("javax.persistence.jdbc.url"); + connectionURL.addEquivalentKey("jakarta.persistence.jdbc.url"); connectionDriverName = addString("ConnectionDriverName"); - connectionDriverName.addEquivalentKey("javax.persistence.jdbc.driver"); + connectionDriverName.addEquivalentKey("jakarta.persistence.jdbc.driver"); connectionFactoryName = addString("ConnectionFactoryName"); connectionProperties = addString("ConnectionProperties"); @@ -422,7 +422,7 @@ public class OpenJPAConfigurationImpl optimizeIdCopy.setDefault("false"); optimizeIdCopy.set(false); - databaseAction = addInt("javax.persistence.schema-generation.database.action"); + databaseAction = addInt("jakarta.persistence.schema-generation.database.action"); aliases = new String[] { "none", String.valueOf(SchemaGenerationAction.NONE), "create", String.valueOf(SchemaGenerationAction.CREATE), @@ -433,7 +433,7 @@ public class OpenJPAConfigurationImpl databaseAction.setDefault(aliases[0]); databaseAction.setAliasListComprehensive(true); - scriptsAction = addInt("javax.persistence.schema-generation.scripts.action"); + scriptsAction = addInt("jakarta.persistence.schema-generation.scripts.action"); aliases = new String[] { "none", String.valueOf(SchemaGenerationAction.NONE), "create", String.valueOf(SchemaGenerationAction.CREATE), @@ -444,7 +444,7 @@ public class OpenJPAConfigurationImpl scriptsAction.setDefault(aliases[0]); scriptsAction.setAliasListComprehensive(true); - createSource = addInt("javax.persistence.schema-generation.create-source"); + createSource = addInt("jakarta.persistence.schema-generation.create-source"); aliases = new String[] { "none", String.valueOf(SchemaGenerationSource.NONE), "metadata", String.valueOf(SchemaGenerationSource.METADATA), @@ -456,7 +456,7 @@ public class OpenJPAConfigurationImpl createSource.setDefault(aliases[0]); createSource.setAliasListComprehensive(true); - dropSource = addInt("javax.persistence.schema-generation.drop-source"); + dropSource = addInt("jakarta.persistence.schema-generation.drop-source"); aliases = new String[] { "metadata", String.valueOf(SchemaGenerationSource.METADATA), "script", String.valueOf(SchemaGenerationSource.SCRIPT), @@ -467,11 +467,11 @@ public class OpenJPAConfigurationImpl dropSource.setDefault(aliases[0]); dropSource.setAliasListComprehensive(true); - createScriptSource = addString("javax.persistence.schema-generation.create-script-source"); - dropScriptSource = addString("javax.persistence.schema-generation.drop-script-source"); - createScriptTarget = addString("javax.persistence.schema-generation.scripts.create-target"); - dropScriptTarget = addString("javax.persistence.schema-generation.scripts.drop-target"); - loadScriptSource = addString("javax.persistence.sql-load-script-source"); + createScriptSource = addString("jakarta.persistence.schema-generation.create-script-source"); + dropScriptSource = addString("jakarta.persistence.schema-generation.drop-script-source"); + createScriptTarget = addString("jakarta.persistence.schema-generation.scripts.create-target"); + dropScriptTarget = addString("jakarta.persistence.schema-generation.scripts.drop-target"); + loadScriptSource = addString("jakarta.persistence.sql-load-script-source"); autoClear = addInt("AutoClear"); aliases = @@ -549,7 +549,7 @@ public class OpenJPAConfigurationImpl flushBeforeQueries.setAliasListComprehensive(true); lockTimeout = addInt("LockTimeout"); - lockTimeout.addEquivalentKey("javax.persistence.lock.timeout"); + lockTimeout.addEquivalentKey("jakarta.persistence.lock.timeout"); lockTimeout.setDefault("-1"); lockTimeout.setDynamic(true); @@ -636,7 +636,7 @@ public class OpenJPAConfigurationImpl addValue(specification); specification.setInstantiatingGetter("getSpecificationInstance"); - queryTimeout = addInt("javax.persistence.query.timeout"); + queryTimeout = addInt("jakarta.persistence.query.timeout"); queryTimeout.setDefault("-1"); queryTimeout.setDynamic(true); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java index db1868550..366e6df30 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java @@ -28,9 +28,9 @@ import org.apache.openjpa.lib.conf.Configurable; * This policy is activated for each instance if and only if the cache settings specified in metadata * such as JPA specification defined {@link Cacheable @Cacheable} annotation or OpenJPA specific * {@link org.apache.openjpa.persistence.DataCache @DataCache} annotation or configuration property - * such as javax.persistence.sharedCache.mode determined the type of the instance being cachable. + * such as jakarta.persistence.sharedCache.mode determined the type of the instance being cachable. *
    - * For example, a specific policy will never be active for when javax.persistence.sharedCache.mode + * For example, a specific policy will never be active for when jakarta.persistence.sharedCache.mode * is set to NONE. *
    * Distribution Policies are configurable. So a specific policy can be configured as diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java index 0c3fbf18c..e9e377fba 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java @@ -17,10 +17,10 @@ package org.apache.openjpa.ee; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.util.GeneralException; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java index bd42c39f3..6c7d6393b 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java @@ -21,9 +21,9 @@ package org.apache.openjpa.ee; import java.util.LinkedList; import java.util.List; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.lib.conf.Configurable; import org.apache.openjpa.lib.conf.Configuration; @@ -56,14 +56,14 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime implements ManagedRuntime, Configurable { private static final String [] JNDI_LOCS = new String []{ - "javax.transaction.TransactionManager", // weblogic + "jakarta.transaction.TransactionManager", // weblogic "java:/TransactionManager", // jboss, jrun, Geronimo "java:/DefaultDomain/TransactionManager", // jrun too "java:comp/pm/TransactionManager", // orion & oracle "java:comp/TransactionManager", // generic "java:appserver/TransactionManager", // GlassFish "java:pm/TransactionManager", // borland - "aries:services/javax.transaction.TransactionManager", // Apache Aries + "aries:services/jakarta.transaction.TransactionManager", // Apache Aries }; private static final String [] METHODS = new String[]{ "com.arjuna.jta.JTA_TransactionManager.transactionManager", // hp diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java index 0cd3e9e5d..cb74d942b 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java @@ -20,7 +20,7 @@ package org.apache.openjpa.ee; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.conf.Configurable; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java index a63a7d474..c28c8fb15 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java @@ -20,7 +20,7 @@ package org.apache.openjpa.ee; import javax.naming.Context; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * Implementation of the {@link ManagedRuntime} interface that uses JNDI to diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java index 3beeb75c0..9e938f630 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.ee; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; /** * This interface must be implemented by concrete plugins to application diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/OSGiManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/OSGiManagedRuntime.java index cc2dff1dc..bff2e9714 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/OSGiManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/OSGiManagedRuntime.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.ee; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.util.InternalException; import org.osgi.framework.BundleActivator; @@ -31,7 +31,7 @@ import org.osgi.framework.ServiceReference; /** *

    Implementation of the {@link ManagedRuntime} interface that listens - * for an OSGi service with interface javax.transaction.TransactionManager + * for an OSGi service with interface jakarta.transaction.TransactionManager * to create a {@link TransactionManager} for controlling transactions.

    * *

    The support for a transaction manager is usually activated inside an OSGi @@ -87,7 +87,7 @@ public class OSGiManagedRuntime extends AbstractManagedRuntime { /** *

    Register a service listener to the given bundle context by * {@link BundleContext#addServiceListener(ServiceListener,String)} with a filter - * expression of (objectClass=javax.transaction.TransactionManager).

    + * expression of (objectClass=jakarta.transaction.TransactionManager).

    * *

    The caller is responsible for calling * {@link #deregisterServiceListener(BundleContext)}, when @@ -106,9 +106,9 @@ public class OSGiManagedRuntime extends AbstractManagedRuntime { listener = new Listener(bundleContext); bundleContext.addServiceListener(listener, "(" + Constants.OBJECTCLASS - + "=javax.transaction.TransactionManager)"); + + "=jakarta.transaction.TransactionManager)"); - serviceReference = bundleContext.getServiceReference("javax.transaction.TransactionManager"); + serviceReference = bundleContext.getServiceReference("jakarta.transaction.TransactionManager"); if (serviceReference != null) { transactionManager = (TransactionManager)bundleContext.getService(serviceReference); @@ -147,7 +147,7 @@ public class OSGiManagedRuntime extends AbstractManagedRuntime { synchronized (OSGiManagedRuntime.class) { if (transactionManager == null) { - throw new InternalException("No javax.transaction.TransactionManager " + + throw new InternalException("No jakarta.transaction.TransactionManager " + "service is currently registered as an OSGi service."); } diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java index dd3b92752..f24da63a5 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java @@ -20,16 +20,16 @@ package org.apache.openjpa.ee; import javax.naming.Context; import javax.naming.InitialContext; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import javax.transaction.xa.XAResource; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java index ff33600d8..577ff4c48 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java @@ -20,7 +20,7 @@ package org.apache.openjpa.ee; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * {@link ManagedRuntime} implementation for SunONE. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java index fbe3f60f8..553217374 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java @@ -24,15 +24,15 @@ import java.lang.reflect.Method; import javax.naming.Context; import javax.naming.InitialContext; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAResource; import org.apache.openjpa.conf.OpenJPAConfiguration; @@ -79,7 +79,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime * wrapper */ @Override - public javax.transaction.TransactionManager getTransactionManager() + public jakarta.transaction.TransactionManager getTransactionManager() throws Exception { return new WASTransaction(); } @@ -97,8 +97,8 @@ public class WASManagedRuntime extends AbstractManagedRuntime *

  3. GetStatus
    4. * */ - class WASTransaction implements javax.transaction.TransactionManager, - javax.transaction.Transaction { + class WASTransaction implements jakarta.transaction.TransactionManager, + jakarta.transaction.Transaction { @Override public int getStatus() throws SystemException { @@ -270,7 +270,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime /** * WASSynchronization wrapper. This class translates the WAS proprietary - * synchronization callback methods to javax.transaction.Synchronization + * synchronization callback methods to jakarta.transaction.Synchronization * methods. * *

    @@ -296,7 +296,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime /** * AfterCompletion wrapper. Translates the WAS proprietary call to a - * javax.transaction.Synchronization call. + * jakarta.transaction.Synchronization call. */ public void afterCompletion(int localTransactionId, byte[] globalTransactionId, boolean committed) { @@ -311,7 +311,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime /** * BeforeCompletion wrapper. Translates WAS proprietary call to a - * javax.transaction.Synchronization call. + * jakarta.transaction.Synchronization call. */ public void beforeCompletion(int arg0, byte[] arg1) { if (_sync != null) { diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java index dabb7449f..6ef9e452e 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java @@ -20,8 +20,8 @@ package org.apache.openjpa.ee; import java.lang.reflect.Method; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; /** * {@link ManagedRuntime} implementation that directly accesses the diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java index 99a89e059..3723e1d85 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java @@ -20,18 +20,18 @@ package org.apache.openjpa.event; import java.util.Properties; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageListener; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.Topic; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicConnectionFactory; +import jakarta.jms.TopicPublisher; +import jakarta.jms.TopicSession; +import jakarta.jms.TopicSubscriber; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -197,7 +197,7 @@ public class JMSRemoteCommitProvider } /* * - * Returns a {@link javax.jms.MessageListener} capable of + * Returns a {@link jakarta.jms.MessageListener} capable of * understanding and processing messages created by {@link #createMessage}. * The listener returned by this method is responsible for * notifying the provider that a remote event has been received. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java index 957da41d5..81296787a 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java @@ -34,10 +34,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.lib.util.collections.AbstractReferenceMap.ReferenceStrength; import org.apache.openjpa.audit.Auditor; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java index 0426e9b8b..d1437dc66 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.apache.openjpa.ee.ManagedRuntime; import org.apache.openjpa.event.CallbackModes; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java index 8d3cb5c6f..db9a6a8a3 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java @@ -41,8 +41,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import javax.transaction.Status; -import javax.transaction.Synchronization; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; @@ -1593,7 +1593,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl try { assertTransactionOperation(); - javax.transaction.Transaction trans = + jakarta.transaction.Transaction trans = _runtime.getTransactionManager().getTransaction(); if (trans == null) throw new InvalidStateException(_loc.get("null-trans")); @@ -1620,7 +1620,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl try { assertTransactionOperation(); - javax.transaction.Transaction trans = + jakarta.transaction.Transaction trans = _runtime.getTransactionManager().getTransaction(); if (trans != null) trans.rollback(); @@ -1686,7 +1686,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl if ((_flags & FLAG_ACTIVE) == 0) return false; - javax.transaction.Transaction trans = + jakarta.transaction.Transaction trans = _runtime.getTransactionManager().getTransaction(); if (trans == null) return false; @@ -1707,7 +1707,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl if ((_flags & FLAG_ACTIVE) == 0) return null; - javax.transaction.Transaction trans = + jakarta.transaction.Transaction trans = _runtime.getTransactionManager().getTransaction(); if (trans == null) return null; @@ -1745,7 +1745,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl */ private void setRollbackOnlyInternal(Throwable cause) { try { - javax.transaction.Transaction trans = + jakarta.transaction.Transaction trans = _runtime.getTransactionManager().getTransaction(); if (trans == null) throw new InvalidStateException(_loc.get("null-trans")); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java index 118eacb8d..bc8f1ad1d 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java @@ -68,7 +68,7 @@ public class FetchConfigurationImpl /** * Registers hint keys that have a corresponding setter method. * The hint keys are registered in openjpa.FetchPlan and openjpa as prefix. - * Also some keys are registered in javax.persistence namespace. + * Also some keys are registered in jakarta.persistence namespace. */ static { String[] prefixes = {"openjpa.FetchPlan", "openjpa"}; @@ -78,10 +78,10 @@ public class FetchConfigurationImpl populateHintSetter(target, "FlushBeforeQueries", int.class, prefixes); populateHintSetter(target, "LockScope", int.class, prefixes); populateHintSetter(target, "LockTimeout", int.class, prefixes); - populateHintSetter(target, "setLockTimeout", "timeout", int.class, "javax.persistence.lock"); + populateHintSetter(target, "setLockTimeout", "timeout", int.class, "jakarta.persistence.lock"); populateHintSetter(target, "MaxFetchDepth", int.class, prefixes); populateHintSetter(target, "QueryTimeout", int.class, prefixes); - populateHintSetter(target, "setQueryTimeout", "timeout", int.class, "javax.persistence.query"); + populateHintSetter(target, "setQueryTimeout", "timeout", int.class, "jakarta.persistence.query"); populateHintSetter(target, "ReadLockLevel", int.class, prefixes); populateHintSetter(target, "setReadLockLevel", "ReadLockMode", int.class, prefixes); populateHintSetter(target, "WriteLockLevel", int.class, prefixes); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java index 7bab6acde..3932c1f33 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.kernel; -import javax.transaction.NotSupportedException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import javax.transaction.xa.XAResource; import org.apache.openjpa.ee.AbstractManagedRuntime; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java index a55298a8d..8df93c0fa 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java @@ -40,7 +40,7 @@ public class JPQLParser private static final long serialVersionUID = 1L; private static final Localizer _loc = Localizer.forPackage(JPQLParser.class); - public static final String LANG_JPQL = "javax.persistence.JPQL"; + public static final String LANG_JPQL = "jakarta.persistence.JPQL"; @Override public Object parse(String ql, ExpressionStoreQuery query) { diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties index 09820dbc0..2aad2f9a0 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties @@ -116,4 +116,4 @@ invalid-types-excluded-types: Failed to configure openjpa.DataCache Types, Exclu Types "{0}" were found in both lists, but can only appear one of the lists. recommend_jpa2_caching: You have specified the openjpa.DataCache property "{0}", but using that \ property is not recommended. Use the JPA 2.0 shared-cache-mode element "{1}" \ - in conjunction with the javax.persistence.Cacheable annotation instead. + in conjunction with the jakarta.persistence.Cacheable annotation instead. diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java b/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java index 16b97ea84..fb9eb35a5 100644 --- a/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java +++ b/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java @@ -24,14 +24,14 @@ import java.util.ArrayList; import java.util.Dictionary; import java.util.List; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.util.InternalException; import org.junit.Test; @@ -52,11 +52,11 @@ import junit.framework.AssertionFailedError; import static org.junit.Assert.*; /** - * Test javax.transaction.TransactionManager OSGi service discovery. + * Test jakarta.transaction.TransactionManager OSGi service discovery. */ public class TestOSGiManagedRuntime { - private static final String TXN_MANAGER_CLASS_NAME = "javax.transaction.TransactionManager"; + private static final String TXN_MANAGER_CLASS_NAME = "jakarta.transaction.TransactionManager"; /** * A transaction manager instance an nothing more. @@ -155,7 +155,7 @@ public class TestOSGiManagedRuntime { }; /** - * A fake bundle context with a reference counter for a javax.transaction.TRansactionManager + * A fake bundle context with a reference counter for a jakarta.transaction.TRansactionManager */ private static final class TestBundleContext implements BundleContext { diff --git a/openjpa-kubernetes/pom.xml b/openjpa-kubernetes/pom.xml index 16386ea4e..2707f1a34 100644 --- a/openjpa-kubernetes/pom.xml +++ b/openjpa-kubernetes/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-kubernetes diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml index 61983976a..abaddc10b 100644 --- a/openjpa-lib/pom.xml +++ b/openjpa-lib/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-lib @@ -74,8 +74,8 @@ serp - org.apache.geronimo.specs - geronimo-validation_1.1_spec + jakarta.validation + jakarta.validation-api provided diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java index a69eb6811..b0acd1399 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java @@ -835,7 +835,7 @@ public class ConfigurationImpl */ private void warnInvalidProperty(String propName) { if (propName != null && - (propName.startsWith("java.") || propName.startsWith("javax.persistence")|| propName.startsWith("sun."))) + (propName.startsWith("java.") || propName.startsWith("jakarta.persistence")|| propName.startsWith("sun."))) return; if (!isInvalidProperty(propName)) return; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java index f02e011a1..96eb36610 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java @@ -49,10 +49,10 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.zip.ZipFile; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import serp.bytecode.BCClass; import serp.bytecode.BCClassLoader; @@ -117,8 +117,8 @@ import serp.bytecode.Project; *

  4. AnnotatedElement.getAnnotations *
  5. AnnotatedElement.getDeclaredAnnotations *
  6. AnnotatedElement.isAnnotationPresent - *
  7. javax.validation.Validator.validate - *
  8. javax.validation.Validation.buildDefaultValidatorFactory + *
  9. jakarta.validation.Validator.validate + *
  10. jakarta.validation.Validation.buildDefaultValidatorFactory * * * If these methods are used, the following sample usage patterns should be @@ -1303,7 +1303,7 @@ public abstract class J2DoPrivHelper { } /** - * Return a PrivilegeAction object for javax.validation.Validator.validate(). + * Return a PrivilegeAction object for jakarta.validation.Validator.validate(). * * Requires security policy: 'permission java.lang.RuntimePermission "accessDeclaredMemeber";' */ @@ -1318,7 +1318,7 @@ public abstract class J2DoPrivHelper { } /** - * Return a PrivilegeAction object for javax.validation.Validation.buildDefaultValidatorFactory(). + * Return a PrivilegeAction object for jakarta.validation.Validation.buildDefaultValidatorFactory(). * * Requires security policy: 'permission java.lang.RuntimePermission "createClassLoader";' */ diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index c02c9db74..5223d1c05 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-persistence-jdbc @@ -69,6 +69,10 @@ + + jakarta.persistence + jakarta.persistence-api + org.apache.openjpa openjpa-jdbc diff --git a/openjpa-persistence-jdbc/src/main/ant/enhancer.xml b/openjpa-persistence-jdbc/src/main/ant/enhancer.xml index 922da25c0..6168491c3 100644 --- a/openjpa-persistence-jdbc/src/main/ant/enhancer.xml +++ b/openjpa-persistence-jdbc/src/main/ant/enhancer.xml @@ -80,6 +80,7 @@ + diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java index 618dfb195..5c99264a7 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java @@ -108,38 +108,38 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FieldResult; -import javax.persistence.Inheritance; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MapKeyTemporal; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Temporal; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Inheritance; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Temporal; +import jakarta.persistence.UniqueConstraint; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.identifier.DBIdentifier; @@ -207,7 +207,7 @@ public class AnnotationPersistenceMappingParser _tags.put(AssociationOverrides.class, ASSOC_OVERRIDES); _tags.put(AttributeOverride.class, ATTR_OVERRIDE); _tags.put(AttributeOverrides.class, ATTR_OVERRIDES); - _tags.put(javax.persistence.Column.class, COL); + _tags.put(jakarta.persistence.Column.class, COL); _tags.put(ColumnResult.class, COLUMN_RESULT); _tags.put(DiscriminatorColumn.class, DISCRIM_COL); _tags.put(DiscriminatorValue.class, DISCRIM_VAL); @@ -266,7 +266,7 @@ public class AnnotationPersistenceMappingParser _tags.put(MappingOverrides.class, MAPPING_OVERRIDES); _tags.put(Nonpolymorphic.class, NONPOLY); _tags.put(OrderColumn.class, ORDER_COL); - _tags.put(javax.persistence.OrderColumn.class, ORDER_COLUMN); + _tags.put(jakarta.persistence.OrderColumn.class, ORDER_COLUMN); _tags.put(Strategy.class, STRAT); _tags.put(SubclassFetchMode.class, SUBCLASS_FETCH_MODE); _tags.put(Unique.class, UNIQUE); @@ -653,7 +653,7 @@ public class AnnotationPersistenceMappingParser } - org.apache.openjpa.jdbc.schema.Index createIndex(MetaDataContext ctx, javax.persistence.Index anno) { + org.apache.openjpa.jdbc.schema.Index createIndex(MetaDataContext ctx, jakarta.persistence.Index anno) { String columnNames = anno.columnList(); if (StringUtil.isEmpty(columnNames)) { throw new UserException(_loc.get("index-no-column", ctx)); @@ -677,8 +677,8 @@ public class AnnotationPersistenceMappingParser } void addIndices(String table, MetaDataContext ctx, - MappingInfo info, javax.persistence.Index... indices) { - for (javax.persistence.Index anno : indices) { + MappingInfo info, jakarta.persistence.Index... indices) { + for (jakarta.persistence.Index anno : indices) { org.apache.openjpa.jdbc.schema.Index idx = createIndex(ctx, anno); idx.setTableIdentifier(DBIdentifier.newTable(table, delimit())); if (info instanceof ClassMappingInfo) @@ -1188,7 +1188,7 @@ public class AnnotationPersistenceMappingParser value()); break; case COL: - parseColumns(fm, (javax.persistence.Column) anno); + parseColumns(fm, (jakarta.persistence.Column) anno); break; case COLS: parseColumns(fm, ((Columns) anno).value()); @@ -1349,7 +1349,7 @@ public class AnnotationPersistenceMappingParser break; case ORDER_COLUMN: parseJavaxOrderColumn(fm, - (javax.persistence.OrderColumn)anno); + (jakarta.persistence.OrderColumn)anno); break; case ORDER_COL: parseOrderColumn(fm, (OrderColumn) anno); @@ -1669,7 +1669,7 @@ public class AnnotationPersistenceMappingParser * Parse @Column(s). */ protected void parseColumns(FieldMapping fm, - javax.persistence.Column... pcols) { + jakarta.persistence.Column... pcols) { if (pcols.length == 0) return; @@ -1725,7 +1725,7 @@ public class AnnotationPersistenceMappingParser /** * Create a new schema column with information from the given annotation. */ - private static Column newColumn(javax.persistence.Column anno, + private static Column newColumn(jakarta.persistence.Column anno, boolean delimit) { Column col = new Column(); setupColumn(col, anno, delimit); @@ -1735,7 +1735,7 @@ public class AnnotationPersistenceMappingParser /** * Setup the given column with information from the given annotation. */ - private static void setupColumn(Column col, javax.persistence.Column anno, + private static void setupColumn(Column col, jakarta.persistence.Column anno, boolean delimit) { if (!StringUtil.isEmpty(anno.name())) col.setIdentifier(DBIdentifier.newColumn(anno.name(),delimit)); @@ -2095,10 +2095,10 @@ public class AnnotationPersistenceMappingParser } /** - * Parse @javax.persistence.OrderColumn + * Parse @jakarta.persistence.OrderColumn */ private void parseJavaxOrderColumn(FieldMapping fm, - javax.persistence.OrderColumn order) { + jakarta.persistence.OrderColumn order) { Column col = new Column(); if (!StringUtil.isEmpty(order.name())) diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java index 45b8148d4..82f089c90 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java @@ -28,28 +28,28 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.persistence.ColumnResult; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FieldResult; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.SecondaryTable; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; @@ -749,7 +749,7 @@ public class AnnotationPersistenceMappingSerializer private Class getColumnAnnotationType() { switch(this) { case COL: - return javax.persistence.Column.class; + return jakarta.persistence.Column.class; case JOIN: case INVERSE: return JoinColumn.class; diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java index 5e19a7ee1..3fe8c29aa 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * Allows the specification of multiple columns for complex mappings. diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java index 729eecf8e..4a1ec35ee 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc; import java.util.Collection; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.apache.openjpa.jdbc.kernel.EagerFetchModes; import org.apache.openjpa.jdbc.kernel.LRSSizes; diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java index 333644187..5470d6788 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc; import java.sql.ResultSet; import java.util.Collection; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.apache.openjpa.jdbc.kernel.DelegatingJDBCFetchConfiguration; import org.apache.openjpa.jdbc.kernel.EagerFetchModes; diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java index c754edef4..97248a215 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.conf.OpenJPAProductDerivation; @@ -64,7 +64,7 @@ public class JDBCPersistenceProductDerivation throws Exception { // make sure JPA is available AccessController.doPrivileged(J2DoPrivHelper.getClassLoaderAction( - javax.persistence.EntityManagerFactory.class)); + jakarta.persistence.EntityManagerFactory.class)); } @Override diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java index 64ca184e1..4cf4f9618 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * Allows override of complex embedded or superclass mappings. diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java index 7ad549cdb..cded133a5 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java @@ -65,10 +65,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.DiscriminatorType; -import javax.persistence.EnumType; -import javax.persistence.InheritanceType; -import javax.persistence.TemporalType; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.EnumType; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.TemporalType; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.identifier.DBIdentifier; diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java index 840d21e06..c1b30163f 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java index 3e0accbea..f0a055957 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.Column; +import jakarta.persistence.Column; /** *

    Allows override of complex embedded or superclass mappings.

    diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java index e2b30c5fc..7b9b131cc 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * Extended secondary table. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java index 6c12a0e63..8d1944be9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java @@ -24,16 +24,16 @@ import java.util.Collection; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -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.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +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.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.kernel.Audited; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java index 1e8f54d30..36f574e65 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java @@ -23,8 +23,8 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java index dcb51bb57..d4108064a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java @@ -20,8 +20,8 @@ package org.apache.openjpa.audit; import java.util.Collection; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.ee.ManagedRuntime; import org.apache.openjpa.kernel.Audited; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java index af0dae42b..8be812a9f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java @@ -20,8 +20,8 @@ package org.apache.openjpa.audit; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java index ee7608a2c..8d9b4dd21 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java @@ -21,9 +21,9 @@ package org.apache.openjpa.conf; import java.util.EnumSet; import java.util.HashMap; -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 org.apache.openjpa.persistence.AutoDetachType; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java index 0d4013ddf..4531adac3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java @@ -20,9 +20,9 @@ package org.apache.openjpa.conf; import java.util.HashMap; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; import org.apache.openjpa.lib.util.ParseException; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java index 1f4b605d9..c58c5da04 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java @@ -20,10 +20,10 @@ package org.apache.openjpa.conf; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceException; import org.apache.openjpa.persistence.OpenJPAPersistence; import org.apache.openjpa.util.UserException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java index 811f7ba1d..22133c19a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.persistence.JPAFacadeHelper; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java index fe5e8e87f..8539c5a6b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.conf; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.lib.conf.Value; import org.apache.openjpa.meta.ClassMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java index ae1748f7e..18ca885fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java @@ -21,9 +21,9 @@ package org.apache.openjpa.conf; import java.util.ArrayList; import java.util.Collection; -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 org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java index 6f3020940..d278aed03 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.conf; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.MariaDBDictionary; import org.apache.openjpa.jdbc.sql.MySQLDictionary; @@ -73,7 +73,7 @@ public class TestQueryHints extends SingleEMFTestCase { } public void testSupportedHintsContainJPAQueryHints() { - assertSupportedHint("javax.persistence.query.timeout", true); + assertSupportedHint("jakarta.persistence.query.timeout", true); } public void testUnrecognizedKeyIsIgnored() { @@ -149,15 +149,15 @@ public class TestQueryHints extends SingleEMFTestCase { } public void testJPAHintSetsFetchPlan() { - query.setHint("javax.persistence.lock.timeout", 5671); - query.setHint("javax.persistence.query.timeout", 7500); + query.setHint("jakarta.persistence.lock.timeout", 5671); + query.setHint("jakarta.persistence.query.timeout", 7500); assertEquals(5671, query.getFetchPlan().getLockTimeout()); assertEquals(7500, query.getFetchPlan().getQueryTimeout()); } public void testInvalidLockTimeoutHint() { try { - query.setHint("javax.persistence.lock.timeout", -5671); + query.setHint("jakarta.persistence.lock.timeout", -5671); fail("Expected setHint to fail with an IllegalArgumentException"); } catch (IllegalArgumentException e) { // expected @@ -166,7 +166,7 @@ public class TestQueryHints extends SingleEMFTestCase { public void testInvalidQueryTimeoutHint() { try { - query.setHint("javax.persistence.query.timeout", -7500); + query.setHint("jakarta.persistence.query.timeout", -7500); fail("Expected setHint to fail with an IllegalArgumentException"); } catch (IllegalArgumentException e) { // expected diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java index 38c2328a4..158b5283f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java @@ -53,8 +53,8 @@ public class TestQueryProperties extends SingleEMFTestCase { super.setUp(QTimeout.class, CLEAR_TABLES); // create the Map to test overrides props = new HashMap<>(); - props.put("javax.persistence.lock.timeout", "12000"); - props.put("javax.persistence.query.timeout", "7000"); + props.put("jakarta.persistence.lock.timeout", "12000"); + props.put("jakarta.persistence.query.timeout", "7000"); } public void testNoProperties() { @@ -93,8 +93,8 @@ public class TestQueryProperties extends SingleEMFTestCase { q = em1.createNamedQuery("NoHintList"); // verify no Query hints hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.lock.timeout")); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.lock.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // verify default config values of no timeouts timeout = q.getFetchPlan().getLockTimeout(); assertEquals("Expected no default lock timeout", lTime.intValue(), @@ -130,14 +130,14 @@ public class TestQueryProperties extends SingleEMFTestCase { * return these default values. * hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.lock.timeout")); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.lock.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); timeout = new Integer((String) hints.get( - "javax.persistence.lock.timeout")); + "jakarta.persistence.lock.timeout")); assertEquals("Expected Map updated lockTimeout", lTime.intValue(), timeout.intValue()); timeout = new Integer((String) hints.get( - "javax.persistence.query.timeout")); + "jakarta.persistence.query.timeout")); assertEquals("Expected Map updated queryTimeout", qTime.intValue(), timeout.intValue()); */ @@ -155,17 +155,17 @@ public class TestQueryProperties extends SingleEMFTestCase { // verify setHint overrides Map provided properties lTime = 15000; qTime = 10000; - q.setHint("javax.persistence.lock.timeout", lTime); - q.setHint("javax.persistence.query.timeout", qTime); + q.setHint("jakarta.persistence.lock.timeout", lTime); + q.setHint("jakarta.persistence.query.timeout", qTime); hints = q.getHints(); // verify getHints values were updated - timeout = (Integer) hints.get("javax.persistence.lock.timeout"); + timeout = (Integer) hints.get("jakarta.persistence.lock.timeout"); assertEquals( - "Expected setHint updated javax.persistence.lock.timeout", + "Expected setHint updated jakarta.persistence.lock.timeout", lTime.intValue(), timeout.intValue()); - timeout = (Integer) hints.get("javax.persistence.query.timeout"); + timeout = (Integer) hints.get("jakarta.persistence.query.timeout"); assertEquals( - "Expected setHint updated javax.persistence.query.timeout", + "Expected setHint updated jakarta.persistence.query.timeout", qTime.intValue(), timeout.intValue()); // verify internal config values were updated timeout = q.getFetchPlan().getLockTimeout(); @@ -260,7 +260,7 @@ public class TestQueryProperties extends SingleEMFTestCase { // verify getHints values were updated hints = q.getHints(); timeout = new Integer((String)hints.get( - "javax.persistence.query.timeout")); + "jakarta.persistence.query.timeout")); assertEquals("Expected QueryHints updated query timeout", qTime.intValue(), timeout.intValue()); // verify internal config value was updated @@ -274,14 +274,14 @@ public class TestQueryProperties extends SingleEMFTestCase { // verify setHint overrides QueryHint provided properties lTime = 15000; qTime = 10000; - q.setHint("javax.persistence.lock.timeout", lTime); - q.setHint("javax.persistence.query.timeout", qTime); + q.setHint("jakarta.persistence.lock.timeout", lTime); + q.setHint("jakarta.persistence.query.timeout", qTime); // verify getHints values were updated hints = q.getHints(); - timeout = (Integer) hints.get("javax.persistence.lock.timeout"); + timeout = (Integer) hints.get("jakarta.persistence.lock.timeout"); assertEquals("Expected setHint updated lock timeout", lTime.intValue(), timeout.intValue()); - timeout = (Integer) hints.get("javax.persistence.query.timeout"); + timeout = (Integer) hints.get("jakarta.persistence.query.timeout"); assertEquals("Expected setHint updated query timeout", qTime.intValue(), timeout.intValue()); // verify internal config values were updated diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java index c351a5bb2..0f7ceae23 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.conf; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java index adadbd4d9..fcfab979a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java @@ -21,7 +21,7 @@ package org.apache.openjpa.enhance; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @see TestClassHierarchyEnhancement diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java index a00a674d8..a223ece4d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java @@ -21,9 +21,9 @@ package org.apache.openjpa.enhance; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @see TestClassHierarchyEnhancement diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java index aef5a2d97..e16cb23b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java index 1d70c326f..2f8054f54 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java @@ -17,7 +17,7 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance.java index 130d78820..a6c611142 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class UnenhancedBootstrapInstance { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance2.java index 287c5e321..912fecfce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedBootstrapInstance2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class UnenhancedBootstrapInstance2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java index 889967089..45977f2dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.apache.openjpa.enhance.UnenhancedCompoundPKFieldAccess.PK; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSubclass.java index f79a4c9b6..3e0ad7c53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSubclass.java @@ -17,8 +17,8 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.IdClass; @Entity @IdClass(UnenhancedCompoundPKFieldAccessSubclass.PK.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java index ee7f0cfda..3720ead10 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java @@ -17,9 +17,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @IdClass(UnenhancedCompoundPKFieldAccessSuperclass.PK.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java index 280ba7a43..1db5ab463 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.apache.openjpa.enhance.UnenhancedCompoundPKPropertyAccess.PK; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java index 49770a988..535f4e96a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java @@ -20,15 +20,15 @@ package org.apache.openjpa.enhance; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="UN_FIELD") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java index c41382ae6..3c7c8997c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java @@ -19,15 +19,15 @@ package org.apache.openjpa.enhance; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "UN_FIELD_WRAP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java index 931e666ed..b1bbee016 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java @@ -17,9 +17,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class UnenhancedFieldAccessPrimitiveWrapperSubclass diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java index 662063efd..f88072171 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class UnenhancedFieldAccessSubclass diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedIdentityIdPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedIdentityIdPropertyAccess.java index 4e6446927..c25ad5008 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedIdentityIdPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedIdentityIdPropertyAccess.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class UnenhancedIdentityIdPropertyAccess { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java index 6513e2be8..00478d933 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java @@ -19,9 +19,9 @@ package org.apache.openjpa.enhance; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class UnenhancedMany implements Serializable, Cloneable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java index 82591a376..8dc84a359 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java @@ -21,9 +21,9 @@ import java.io.Serializable; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class UnenhancedOne implements Serializable, Cloneable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPObject.java index 027e973a8..b0d8c7df9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPObject.java @@ -17,7 +17,7 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class UnenhancedPObject { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java index 0ba2fb78b..0b1aad3a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java @@ -20,15 +20,15 @@ package org.apache.openjpa.enhance; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="UN_PROP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java index c198a345f..895d75c27 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.Type; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedClass.java index 5bca64e0d..411a87545 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedClass.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class UnenhancedUnlistedClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedReferer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedReferer.java index b44ff2fed..c41098917 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedReferer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedUnlistedReferer.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.enhance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class UnenhancedUnlistedReferer { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Device.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Device.java index 9dfbb6306..92ba506f6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Device.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Device.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.enhance.ids; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name="ID_DEVTBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Hardware.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Hardware.java index 218ba1d7f..8e0bb63cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Hardware.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Hardware.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.enhance.ids; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Table(name="ID_HWTBL") @IdClass(HardwareId.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Software.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Software.java index f385a2cd2..e1c04ca88 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Software.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/Software.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.enhance.ids; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name="ID_SWTBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/TestOptimizeIdCopy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/TestOptimizeIdCopy.java index 9ccd9e893..47a76f01f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/TestOptimizeIdCopy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ids/TestOptimizeIdCopy.java @@ -21,8 +21,8 @@ package org.apache.openjpa.enhance.ids; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java index 11edffecb..9b56b7ec8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.event; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.simple.AllFieldTypes; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java index 02b9e1b05..00c207308 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.apache.openjpa.persistence.JPAFacadeHelper; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/CacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/CacheableEntity.java index 1d4dfdb5a..99de110e8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/CacheableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/CacheableEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.instrumentation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="INST_CACHE_ENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java index 9a1911bc9..762eee37b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java @@ -21,7 +21,7 @@ package org.apache.openjpa.instrumentation; import java.util.Random; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.lib.instrumentation.Instrument; import org.apache.openjpa.lib.instrumentation.InstrumentationProvider; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java index 787e0be42..a70f60358 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java @@ -21,10 +21,10 @@ package org.apache.openjpa.jdbc.kernel; import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.PersistentMap; import org.apache.openjpa.persistence.jdbc.ContainerTable; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Employee.java index a2d158791..56e5d5fca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.jdbc.kernel; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity // Try not to collide with other Employee entities diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityA.java index abf0d816c..bea5e4153 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityA.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityB.java index 1a12309d2..b7c3d009b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityB.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityC.java index ddef4b0b5..9a7ba2670 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityC.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.Dependent; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java index 1fb345efb..8d958fc80 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityE.java index df5b83026..a643760c7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityE.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java index d378636a6..d2428a044 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java @@ -19,10 +19,10 @@ package org.apache.openjpa.jdbc.kernel; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class EntityF { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityG.java index f11367335..932e53886 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityG.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.jdbc.ForeignKey; import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java index f6bed98e2..a9091d089 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class M21UniDepartment { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java index 20b280740..b03b67ebc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class M21UniEmployee { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java index 18ca3a923..6671abecf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java @@ -21,11 +21,11 @@ package org.apache.openjpa.jdbc.kernel; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; @Entity public class M2MBiDepartment { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java index bddd88551..14e3139ae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java @@ -21,11 +21,11 @@ package org.apache.openjpa.jdbc.kernel; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; @Entity public class M2MBiEmployee { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/OptSelectEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/OptSelectEntity.java index b6d39a814..2b6d40ac6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/OptSelectEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/OptSelectEntity.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OptSelectEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Story.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Story.java index a70bc5154..34f9b85a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Story.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Story.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "PER_JDBC_KERN_STORY") // try not to collide diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Task.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Task.java index c02091382..537b11864 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Task.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/Task.java @@ -20,13 +20,13 @@ package org.apache.openjpa.jdbc.kernel; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "PER_JDBC_KERN_TASK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java index d8e4ade12..f1cdb0266 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java @@ -20,8 +20,8 @@ package org.apache.openjpa.jdbc.kernel; import java.util.Iterator; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java index b9fb70d8a..7b4d154a3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import javax.sql.DataSource; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java index bf31d9608..6096310e6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java @@ -21,7 +21,7 @@ package org.apache.openjpa.jdbc.kernel; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java index 73d005223..104f44efb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.jdbc.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java index 2f94250fd..fa01a2ced 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java @@ -21,7 +21,7 @@ package org.apache.openjpa.jdbc.kernel; import java.util.Collection; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java index 6413e38bb..487cac557 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java @@ -21,7 +21,7 @@ package org.apache.openjpa.jdbc.kernel; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java index baa537911..b396432ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java @@ -17,9 +17,9 @@ * under the License. */ package org.apache.openjpa.jdbc.meta; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class EntityBool { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBoolChar.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBoolChar.java index 2b415d254..f4225b3eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBoolChar.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBoolChar.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.jdbc.meta; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class EntityBoolChar { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java index 1d1f1a4bc..2ba158146 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.jdbc.meta; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.identifier.DBIdentifier; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java index a50448270..371798f85 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java @@ -23,8 +23,8 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.schema.SchemaTool; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java index 26491f16d..dbd6bdd1d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.datacache.DataCachePCData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java index 0281a90bc..7d3694866 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java @@ -20,8 +20,8 @@ package org.apache.openjpa.jdbc.meta.strats; import java.io.InputStream; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.Persistent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java index dead3049a..34fa0bbac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java @@ -20,8 +20,8 @@ package org.apache.openjpa.jdbc.meta.strats; import java.io.Reader; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.Persistent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java index bb693dc66..16e06a4f0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java @@ -22,8 +22,8 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import javax.sql.DataSource; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/XmlColEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/XmlColEntity.java index 9c0a0fff5..8af5c8032 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/XmlColEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/XmlColEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.jdbc.oracle; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; @Entity public class XmlColEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Artist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Artist.java index 0509fe81b..f06e57e79 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Artist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Artist.java @@ -20,13 +20,13 @@ package org.apache.openjpa.jdbc.persistence.classcriteria; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "ARTIST") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java index aebdabd15..f3d27f8ab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.jdbc.persistence.classcriteria; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorValue(value = "BOOK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java index 6ca29dc89..7a610a941 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java @@ -20,16 +20,16 @@ package org.apache.openjpa.jdbc.persistence.classcriteria; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @Entity @Table(name = "ITEMTABLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java index 781e61a59..3a3c4c25b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.jdbc.persistence.classcriteria; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorValue(value = "MOVIE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java index 5d8ef187c..42acb9af6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java @@ -20,9 +20,9 @@ package org.apache.openjpa.jdbc.procedure; import java.util.Iterator; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.StoredProcedureQuery; import org.apache.openjpa.jdbc.procedure.derby.Procedures; import org.apache.openjpa.jdbc.procedure.entity.EntityWithStoredProcedure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java index 673e8c1b2..5b725ef57 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.jdbc.procedure.entity; -import static javax.persistence.ParameterMode.INOUT; -import static javax.persistence.ParameterMode.OUT; +import static jakarta.persistence.ParameterMode.INOUT; +import static jakarta.persistence.ParameterMode.OUT; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.StoredProcedureParameter; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.StoredProcedureParameter; @Entity @NamedStoredProcedureQueries({ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/DelimitedIdentifiersAllFieldTypesEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/DelimitedIdentifiersAllFieldTypesEntity.java new file mode 100644 index 000000000..210a3747c --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/DelimitedIdentifiersAllFieldTypesEntity.java @@ -0,0 +1,418 @@ +/* + * 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. + */ +package org.apache.openjpa.jdbc.sql; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.OffsetTime; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.openjpa.persistence.PersistentCollection; + +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; + +@Entity +public class DelimitedIdentifiersAllFieldTypesEntity { + + public enum EnumType { + Value1, Value2 + } + + // @Basic types + private short shortField; + private int intField; + private boolean booleanField; + private long longField; + private float floatField; + private char charField; + private double doubleField; + private byte byteField; + private Short wShortField; + private Integer wIntegerField; + private Boolean wBooleanField; + private Long wLongField; + private Float wFloatField; + private Character wCharacterField; + private Double wDoubleField; + private Byte wByteField; + private BigInteger bigIntegerField; + private BigDecimal bigDecimalField; + private String stringField; + private Date dateField; + private Calendar calendarField; + private java.sql.Date sqlDateField; + private java.sql.Time sqlTimeField; + private java.sql.Timestamp sqlTimestampField; + private byte[] byteLob; + private Byte[] wByteLob; + private char[] charLob; + private Character[] wCharacterLob; + private EnumType enumField; + private Serializable serializableField; + + // Additional types + private Set setOfStrings = new HashSet<>(); + private String[] arrayOfStrings; + + @PersistentCollection + private int[] arrayOfInts; + + // one-to-one and one-to-many relations to self + @OneToOne + private DelimitedIdentifiersAllFieldTypesEntity selfOneOne; + @OneToMany + private List selfOneMany = new ArrayList<>(); + + // Java8 DateTime types which are required by the JPA-2.2 spec + private LocalDate localDateField; + private LocalTime localTimeField; + private LocalDateTime localDateTimeField; + private OffsetTime offsetTimeField; + private OffsetDateTime offsetDateTimeField; + + public void setShortField(short shortField) { + this.shortField = shortField; + } + + public short getShortField() { + return this.shortField; + } + + public void setIntField(int intField) { + this.intField = intField; + } + + public int getIntField() { + return this.intField; + } + + public void setBooleanField(boolean booleanField) { + this.booleanField = booleanField; + } + + public boolean getBooleanField() { + return this.booleanField; + } + + public void setLongField(long longField) { + this.longField = longField; + } + + public long getLongField() { + return this.longField; + } + + public void setFloatField(float floatField) { + this.floatField = floatField; + } + + public float getFloatField() { + return this.floatField; + } + + public void setCharField(char charField) { + this.charField = charField; + } + + public char getCharField() { + return this.charField; + } + + public void setDoubleField(double doubleField) { + this.doubleField = doubleField; + } + + public double getDoubleField() { + return this.doubleField; + } + + public void setByteField(byte byteField) { + this.byteField = byteField; + } + + public byte getByteField() { + return this.byteField; + } + + public void setStringField(String stringField) { + this.stringField = stringField; + } + + public String getStringField() { + return this.stringField; + } + + public void setDateField(Date dateField) { + this.dateField = dateField; + } + + public Date getDateField() { + return this.dateField; + } + + public void setSetOfStrings(Set setOfStrings) { + this.setOfStrings = setOfStrings; + } + + public Set getSetOfStrings() { + return this.setOfStrings; + } + + public void setArrayOfStrings(String[] arrayOfStrings) { + this.arrayOfStrings = arrayOfStrings; + } + + public String[] getArrayOfStrings() { + return this.arrayOfStrings; + } + + public void setArrayOfInts(int[] arrayOfInts) { + this.arrayOfInts = arrayOfInts; + } + + public int[] getArrayOfInts() { + return arrayOfInts; + } + + public BigDecimal getBigDecimalField() { + return bigDecimalField; + } + + public void setBigDecimalField(BigDecimal bigDecimalField) { + this.bigDecimalField = bigDecimalField; + } + + public BigInteger getBigIntegerField() { + return bigIntegerField; + } + + public void setBigIntegerField(BigInteger bigIntegerField) { + this.bigIntegerField = bigIntegerField; + } + + public byte[] getByteLob() { + return byteLob; + } + + public void setByteLob(byte[] byteLob) { + this.byteLob = byteLob; + } + + public Calendar getCalendarField() { + return calendarField; + } + + public void setCalendarField(Calendar calendarField) { + this.calendarField = calendarField; + } + + public char[] getCharLob() { + return charLob; + } + + public void setCharLob(char[] charLob) { + this.charLob = charLob; + } + + public EnumType getEnumField() { + return enumField; + } + + public void setEnumField(EnumType enumField) { + this.enumField = enumField; + } + + public Serializable getSerializableField() { + return serializableField; + } + + public void setSerializableField(Serializable serializableField) { + this.serializableField = serializableField; + } + + public java.sql.Date getSqlDateField() { + return sqlDateField; + } + + public void setSqlDateField(java.sql.Date sqlDateField) { + this.sqlDateField = sqlDateField; + } + + public java.sql.Time getSqlTimeField() { + return sqlTimeField; + } + + public void setSqlTimeField(java.sql.Time sqlTimeField) { + this.sqlTimeField = sqlTimeField; + } + + public java.sql.Timestamp getSqlTimestampField() { + return sqlTimestampField; + } + + public void setSqlTimestampField(java.sql.Timestamp sqlTimestampField) { + this.sqlTimestampField = sqlTimestampField; + } + + public Boolean getWBooleanField() { + return wBooleanField; + } + + public void setWBooleanField(Boolean booleanField) { + wBooleanField = booleanField; + } + + public Byte getWByteField() { + return wByteField; + } + + public void setWByteField(Byte byteField) { + wByteField = byteField; + } + + public Byte[] getWByteLob() { + return wByteLob; + } + + public void setWByteLob(Byte[] byteLob) { + wByteLob = byteLob; + } + + public Character getWCharacterField() { + return wCharacterField; + } + + public void setWCharacterField(Character characterField) { + wCharacterField = characterField; + } + + public Character[] getWCharacterLob() { + return wCharacterLob; + } + + public void setWCharacterLob(Character[] characterLob) { + wCharacterLob = characterLob; + } + + public Double getWDoubleField() { + return wDoubleField; + } + + public void setWDoubleField(Double doubleField) { + wDoubleField = doubleField; + } + + public Float getWFloatField() { + return wFloatField; + } + + public void setWFloatField(Float floatField) { + wFloatField = floatField; + } + + public Integer getWIntegerField() { + return wIntegerField; + } + + public void setWIntegerField(Integer integerField) { + wIntegerField = integerField; + } + + public Long getWLongField() { + return wLongField; + } + + public void setWLongField(Long longField) { + wLongField = longField; + } + + public Short getWShortField() { + return wShortField; + } + + public void setWShortField(Short shortField) { + wShortField = shortField; + } + + public DelimitedIdentifiersAllFieldTypesEntity getSelfOneOne() { + return selfOneOne; + } + + public void setSelfOneOne(DelimitedIdentifiersAllFieldTypesEntity selfOneOne) { + this.selfOneOne = selfOneOne; + } + + public List getSelfOneMany() { + return selfOneMany; + } + + public void setSelfOneMany(List selfOneMany) { + this.selfOneMany = selfOneMany; + } + + public LocalDate getLocalDateField() { + return localDateField; + } + + public void setLocalDateField(LocalDate localDateField) { + this.localDateField = localDateField; + } + + public LocalTime getLocalTimeField() { + return localTimeField; + } + + public void setLocalTimeField(LocalTime localTimeField) { + this.localTimeField = localTimeField; + } + + public LocalDateTime getLocalDateTimeField() { + return localDateTimeField; + } + + public void setLocalDateTimeField(LocalDateTime localDateTimeField) { + this.localDateTimeField = localDateTimeField; + } + + public OffsetTime getOffsetTimeField() { + return offsetTimeField; + } + + public void setOffsetTimeField(OffsetTime offsetTimeField) { + this.offsetTimeField = offsetTimeField; + } + + public OffsetDateTime getOffsetDateTimeField() { + return offsetDateTimeField; + } + + public void setOffsetDateTimeField(OffsetDateTime offsetDateTimeField) { + this.offsetDateTimeField = offsetDateTimeField; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/SnakeCaseDDLEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/SnakeCaseDDLEntity.java new file mode 100644 index 000000000..a55d3315f --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/SnakeCaseDDLEntity.java @@ -0,0 +1,44 @@ +/* + * 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. + */ +package org.apache.openjpa.jdbc.sql; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +@Entity +public class SnakeCaseDDLEntity { + @Id + private String fooBar; + + private int thisField; + + public int getThisField() { + return thisField; + } + + public void setThisField(int thisField) { + this.thisField = thisField; + } + + public String getFooBar() { + return fooBar; + } + + public void setFooBar(String fooBar) { + this.fooBar = fooBar; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/SnakeCaseDDLMy2Entity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/SnakeCaseDDLMy2Entity.java new file mode 100644 index 000000000..bfe5362e2 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/SnakeCaseDDLMy2Entity.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +package org.apache.openjpa.jdbc.sql; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +@Entity +public class SnakeCaseDDLMy2Entity { + @Id + private String anotherField; +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDelimitIdentifiers.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDelimitIdentifiers.java index 1ae5ec28c..187fefa11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDelimitIdentifiers.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDelimitIdentifiers.java @@ -24,9 +24,8 @@ import org.apache.openjpa.persistence.PersistenceProviderImpl; import org.apache.openjpa.persistence.PersistenceUnitInfoImpl; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import java.sql.Driver; import java.sql.SQLException; @@ -34,27 +33,12 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import java.io.Serializable; -import java.math.BigDecimal; -import java.math.BigInteger; import java.sql.Connection; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.Statement; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.OffsetDateTime; -import java.time.OffsetTime; -import java.util.ArrayList; -import java.util.Calendar; import java.util.Collection; -import java.util.Date; -import java.util.List; import java.util.Map; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import org.apache.openjpa.persistence.PersistentCollection; public class TestDelimitIdentifiers { @@ -85,7 +69,7 @@ public class TestDelimitIdentifiers { final PersistenceUnitInfoImpl persistenceUnitInfo = new PersistenceUnitInfoImpl(); persistenceUnitInfo.setExcludeUnlistedClasses(true); - persistenceUnitInfo.addManagedClassName(AllFieldTypes.class.getName()); + persistenceUnitInfo.addManagedClassName(DelimitedIdentifiersAllFieldTypesEntity.class.getName()); final BasicDataSource ds = new BasicDataSource(); ds.setDriver(derbyDriver); ds.setUrl("jdbc:derby:memory:TestDelimitIdentifiers;create=true"); @@ -123,8 +107,8 @@ public class TestDelimitIdentifiers { final EntityManagerFactory entityManagerFactory = new PersistenceProviderImpl() .createContainerEntityManagerFactory(persistenceUnitInfo, new HashMap()); try { - final AllFieldTypes entity = new AllFieldTypes(); - final AllFieldTypes entity2 = new AllFieldTypes(); + final DelimitedIdentifiersAllFieldTypesEntity entity = new DelimitedIdentifiersAllFieldTypesEntity(); + final DelimitedIdentifiersAllFieldTypesEntity entity2 = new DelimitedIdentifiersAllFieldTypesEntity(); { final EntityManager em = entityManagerFactory.createEntityManager(); em.getTransaction().begin(); @@ -166,383 +150,4 @@ public class TestDelimitIdentifiers { ds.close(); } - @Entity - public static class AllFieldTypes { - - public enum EnumType { - Value1, Value2 - } - - // @Basic types - private short shortField; - private int intField; - private boolean booleanField; - private long longField; - private float floatField; - private char charField; - private double doubleField; - private byte byteField; - private Short wShortField; - private Integer wIntegerField; - private Boolean wBooleanField; - private Long wLongField; - private Float wFloatField; - private Character wCharacterField; - private Double wDoubleField; - private Byte wByteField; - private BigInteger bigIntegerField; - private BigDecimal bigDecimalField; - private String stringField; - private Date dateField; - private Calendar calendarField; - private java.sql.Date sqlDateField; - private java.sql.Time sqlTimeField; - private java.sql.Timestamp sqlTimestampField; - private byte[] byteLob; - private Byte[] wByteLob; - private char[] charLob; - private Character[] wCharacterLob; - private EnumType enumField; - private Serializable serializableField; - - // Additional types - private Set setOfStrings = new HashSet<>(); - private String[] arrayOfStrings; - - @PersistentCollection - private int[] arrayOfInts; - - // one-to-one and one-to-many relations to self - @OneToOne - private AllFieldTypes selfOneOne; - @OneToMany - private List selfOneMany = new ArrayList<>(); - - // Java8 DateTime types which are required by the JPA-2.2 spec - private LocalDate localDateField; - private LocalTime localTimeField; - private LocalDateTime localDateTimeField; - private OffsetTime offsetTimeField; - private OffsetDateTime offsetDateTimeField; - - public void setShortField(short shortField) { - this.shortField = shortField; - } - - public short getShortField() { - return this.shortField; - } - - public void setIntField(int intField) { - this.intField = intField; - } - - public int getIntField() { - return this.intField; - } - - public void setBooleanField(boolean booleanField) { - this.booleanField = booleanField; - } - - public boolean getBooleanField() { - return this.booleanField; - } - - public void setLongField(long longField) { - this.longField = longField; - } - - public long getLongField() { - return this.longField; - } - - public void setFloatField(float floatField) { - this.floatField = floatField; - } - - public float getFloatField() { - return this.floatField; - } - - public void setCharField(char charField) { - this.charField = charField; - } - - public char getCharField() { - return this.charField; - } - - public void setDoubleField(double doubleField) { - this.doubleField = doubleField; - } - - public double getDoubleField() { - return this.doubleField; - } - - public void setByteField(byte byteField) { - this.byteField = byteField; - } - - public byte getByteField() { - return this.byteField; - } - - public void setStringField(String stringField) { - this.stringField = stringField; - } - - public String getStringField() { - return this.stringField; - } - - public void setDateField(Date dateField) { - this.dateField = dateField; - } - - public Date getDateField() { - return this.dateField; - } - - public void setSetOfStrings(Set setOfStrings) { - this.setOfStrings = setOfStrings; - } - - public Set getSetOfStrings() { - return this.setOfStrings; - } - - public void setArrayOfStrings(String[] arrayOfStrings) { - this.arrayOfStrings = arrayOfStrings; - } - - public String[] getArrayOfStrings() { - return this.arrayOfStrings; - } - - public void setArrayOfInts(int[] arrayOfInts) { - this.arrayOfInts = arrayOfInts; - } - - public int[] getArrayOfInts() { - return arrayOfInts; - } - - public BigDecimal getBigDecimalField() { - return bigDecimalField; - } - - public void setBigDecimalField(BigDecimal bigDecimalField) { - this.bigDecimalField = bigDecimalField; - } - - public BigInteger getBigIntegerField() { - return bigIntegerField; - } - - public void setBigIntegerField(BigInteger bigIntegerField) { - this.bigIntegerField = bigIntegerField; - } - - public byte[] getByteLob() { - return byteLob; - } - - public void setByteLob(byte[] byteLob) { - this.byteLob = byteLob; - } - - public Calendar getCalendarField() { - return calendarField; - } - - public void setCalendarField(Calendar calendarField) { - this.calendarField = calendarField; - } - - public char[] getCharLob() { - return charLob; - } - - public void setCharLob(char[] charLob) { - this.charLob = charLob; - } - - public EnumType getEnumField() { - return enumField; - } - - public void setEnumField(EnumType enumField) { - this.enumField = enumField; - } - - public Serializable getSerializableField() { - return serializableField; - } - - public void setSerializableField(Serializable serializableField) { - this.serializableField = serializableField; - } - - public java.sql.Date getSqlDateField() { - return sqlDateField; - } - - public void setSqlDateField(java.sql.Date sqlDateField) { - this.sqlDateField = sqlDateField; - } - - public java.sql.Time getSqlTimeField() { - return sqlTimeField; - } - - public void setSqlTimeField(java.sql.Time sqlTimeField) { - this.sqlTimeField = sqlTimeField; - } - - public java.sql.Timestamp getSqlTimestampField() { - return sqlTimestampField; - } - - public void setSqlTimestampField(java.sql.Timestamp sqlTimestampField) { - this.sqlTimestampField = sqlTimestampField; - } - - public Boolean getWBooleanField() { - return wBooleanField; - } - - public void setWBooleanField(Boolean booleanField) { - wBooleanField = booleanField; - } - - public Byte getWByteField() { - return wByteField; - } - - public void setWByteField(Byte byteField) { - wByteField = byteField; - } - - public Byte[] getWByteLob() { - return wByteLob; - } - - public void setWByteLob(Byte[] byteLob) { - wByteLob = byteLob; - } - - public Character getWCharacterField() { - return wCharacterField; - } - - public void setWCharacterField(Character characterField) { - wCharacterField = characterField; - } - - public Character[] getWCharacterLob() { - return wCharacterLob; - } - - public void setWCharacterLob(Character[] characterLob) { - wCharacterLob = characterLob; - } - - public Double getWDoubleField() { - return wDoubleField; - } - - public void setWDoubleField(Double doubleField) { - wDoubleField = doubleField; - } - - public Float getWFloatField() { - return wFloatField; - } - - public void setWFloatField(Float floatField) { - wFloatField = floatField; - } - - public Integer getWIntegerField() { - return wIntegerField; - } - - public void setWIntegerField(Integer integerField) { - wIntegerField = integerField; - } - - public Long getWLongField() { - return wLongField; - } - - public void setWLongField(Long longField) { - wLongField = longField; - } - - public Short getWShortField() { - return wShortField; - } - - public void setWShortField(Short shortField) { - wShortField = shortField; - } - - public AllFieldTypes getSelfOneOne() { - return selfOneOne; - } - - public void setSelfOneOne(AllFieldTypes selfOneOne) { - this.selfOneOne = selfOneOne; - } - - public List getSelfOneMany() { - return selfOneMany; - } - - public void setSelfOneMany(List selfOneMany) { - this.selfOneMany = selfOneMany; - } - - public LocalDate getLocalDateField() { - return localDateField; - } - - public void setLocalDateField(LocalDate localDateField) { - this.localDateField = localDateField; - } - - public LocalTime getLocalTimeField() { - return localTimeField; - } - - public void setLocalTimeField(LocalTime localTimeField) { - this.localTimeField = localTimeField; - } - - public LocalDateTime getLocalDateTimeField() { - return localDateTimeField; - } - - public void setLocalDateTimeField(LocalDateTime localDateTimeField) { - this.localDateTimeField = localDateTimeField; - } - - public OffsetTime getOffsetTimeField() { - return offsetTimeField; - } - - public void setOffsetTimeField(OffsetTime offsetTimeField) { - this.offsetTimeField = offsetTimeField; - } - - public OffsetDateTime getOffsetDateTimeField() { - return offsetDateTimeField; - } - - public void setOffsetDateTimeField(OffsetDateTime offsetDateTimeField) { - this.offsetDateTimeField = offsetDateTimeField; - } - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java index ac36b1f1c..35d7c8329 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java @@ -23,10 +23,9 @@ import org.apache.openjpa.persistence.PersistenceProviderImpl; import org.apache.openjpa.persistence.PersistenceUnitInfoImpl; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; + import java.sql.Connection; import java.sql.Driver; import java.sql.ResultSet; @@ -63,8 +62,8 @@ public class TestSnakeCaseDDL { final PersistenceUnitInfoImpl persistenceUnitInfo = new PersistenceUnitInfoImpl(); persistenceUnitInfo.setExcludeUnlistedClasses(true); - persistenceUnitInfo.addManagedClassName(MyEntity1.class.getName()); - persistenceUnitInfo.addManagedClassName(MyEntity2.class.getName()); + persistenceUnitInfo.addManagedClassName(SnakeCaseDDLEntity.class.getName()); + persistenceUnitInfo.addManagedClassName(SnakeCaseDDLMy2Entity.class.getName()); final BasicDataSource ds = new BasicDataSource(); ds.setDriver(derbyDriver); ds.setUrl("jdbc:derby:memory:ddlInSnakeCase;create=true"); @@ -101,7 +100,7 @@ public class TestSnakeCaseDDL { final EntityManager em = entityManagerFactory.createEntityManager(); em.getTransaction().begin(); try { - final MyEntity1 entity = new MyEntity1(); + final SnakeCaseDDLEntity entity = new SnakeCaseDDLEntity(); entity.setFooBar("1"); entity.setThisField(123); em.persist(entity); @@ -118,7 +117,7 @@ public class TestSnakeCaseDDL { { final EntityManager em = entityManagerFactory.createEntityManager(); try { - final MyEntity1 myEntity1 = em.find(MyEntity1.class, "1"); + final SnakeCaseDDLEntity myEntity1 = em.find(SnakeCaseDDLEntity.class, "1"); assertNotNull(myEntity1); assertEquals("1", myEntity1.getFooBar()); assertEquals(123, myEntity1.getThisField()); @@ -144,33 +143,4 @@ public class TestSnakeCaseDDL { assertEquals(singleton("ANOTHER_FIELD"), columns.get("TestSnakeCaseDDL$MyEntity2")); } - @Entity - public static class MyEntity1 { - @Id - private String fooBar; - - private int thisField; - - public int getThisField() { - return thisField; - } - - public void setThisField(int thisField) { - this.thisField = thisField; - } - - public String getFooBar() { - return fooBar; - } - - public void setFooBar(String fooBar) { - this.fooBar = fooBar; - } - } - - @Entity - public static class MyEntity2 { - @Id - private String anotherField; - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/BadVersionFieldEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/BadVersionFieldEntity.java new file mode 100644 index 000000000..22a472ba6 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/BadVersionFieldEntity.java @@ -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. + */ +package org.apache.openjpa.jira1100; + +import java.math.BigDecimal; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; + +/** + * Declares a Version field of unsupported type. + */ +@Entity +@Table(name = "BadVersionField") +public class BadVersionFieldEntity { + @Id + @GeneratedValue + private long id; + + @Version + private BigDecimal version; + + public long getId() { + return id; + } + + public BigDecimal getVersion() { + return version; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java index 2f3bb10df..3ae573586 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java @@ -18,14 +18,7 @@ */ package org.apache.openjpa.jira1100; -import java.math.BigDecimal; - -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; @@ -43,7 +36,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase; public class TestBadVersionField extends SingleEMFTestCase { @Override public void setUp() { - super.setUp(CLEAR_TABLES, Data.class); + super.setUp(CLEAR_TABLES, BadVersionFieldEntity.class); } public void testWrongVersionFieldNotSupported() { @@ -55,27 +48,4 @@ public class TestBadVersionField extends SingleEMFTestCase { } } - /** - * Declares a Version field of unsupported type. - * - */ - @Entity - @Table(name="BadVersionField") - public class Data { - @Id - @GeneratedValue - private long id; - - @Version - private BigDecimal version; - - public long getId() { - return id; - } - - public BigDecimal getVersion() { - return version; - } - } - } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity.java index ccb58dbb2..98e73d220 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity.java @@ -20,10 +20,10 @@ package org.apache.openjpa.jira1794; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "j1794_ae") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity_.java index 495581940..f40682524 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/AggEntity_.java @@ -22,9 +22,9 @@ **/ package org.apache.openjpa.jira1794; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.jira1794.AggEntity.class) public class AggEntity_ { public static volatile SingularAttribute pshortVal; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/TestAggregateFunctions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/TestAggregateFunctions.java index 71af87c22..ed8feec42 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/TestAggregateFunctions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1794/TestAggregateFunctions.java @@ -20,16 +20,16 @@ package org.apache.openjpa.jira1794; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira2780/TestJira2780ReverseCustomizer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira2780/TestJira2780ReverseCustomizer.java index cfeefd944..ccc5d8d35 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira2780/TestJira2780ReverseCustomizer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira2780/TestJira2780ReverseCustomizer.java @@ -23,8 +23,8 @@ import java.io.FileNotFoundException; import java.util.Properties; import java.util.Scanner; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ReverseMappingTool; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/OracleGeneratedIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/OracleGeneratedIdEntity.java new file mode 100644 index 000000000..d63f2e556 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/OracleGeneratedIdEntity.java @@ -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. + */ +package org.apache.openjpa.jira_2883; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +/** + * Declares a Version field of unsupported type. + */ +@Entity +@Table(name = "GeneratedId") +public class OracleGeneratedIdEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "value") + private String value; + + public long getId() { + return id; + } + + public String getValue() { + return value; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/TestOracleGeneratedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/TestOracleGeneratedId.java index 3f4eefccd..5359a3e2d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/TestOracleGeneratedId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira_2883/TestOracleGeneratedId.java @@ -18,13 +18,7 @@ */ package org.apache.openjpa.jira_2883; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.test.DatabasePlatform; @@ -40,7 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase; public class TestOracleGeneratedId extends SingleEMFTestCase { @Override public void setUp() { - super.setUp(CLEAR_TABLES, OraGenIdData.class, + super.setUp(CLEAR_TABLES, OracleGeneratedIdEntity.class, "openjpa.jdbc.DBDictionary", "oracle(UseTriggersForAutoAssign=true, MaxAutoAssignNameLength=28, BatchLimit=100)"); } @@ -57,27 +51,4 @@ public class TestOracleGeneratedId extends SingleEMFTestCase { } } - /** - * Declares a Version field of unsupported type. - * - */ - @Entity - @Table(name="GeneratedId") - public class OraGenIdData { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private long id; - - @Column(name = "value") - private String value; - - public long getId() { - return id; - } - - public String getValue() { - return value; - } - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/ContainerTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/ContainerTest.java index 50f2bb2dc..c9a2856c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/ContainerTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/ContainerTest.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.jta; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.ee.ManagedRuntime; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java index c2ee30f0f..ca5f2a5a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.jta; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.apache.openjpa.ee.ManagedRuntime; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java index 71974f6ea..a97468156 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java @@ -23,13 +23,13 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAResource; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java index 79ac5a2d6..88c1efec2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.jta; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; /** * A very simple Transaction Manager for testing JTA resource without a container. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java index f184ece13..48b5d1136 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java @@ -27,7 +27,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.event.AbstractLifecycleListener; import org.apache.openjpa.event.AbstractTransactionListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java index 025679e16..a981c382f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.kernel; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.apache.openjpa.event.BrokerFactoryEvent; import org.apache.openjpa.event.BrokerFactoryListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java index 0caf2440e..a803f7dc0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.event.AbstractLifecycleListener; import org.apache.openjpa.event.AbstractTransactionListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java index 20177e166..7bc9aed77 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java @@ -20,7 +20,7 @@ package org.apache.openjpa.kernel; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.ManagedClassSubclasser; import org.apache.openjpa.enhance.PersistenceCapable; @@ -64,7 +64,7 @@ public class TestDynamicClassRegistration JPAFacadeHelper.getMetaData(emf1, SimpleEntity.class); assertNotNull(meta); EntityManager em = emf1.createEntityManager(); - javax.persistence.Query q = em.createQuery("select o from simple o"); + jakarta.persistence.Query q = em.createQuery("select o from simple o"); em.close(); } @@ -82,7 +82,7 @@ public class TestDynamicClassRegistration JPAFacadeHelper.getMetaData(emf1, UnenhancedFieldAccess.class); assertNotNull(meta); EntityManager em = emf1.createEntityManager(); - javax.persistence.Query q = em.createQuery( + jakarta.persistence.Query q = em.createQuery( "select o from UnenhancedFieldAccess o"); em.close(); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java index 5b9c930a7..92628c6a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java @@ -21,8 +21,8 @@ package org.apache.openjpa.kernel; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java index 2d497cff2..49a714f85 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java @@ -21,7 +21,7 @@ package org.apache.openjpa.kernel; import java.util.HashMap; import java.util.Map; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.apache.openjpa.kernel.QueryImpl.Compilation; import org.apache.openjpa.kernel.jpql.JPQLExpressionBuilder.ParsedJPQL; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java index b2cf3875c..f75839ff3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java @@ -20,8 +20,8 @@ package org.apache.openjpa.lib.conf; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -31,7 +31,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase; /** * Tests that configuration properties can be specified both as new - * javax.persistence.* namespace and old openjpa.* namespace. The two style can + * jakarta.persistence.* namespace and old openjpa.* namespace. The two style can * also be mixed where one property is in javax.* namespace the other in * openjpa.*. But same property can not be specified in both style. * @@ -52,9 +52,9 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase { private static final String OLD_STYLE_DRIVER_KEY = "openjpa.ConnectionDriverName"; private static final String NEW_STYLE_DRIVER_KEY = - "javax.persistence.jdbc.driver"; + "jakarta.persistence.jdbc.driver"; private static final String NEW_STYLE_URL_KEY = - "javax.persistence.jdbc.url"; + "jakarta.persistence.jdbc.url"; private static final String[] KEYS = { OLD_STYLE_DRIVER_KEY, OLD_STYLE_URL_KEY, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/A.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/A.java index f6b9a378d..844960627 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/A.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/A.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="meta_A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java index bda50053d..74422ee1a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractThing { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java index c7fdeb224..2d1fb745f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Artist extends Person { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java index 9dcabd811..abd170916 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java @@ -20,9 +20,9 @@ package org.apache.openjpa.meta; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="meta_B") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java index 3a3276a69..1a8fd2b15 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.meta.C.Identity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java index 3ff7b9e0d..edd653873 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java @@ -20,12 +20,12 @@ package org.apache.openjpa.meta; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="META_ITEM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChild.java index 4b0de4f5a..75f826889 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChild.java @@ -36,11 +36,11 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class PChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChildBi.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChildBi.java index f51610696..2e5a9d28b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChildBi.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/PChildBi.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class PChildBi { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java index 081be1549..f59e247ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Painter extends Artist { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Parent.java index 517b0ff0d..9ab8675fb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Parent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Parent.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.meta; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; @Entity(name="META_PARENT") @SecondaryTable(name = "ParentSecondaryTable", pkJoinColumns = diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java index b68ac4c03..abe37de30 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java @@ -21,9 +21,9 @@ package org.apache.openjpa.meta; import java.io.Serializable; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Person implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java index 821b08613..1adb49943 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java @@ -22,11 +22,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/User2018.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/User2018.java index 18f988e5b..5cf6c8379 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/User2018.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/User2018.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.openjpa2018; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class User2018 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java index e359b4c90..c43d39984 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="COUNTRY1") public class Country { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java index 64040152e..b54501a0b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java @@ -17,7 +17,7 @@ * under the License. */ package org.apache.openjpa.persistence; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Embed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Issue428Entity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Issue428Entity.java index f9349afae..cc02472d3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Issue428Entity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Issue428Entity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "ISSUE_428_ENTITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java index 008b1a2e2..a93307f1d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java @@ -17,14 +17,14 @@ * under the License. */ package org.apache.openjpa.persistence; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="SECURITY1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java index 85e83f585..f0301623a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.EntityManager; -import javax.persistence.spi.LoadState; +import jakarta.persistence.EntityManager; +import jakarta.persistence.spi.LoadState; import org.apache.openjpa.persistence.entity.EntityA; import org.apache.openjpa.persistence.entity.EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java index b6fe689e9..1617088f0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DerbyDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java index 6b5a5fa36..27784f8ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.kernel.QueryHints; import org.apache.openjpa.meta.QueryMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java index 7f38b685c..17edd1102 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java index 516a1f7a1..33f40d33e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; @MappedSuperclass @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java index 20f28fbd5..0b96a0b7c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.persistence.access; -import static javax.persistence.AccessType.FIELD; -import static javax.persistence.AccessType.PROPERTY; +import static jakarta.persistence.AccessType.FIELD; +import static jakarta.persistence.AccessType.PROPERTY; -import javax.persistence.Access; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @Entity(name="DFMPA") @Access(value=FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java index 04bd92298..8c44335a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.persistence.access; -import static javax.persistence.AccessType.FIELD; -import static javax.persistence.AccessType.PROPERTY; +import static jakarta.persistence.AccessType.FIELD; +import static jakarta.persistence.AccessType.PROPERTY; -import javax.persistence.Access; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @Entity(name="DPMFA") @Access(value=PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java index d82d210a2..56da79e5f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; @Access(AccessType.FIELD) @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java index 28818fb64..4dfd23cd2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; @Embeddable @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java index 669a51c74..35abe9774 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Access(AccessType.PROPERTY) @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java index 535e680c9..b87c1ddda 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; @Access(AccessType.PROPERTY) @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java index 543cf70c9..6e6f64b31 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; @Access(AccessType.FIELD) @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java index d3397899f..766aef1df 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; @Access(AccessType.PROPERTY) @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java index 09654f1f0..7e64b4632 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import static javax.persistence.AccessType.FIELD; +import static jakarta.persistence.AccessType.FIELD; -import javax.persistence.Access; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Version; @Entity @Access(value=FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java index cb03fc0ba..dd898f941 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java @@ -20,20 +20,20 @@ package org.apache.openjpa.persistence.access; import java.util.Collection; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java index 6b10a518c..669d15678 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java index 25ab6084d..4f37599af 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java index 24021ad79..1cfc8568e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java index 8bf91c833..02755d5af 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Ingredient.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Ingredient.java index 75692157c..663397769 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Ingredient.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Ingredient.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Transient; @Embeddable @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedCallbackSup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedCallbackSup.java index 8da1df986..c64e8fd45 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedCallbackSup.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedCallbackSup.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; /* * Mapped superclass which contains no persistent attributes, but contains diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java index eb81c1f33..c57e0e43a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; @MappedSuperclass @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java index 920ebed57..c5c3c3ec4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MenuItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MenuItem.java index e1efc1b54..0b7292212 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MenuItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MenuItem.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.access; import java.util.Map; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; @Access(AccessType.PROPERTY) @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java index f29c5563d..0d40362bb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java index a04a33d3c..821c53596 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; @MappedSuperclass @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java index 61756d147..fab6aa57e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java index ab6252c75..772879aa1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; @Entity @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java index 4291646b2..917bb6e2b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.access; -import static javax.persistence.AccessType.PROPERTY; +import static jakarta.persistence.AccessType.PROPERTY; -import javax.persistence.Access; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Version; @Entity @Access(value=PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java index 6e2acec9f..500935996 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java @@ -20,20 +20,20 @@ package org.apache.openjpa.persistence.access; import java.util.Collection; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java index 38b11efd1..a38191111 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEntity.java index cdab5a60e..f844f0920 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class PropEntity extends MappedCallbackSup { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java index b22e4bf89..5ddc53d58 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalization.java index 8281172b1..ba1549390 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalization.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalization.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "CAPITALIZATION_TABLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalizationOldBehavior.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalizationOldBehavior.java index bedbe4928..eed57312d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalizationOldBehavior.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertyAccessCapitalizationOldBehavior.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "CAPITALIZATION_OLD_BEHAVIOR_TABLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java index 384a5d8c2..68aea575d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java index 3708e0734..6259eb6c2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java index 3f02031e7..ebcffd3fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.access; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Access(AccessType.PROPERTY) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Quantity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Quantity.java index 0812a0ff2..47befe6a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Quantity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/Quantity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; @Embeddable @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java index c3f19ea5f..c232d30ed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; @Entity @Inheritance diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java index 0bfca3ce3..aa91e7259 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; @Entity @Inheritance diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java index e319dcba3..b95898f4d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.access; import java.util.Random; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java index d019f74e7..1085651f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.meta.AccessCode; import org.apache.openjpa.meta.ClassMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java index 4c29bc445..946968d10 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.access; import java.util.Random; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java index 7d047b087..6b19cd093 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.access.xml; import java.util.Date; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EmbedB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EmbedB.java index f4259f785..7d2f9ddee 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EmbedB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EmbedB.java @@ -17,9 +17,9 @@ * under the License. */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class PColl_EmbedB { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java index 5ff3e4863..37d6bdc17 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.annotations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java index 6573f4878..8435108b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.annotations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityB.java index 3a133de41..06571fc96 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityB.java @@ -17,9 +17,9 @@ * under the License. */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class PColl_EntityB { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java index 546a3c33d..807d02169 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java index ce2d32106..c89d7441a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.annotations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java index a76306e1b..f17c9ddbc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.annotations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java index 230004a2b..ea71d958b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java index 73b364a10..95989d6c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.InheritanceType; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java index ac66db786..b9849d910 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Generator; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java index 1e44675d4..ea19f6704 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.MapKey; +import jakarta.persistence.MapKey; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java index 6bdafd933..98b60aafe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.annotations; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java index a9c19dc04..7a9127b57 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.annotations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java index 84512c58b..b8691791b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java @@ -24,31 +24,31 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ElementJoinColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java index 7e19661da..89b8c3474 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java @@ -24,23 +24,23 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "ANNOTEST2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java index e88efce91..06e483fa0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java @@ -19,15 +19,15 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.Table; @Entity @DiscriminatorValue("ANNO3") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java index 2460e395e..b67e08028 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.PrePersist; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.PrePersist; @Entity @ExcludeSuperclassListeners diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java index d97103f48..bd2548ee5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; public class DateValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java index d1fcc0c7c..836034284 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; public class DefaultCallbackListener { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java index e26defb65..aadcb824a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java @@ -19,18 +19,18 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.AssociationOverride; -import javax.persistence.AttributeOverride; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.SqlResultSetMapping; @Entity @SqlResultSetMapping(name = "EmbedMapping", entities = { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java index 3d20caff5..0ab3f24d5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; @Embeddable public class EmbedValue { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java index 75c58d4db..cf1cb2969 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * Same as EmbedValue but no blobs for suitable use as key/value/element diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java index 672f6a7eb..b250faa95 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @MappedSuperclass public class EmbeddableSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java index a90a9d9ed..9921d9cdd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorColumn(name = "DISC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java index b123a8356..bc7d5e08e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.GeneratedValue; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.GeneratedValue; @Embeddable public class EmbeddedIdClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java index 5934ac10f..59f00212c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java @@ -19,16 +19,16 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @Entity @Table(name = "EMIDENTITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java index 6157645e9..a4a044de3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java @@ -19,18 +19,18 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostUpdate; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.Transient; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java index 8200dc980..6a4add69d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java @@ -21,18 +21,18 @@ package import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java index 49e3995f3..d248086ee 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java @@ -21,12 +21,12 @@ package import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; //@Entity(name="entity2ExplicitName") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java index da2e0ff28..7c726127c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java @@ -19,14 +19,14 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java index 52a93ec33..e0743d42e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class Flat2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java index 166781838..fb560a1f7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java @@ -22,13 +22,13 @@ package import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; @Entity @DiscriminatorValue("fsched") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java index c7415d360..01830bce3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java @@ -21,13 +21,13 @@ package import java.util.StringTokenizer; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.TableGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.TableGenerator; @Entity // non-psql/ora dbs cause issues with SequenceGenerator in auto-mapping diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java index 7d09d1d31..5c9c523f0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; public class LongNameValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java index 3d1919937..6d329d58d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; public class NameValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java index 56b2aa5e7..e8ab8cebc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java @@ -22,12 +22,12 @@ package import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java index 4c630a636..6122c4d56 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java @@ -21,9 +21,9 @@ package import java.util.Date; -import javax.persistence.Id; +import jakarta.persistence.Id; -@javax.persistence.MappedSuperclass +@jakarta.persistence.MappedSuperclass public class Party { @Id diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java index 25de34875..cb5277b17 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java @@ -21,12 +21,12 @@ package import java.util.Date; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; -@javax.persistence.MappedSuperclass +@jakarta.persistence.MappedSuperclass @Inheritance(strategy=InheritanceType.JOINED) @IdClass(PartyId.class) public class Party1 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java index 496745ac4..9d9f06804 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Entity test object that uses property access mode. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java index 2e2aadcfd..d0123450b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java @@ -22,17 +22,17 @@ package import java.util.Calendar; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java index 1bd2316c5..bcee115dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java @@ -21,11 +21,11 @@ package import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "Site") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java index 7e23a8037..1b2a8758f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java @@ -21,11 +21,11 @@ package import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "Site1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java index f4746012e..384a0b097 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "Store") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java index 9ff03d1cd..5b9114c05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "Store1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java index 0ff97be62..178d51564 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; public class StringValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java index 2f7eb7a38..6e0e27dcf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java @@ -19,15 +19,15 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java index 084c83352..86d6d4584 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class TablePerClass2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java index e54edd45d..0ef4f50f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java @@ -21,14 +21,14 @@ package import java.util.ArrayList; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostRemove; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostRemove; +import jakarta.persistence.Table; @Entity @Table(name="TX_ROLLBACK_ENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java index cdff61c4a..58a6de306 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.PrePersist; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.PrePersist; @Entity @ExcludeSuperclassListeners diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java index 25dd0ee30..b99b66a71 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; public class DateValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java index ce183ede1..4e432ef79 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java @@ -18,18 +18,18 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostUpdate; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.Transient; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java index 6b5631b5e..25c0568fb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java @@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java index df0068c70..7306bf133 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; //@Entity(name="entity2ExplicitName") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java index fc2efa94e..9df9bfac1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; @Entity @DiscriminatorValue("fsched") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java index 77ea14d50..b1811a2f5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class LifeCycleDDEntity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java index be28f53b5..0510d77f8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; @Entity public class LifeCycleDDEntity2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java index 4ba6c976f..e6d62d9dd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("SUB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java index ae8eb758e..182d8ca82 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; public class LongNameValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java index 8153d37bb..548d6ca4a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; public class NameValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java index 4e373dd1e..04052a5f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; import java.util.Calendar; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity //@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java index 1447faab2..bc52a5cfb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; public class StringValidator { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java index 14c557e10..4a47af5a3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype; import java.util.ArrayList; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostRemove; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostRemove; +import jakarta.persistence.Table; @Entity @Table(name="TX_ROLLBACK_ENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedA.java index 669f8ee57..2e81c70dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedA.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.annotations.xml; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; /** * Used to test effect of metadata-complete tag. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedB.java index f8003d758..4e066a0fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/DerivedB.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.annotations.xml; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * Used to test effect of metadata-complete tag. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityA.java index 829eba088..45cb92a3d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityA.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.annotations.xml; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Used to test effect of metadata-complete tag. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityB.java index 38686926c..73f47cd27 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/EntityB.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.annotations.xml; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedQuery; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedQuery; /** * Used to test effect of metadata-complete tag. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java index 5c39699a8..97ecd9b52 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.arrays; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.arrays.model.AnnoExceptionEntity; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestXMLExceptionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestXMLExceptionEntity.java index 200501f57..9f94d8878 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestXMLExceptionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestXMLExceptionEntity.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.arrays; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.arrays.model.XMLExceptionEntity; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/model/AnnoExceptionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/model/AnnoExceptionEntity.java index c8107030a..7a0f279c8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/model/AnnoExceptionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/model/AnnoExceptionEntity.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.arrays.model; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java index ad1e07eac..4f6a36ecd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.batch.exception; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Ent1 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java index b129ac357..58e19adf5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.batch.exception; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/BlobEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/BlobEntity.java index 6163e3b61..ab0fb5103 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/BlobEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/BlobEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.blob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; @Entity public class BlobEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java index ad0b7d866..fa7e11585 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java @@ -20,9 +20,9 @@ import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.persistence.query.QueryBuilder; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/BlobColumnEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/BlobColumnEntity.java index ecbf8f4b2..314cb92d9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/BlobColumnEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/BlobColumnEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.blob.mysql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; @Entity public class BlobColumnEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/ClobColumnEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/ClobColumnEntity.java index d8d4b114f..41593953e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/ClobColumnEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/ClobColumnEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.blob.mysql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; @Entity public class ClobColumnEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java index 89ef96d96..7b57a1e50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.List; -import javax.persistence.Cache; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.EntityManager; +import jakarta.persistence.Cache; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheTestCase.java index 2d7b5c6d7..3e06d80c4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheTestCase.java @@ -22,7 +22,7 @@ import java.lang.reflect.Modifier; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -38,8 +38,8 @@ import org.apache.openjpa.persistence.cache.jpa.model.XmlUncacheableEntity; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; public abstract class AbstractCacheTestCase extends AbstractPersistenceTestCase { - protected final String RETRIEVE_MODE_PROP = "javax.persistence.cache.retrieveMode"; - protected final String STORE_MODE_PROP = "javax.persistence.cache.storeMode"; + protected final String RETRIEVE_MODE_PROP = "jakarta.persistence.cache.retrieveMode"; + protected final String STORE_MODE_PROP = "jakarta.persistence.cache.storeMode"; protected static OpenJPAEntityManagerFactorySPI emf = null; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java index 6609801c0..092c7c264 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.datacache.ConcurrentDataCache; import org.apache.openjpa.lib.jdbc.JDBCListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java index bde4b0e5c..f97ad41b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelectiveInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelectiveInheritance.java index e3e8bae7c..0e1598ce7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelectiveInheritance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelectiveInheritance.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.cache.jpa; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.cache.jpa.model.ChildUncacheable; import org.apache.openjpa.persistence.cache.jpa.model.ParentUnspecifiedEntity; @@ -35,7 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase; public class TestCacheModeDisableSelectiveInheritance extends SingleEMFTestCase { Object[] params = new Object[] { ChildUncacheable.class, ParentUnspecifiedEntity.class, CLEAR_TABLES, - "javax.persistence.sharedCache.mode", "DISABLE_SELECTIVE", "openjpa.DataCache", "true" }; + "jakarta.persistence.sharedCache.mode", "DISABLE_SELECTIVE", "openjpa.DataCache", "true" }; @Override public void setUp() throws Exception { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java index cc30614fa..e1cd94860 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java index 8c1d468f4..456f1cd41 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java index dc4540be5..88490fae2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java index 8fb3f2586..43422f022 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java index db2d3045c..fcaac592e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java index 8c6c59a32..96bf04ed5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.cache.jpa; import java.util.Random; -import javax.persistence.Cache; -import javax.persistence.CacheStoreMode; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityNotFoundException; -import javax.persistence.LockModeType; +import jakarta.persistence.Cache; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.LockModeType; import org.apache.openjpa.persistence.cache.jpa.model.CacheableEntity; import org.apache.openjpa.persistence.test.SingleEMFTestCase; @@ -46,7 +46,7 @@ public class TestMultiEMFCacheModes extends SingleEMFTestCase { /** * Verifies that the data cache us updated via a em.refresh operation when - * javax.persistence.cache.storeMode = CacheStoreMode.REFRESH and the + * jakarta.persistence.cache.storeMode = CacheStoreMode.REFRESH and the * entity is updated in the database. */ public void testCacheRefreshModeRefresh() { @@ -94,7 +94,7 @@ public class TestMultiEMFCacheModes extends SingleEMFTestCase { // Refresh the entity - this will load the entity into the L1 and with storeMode=REFRESH, // should also refresh it in the L2 java.util.Map cacheStoreModeMap = new java.util.HashMap<>(); - cacheStoreModeMap.put("javax.persistence.cache.storeMode", CacheStoreMode.REFRESH); + cacheStoreModeMap.put("jakarta.persistence.cache.storeMode", CacheStoreMode.REFRESH); em.refresh(ce, cacheStoreModeMap); // Verify the entity was updated @@ -123,7 +123,7 @@ public class TestMultiEMFCacheModes extends SingleEMFTestCase { /** * Verifies that the data cache us updated via a em.refresh operation when - * javax.persistence.cache.storeMode = CacheStoreMode.REFRESH and the + * jakarta.persistence.cache.storeMode = CacheStoreMode.REFRESH and the * record is removed from the database. */ public void testCacheRefreshModeRefreshDelete() { @@ -169,7 +169,7 @@ public class TestMultiEMFCacheModes extends SingleEMFTestCase { // Refresh the entity with storeMode=REFRESH. The entity has been deleted so it will be // purged from the L2 cache when the DB load fails. java.util.Map cacheStoreModeMap = new java.util.HashMap<>(); - cacheStoreModeMap.put("javax.persistence.cache.storeMode", CacheStoreMode.REFRESH); + cacheStoreModeMap.put("jakarta.persistence.cache.storeMode", CacheStoreMode.REFRESH); try { em.refresh(ce, cacheStoreModeMap); fail("Refresh operation should have thrown an exception"); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java index 3fd74d67b..c4b9177c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -42,7 +42,7 @@ public class TestPropertyCacheModeAll extends AbstractCacheModeTestCase { public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() { if (emf == null) { Map propertyMap = new HashMap<>(); - propertyMap.put("javax.persistence.sharedCache.mode", "ALL"); + propertyMap.put("jakarta.persistence.sharedCache.mode", "ALL"); emf = createEntityManagerFactory("cache-mode-empty",propertyMap); assertNotNull(emf); cache = emf.getCache(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java index edbba459e..3e52eb85b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -50,7 +50,7 @@ public class TestPropertyCacheModeDisableSelective extends AbstractCacheModeTest public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() { if (emf == null) { Map propertyMap = new HashMap<>(); - propertyMap.put("javax.persistence.sharedCache.mode", "DISABLE_SELECTIVE"); + propertyMap.put("jakarta.persistence.sharedCache.mode", "DISABLE_SELECTIVE"); emf = createEntityManagerFactory("cache-mode-empty", propertyMap); assertNotNull(emf); cache = emf.getCache(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java index 0290e7242..7d395ec82 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -50,7 +50,7 @@ public class TestPropertyCacheModeEnableSelective extends AbstractCacheModeTestC public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() { if (emf == null) { Map propertyMap = new HashMap<>(); - propertyMap.put("javax.persistence.sharedCache.mode", "ENABLE_SELECTIVE"); + propertyMap.put("jakarta.persistence.sharedCache.mode", "ENABLE_SELECTIVE"); emf = createEntityManagerFactory("cache-mode-empty", propertyMap); assertNotNull(emf); cache = emf.getCache(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java index bca0b095c..43ec7329c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java @@ -34,13 +34,13 @@ public class TestPropertyCacheModeInvalid extends AbstractCacheTestCase { boolean exceptionCaught = false; try { Map propertyMap = new HashMap<>(); - propertyMap.put("javax.persistence.sharedCache.mode", "INVALID"); + propertyMap.put("jakarta.persistence.sharedCache.mode", "INVALID"); emf = createEntityManagerFactory("cache-mode-empty",propertyMap); } catch (Throwable e) { exceptionCaught = true; assertException(e, java.lang.IllegalArgumentException.class); String msg = e.getMessage(); - assertTrue(msg.contains("javax.persistence.SharedCacheMode.INVALID")); + assertTrue(msg.contains("jakarta.persistence.SharedCacheMode.INVALID")); } assertTrue(exceptionCaught); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java index 1d8f70a29..e574bd7b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -42,7 +42,7 @@ public class TestPropertyCacheModeNone extends AbstractCacheModeTestCase { public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() { if (emf == null) { Map propertyMap = new HashMap<>(); - propertyMap.put("javax.persistence.sharedCache.mode", "NONE"); + propertyMap.put("jakarta.persistence.sharedCache.mode", "NONE"); emf = createEntityManagerFactory("cache-mode-empty", propertyMap); assertNotNull(emf); cache = emf.getCache(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java index d7ea867bf..48554a70c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -45,7 +45,7 @@ public class TestPropertyCacheModeUnspecified extends AbstractCacheModeTestCase public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() { if (emf == null) { Map propertyMap = new HashMap<>(); - propertyMap.put("javax.persistence.sharedCache.mode", "UNSPECIFIED"); + propertyMap.put("jakarta.persistence.sharedCache.mode", "UNSPECIFIED"); emf = createEntityManagerFactory("cache-mode-empty", propertyMap); assertNotNull(emf); cache = emf.getCache(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java index 454b7280d..d81cea1f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity @Cacheable(true) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ChildUncacheable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ChildUncacheable.java index 3bc88b6cf..3c99f3bc4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ChildUncacheable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ChildUncacheable.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Basic; -import javax.persistence.Cacheable; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; @Entity @Cacheable(value = false) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java index be75edfbb..cbea32952 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Extends CacheableEntity but the cachable attribute will be negated by XML diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java index 0234717d6..13e7a1ba1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Extends UncacheableEntity but the cachable attribute will be negated by XML diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ParentUnspecifiedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ParentUnspecifiedEntity.java index 15d70b8b2..ba4680e1c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ParentUnspecifiedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/ParentUnspecifiedEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class ParentUnspecifiedEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java index cc3fae863..216590077 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity @Cacheable(false) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java index 2f760958a..d8055c880 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class UnspecifiedEntity implements CacheEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java index f7df2ecb0..33116e844 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Cacheable setting will be provided by XML descriptor. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java index 55cbe6f3e..851a094c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.cache.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Cacheable setting will be provided by XML descriptor. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java index 110595992..206563280 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class AddListenerEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java index 0180c0d31..e16462252 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity @EntityListeners(value = {ListenerImpl.class, ListenerImpl.class}) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java index a9e310b4a..c0bbdec8c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity @EntityListeners(value = ListenerImpl.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java index 9b0a59556..594686a96 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.EntityListeners; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @EntityListeners({ListenerImpl.class}) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java index 5b3717d4f..c3f040e53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java @@ -18,18 +18,18 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @Entity public class ExceptionsFromCallbacksEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java index 094c3328b..133238b33 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class GlobalListenerEntity implements ListenerTestEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java index c83c27299..17cb5f951 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; public class ListenerImpl { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java index 60bbe9011..9e2c1f052 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; @Entity public class ListenerInEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java index 5ad4d247d..34d1fad6d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class MSCListenerEntity extends EntityListenerMappedSuperClass implements ListenerTestEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/Message.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/Message.java index e5151b9ab..94e3eabae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/Message.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/Message.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.callbacks; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * A very simple persistent entity that holds a "message", has a "created" field diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java index 61fc218ad..fd02784cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.callbacks; import java.util.Date; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; public class MessageListenerImpl { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java index 7e9464245..3a89ef644 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerImpl.java index 34e2c6e31..dd5dae193 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerImpl.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.PostLoad; +import jakarta.persistence.PostLoad; /** * JPA Listener which maintains changelog information of the {@link PostLoadListenerEntity}. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostPersistEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostPersistEntity.java index 11df1e69e..67f031697 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostPersistEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostPersistEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostPersist; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostPersist; /** * A persistent entity to test that when PostPersist callback is invoked can diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java index 94c00ad19..0985ed94c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.callbacks; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.RollbackException; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java index bd03d763d..815da0f08 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestPostPersistCallback.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestPostPersistCallback.java index d85d18988..a100eeff1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestPostPersistCallback.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestPostPersistCallback.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.callbacks; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java index 23151b994..5649f1a99 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.cascade; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class CascadePersistEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Edge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Edge.java index dbac8b92a..eebdffcb1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Edge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Edge.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Edge { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java index 3462cb718..ce5547743 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.cascade; -import javax.persistence.EntityManager; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.RollbackException; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestMultiCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestMultiCascadePersist.java index 44a8e0cbf..ece2dd9c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestMultiCascadePersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestMultiCascadePersist.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.cascade; import java.util.Collections; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java index 3934dd885..9d19246a0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.cascade; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java index a4b675a86..4640ba4eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.cascade; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; @Entity @NamedQueries({ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/AnEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/AnEmbeddable.java index 422596291..b2083db7b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/AnEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/AnEmbeddable.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.cascade.pudefault; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; @Embeddable public class AnEmbeddable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java index 220bcf4bb..5dcb1bec9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.cascade.pudefault; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Embeddable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Embeddable public class EmbeddableWithRelationships { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java index bbec1b771..3aceffb53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.cascade.pudefault; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Entity public class PUDEntityA01 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA02.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA02.java index 85d7b4d01..857d40774 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA02.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA02.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.cascade.pudefault; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class PUDEntityA02 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java index 4984b22ba..f741cb851 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.cascade.pudefault; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Entity public class PUDEntityAE01 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityB.java index 9a1125b13..5f9b9bd54 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityB.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.cascade.pudefault; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class PUDEntityB { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java index 3efdb734f..eda341bfb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.cascade.pudefault; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java index 20512c26a..0d37aba8c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.cascade.pudefault; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java index fe6c88902..733366a20 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Address diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ArtCourse.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ArtCourse.java index 451b05aa2..97e8f13a0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ArtCourse.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ArtCourse.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Art") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/CompUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/CompUser.java index 9b0a1be1e..754fb2cfd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/CompUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/CompUser.java @@ -18,19 +18,19 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java index f6ad02ace..4d25c1eb1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java @@ -22,10 +22,10 @@ package org.apache.openjpa.persistence.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java index 30c36e90b..9eaeebd39 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Transient; @Entity @Inheritance(strategy=InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java index 085f450d0..91c1fe676 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Transient; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java index 5effec125..5d8f2e0d5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java index 8737a1f28..93d5b0177 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java index 871258aa2..4f4a3fd0b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java @@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java index b65cdacad..02bcd4c49 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; //@Entity(name="entity2ExplicitName") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/FemaleUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/FemaleUser.java index f22bb4794..d758871b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/FemaleUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/FemaleUser.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity(name="FemUser") @DiscriminatorValue(value="F") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java index 137ecf8de..3d511528b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="M") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java index ed0b88a1a..5a5784e1e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; @Entity @Table(name="MPTZZS") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java index c2d3b0dcc..e57ba73d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class PartPK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java index f787f6ba1..f33d0d47c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java @@ -23,16 +23,16 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java index b01f084e6..278db2f6e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ScienceCourse.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ScienceCourse.java index b6f42e38c..90bf664dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ScienceCourse.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ScienceCourse.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Science") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java index 5af7ca5b8..b10f70a08 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java @@ -22,12 +22,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java index dc64589e2..c6eebedd8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Transient; @Entity public class Student implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java index 885a6ca29..c2acaa933 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java index 2674e0996..88950e327 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; @Embeddable public class TextilePK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java index 9a1e82329..9195ed0f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="MPTZZU") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java index 7855716b5..c6a1bdad1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java @@ -70,9 +70,9 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import javax.management.IntrospectionException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java index ee63a07e6..737220aed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; @Entity public class Bi_1To1_JT { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java index 54803755e..3dd53884e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.compat; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * This is the default bi-directional one-to-many mapping. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java index 6f58531fa..5a2cb5cc6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.compat; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java index ca78a6f9c..3cb10a210 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.compat; import java.util.Collection; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java index 3737d0613..3c7b1271f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.compat; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java index 58e1d5a0b..ae88da23e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.compat; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ElementClassCriteria; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java index 18a7642ae..a247bbc30 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.compat; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @MappedSuperclass public class EmbeddableSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java index 72a566e14..f5a67a7b2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.compat; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorColumn(name = "DISC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Employee.java index be7ebd5dd..7cf3fcb49 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Employee.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "EMP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityA.java index d0a6a218e..a94b63c4e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityA.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Table; @Entity @Table(name="MPSP_A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityB.java index 4b8c81620..603d57ade 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityB.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MPSP_B") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java index 24336f5f3..1e3663e9c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="Compact_C") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java index 7d136d547..58754e47e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EntityC_B11JT { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java index 7e32dacdd..d8b639e0a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="C_B1MFK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java index e4667cded..7d4d60e92 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; @Entity public class EntityC_B1MJT { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java index 6716fed00..d9792b41b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="C_B1M_Map_JT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java index 3a9ea06d2..88a0e9697 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="C_B1M_Map_RelKey_JT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java index 1d326ab19..6ccca402e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java index b386e36fd..0604e41b3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="C_U1MFK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java index d1e18bfd5..c8f648f92 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="C_U1M_Map_FK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java index 47001d285..1992d567e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="C_U1M_Map_RelKey_FK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/FullTimeEmployee.java index 6c8f5707e..1569f6541 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/FullTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/FullTimeEmployee.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("F") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java index 471a31c6c..5ea996a77 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.compat; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; @Entity @IdClass(InvoiceKey.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java index df92677fb..ae284f2cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java @@ -16,9 +16,9 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class LineItem { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/MappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/MappedSuper.java index a01d974c8..027633656 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/MappedSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/MappedSuper.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.compat; import java.util.Date; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @MappedSuperclass public abstract class MappedSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/PartTimeEmployee.java index 8156bc796..db72f69d8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/PartTimeEmployee.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("P") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java index 930bbbd2f..53a5700c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java @@ -20,19 +20,19 @@ package org.apache.openjpa.persistence.compat; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @NamedQuery(name="FindXTwo", query="select s from simple s where s.name = :fname") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity2.java index 2e03e8838..3b540fe76 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity2.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @NamedQuery(name="FindXTwo", query="select s from simple2 s where s.name = :fname") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java index f5e7a5433..a391fbf2a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.Specification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java index 1f2a7f3a1..48923ffbc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.compat; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.conf.OpenJPAVersion; import org.apache.openjpa.persistence.ArgumentException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java index 52a5ab33e..da23bfa64 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAVersion; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java index 7c2f77cca..315d21c01 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAVersion; import org.apache.openjpa.persistence.ArgumentException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java index 1effcd30d..f6dab4845 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java @@ -22,9 +22,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -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 org.apache.openjpa.persistence.EntityManagerImpl; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java index 1d8b5b457..53b50ba81 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.Specification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java index e92182bf8..fa57ca6e0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; @Entity public class Uni_1To1_JT { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java index 53347d8d0..278b04ef8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.compat; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; /** * This is the non-default uni-directional one-to-many mapping. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java index e48b8393b..0cfa06a27 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.compat; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; /** * This is the default uni-directional one-to-many mapping. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java index f8802d79d..d20cba852 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.compat; import java.util.Collection; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; //non-default mapping //Sec 11.1.36, Example 3: diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java index 37c6271c7..bfa01ff73 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.compat; import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; //non-default mapping //Sec 11.1.36, Example 3: diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java index f1fd13945..88dd77c8a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.compat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; @Entity public class Uni_MTo1_JT { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/Person.java index 4565b19f3..0037c2c08 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/Person.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.conf; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; // override defaults to attempt to prevent collisions. @Entity(name="confPerson") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java index 1ba9376e2..2f9bb8713 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java @@ -61,7 +61,7 @@ public class TestOpenJPAConfiguration map.put("openjpa.ConnectionFactory2", cfactory2); map.put("openjpa.Optimistic", Boolean.FALSE); map.put("openjpa.LockTimeout", 503); - map.put("javax.persistence.query.timeout", 1500); + map.put("jakarta.persistence.query.timeout", 1500); // use new conf so no unexpected restrictions on type of connection // factory diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java index 922d4d867..00bbcca6e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.conf; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.RollbackException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DerbyDictionary; @@ -103,14 +103,14 @@ public class TestOverrideNonJtaDataSource extends SingleEMFTestCase { public void testConnectionFactoryName() { // Disable for non-Derby. - // split out so that we can try javax.persistence.jtaDataSource in the future. + // split out so that we can try jakarta.persistence.jtaDataSource in the future. overridePropertyOnEM("openjpa.ConnectionFactory2Name", jndiNames[0]); } public void testJtaDataSource() { // Disable for non-Derby. - // split out so that we can try javax.persistence.jtaDataSource in the future. - overridePropertyOnEM("javax.persistence.nonJtaDataSource", jndiNames[0]); + // split out so that we can try jakarta.persistence.jtaDataSource in the future. + overridePropertyOnEM("jakarta.persistence.nonJtaDataSource", jndiNames[0]); } public void overridePropertyOnEM(String name, String value) { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java index 23cac899c..9fc771882 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.conf; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.RollbackException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DerbyDictionary; @@ -99,14 +99,14 @@ public class TestSwitchConnection extends SingleEMFTestCase { public void testConnectionFactoryName() { // Disable for non-Derby. - // split out so that we can try javax.persistence.jtaDataSource in the future. + // split out so that we can try jakarta.persistence.jtaDataSource in the future. overridePropertyOnEM("openjpa.ConnectionFactoryName", jndiNames[0]); } public void testJtaDataSource() { // Disable for non-Derby. - // split out so that we can try javax.persistence.jtaDataSource in the future. - overridePropertyOnEM("javax.persistence.jtaDataSource", jndiNames[0]); + // split out so that we can try jakarta.persistence.jtaDataSource in the future. + overridePropertyOnEM("jakarta.persistence.jtaDataSource", jndiNames[0]); } public void overridePropertyOnEM(String name, String value) { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A.java index 8fb272fe4..1858939ae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class A { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java index 58f22e169..59804a0fb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.A.class) public class A_ { public static volatile SingularAttribute b; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java index 7465c3886..187aa15c1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java @@ -26,10 +26,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaQuery; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java index f71167e6e..85a93e232 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * Persistent class used in testing QueryDefinition API. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java index 414879687..cafaad16a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Account.class) public class Account_ { public static volatile SingularAttribute balance; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java index 65b259c61..42e998825 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java index b6fa181b4..7243a0676 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Address.class) public class Address_ { public static volatile SingularAttribute city; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B.java index 10c89fce3..41a8ae106 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class B { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java index b802979a5..0c06ee4e9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.B.class) public class B_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser.java index 8447cacf5..29f0f9187 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BlogUser { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser_.java index 43813412f..1673a05bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/BlogUser_.java @@ -22,11 +22,11 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.BlogUser.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Wed Jul 06 09:09:40 CDT 2011") public class BlogUser_ { // The use of ListAttribute for arrays needs a special property setting. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C.java index 0a9a605d1..945030b6f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; @Entity public class C { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java index 36a972532..a1b1922df 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java @@ -23,13 +23,13 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.C.class) public class C_ { public static volatile CollectionAttribute coll; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java index 1d816f9cf..73275ecec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java @@ -18,19 +18,19 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java index e87ca4321..f32ebab1c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java @@ -23,12 +23,12 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.persistence.criteria.CompUser.CreditRating; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.CompUser.class) public class CompUser_ { public static volatile SingularAttribute address; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java index 7f52754fd..b87e02be9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Embeddable public class Contact { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java index b4520d4f2..d47270aac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Contact.class) public class Contact_ { public static volatile SingularAttribute address; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java index 4c82443e5..6e7fbe67e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java index da561dc9c..b51faf4eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.criteria; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Contractor.class) public class Contractor_ extends Person_ { } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java index 08d724394..3b4dbe74d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; @Entity @Table(name="CR_CRSE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java index 1f5a14c08..64ba1a0f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Course.class) public class Course_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java index 8ccadbcdd..0c08ee3c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; @Entity @Table(name="CR_CRDTC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java index 1fbc2efc2..5c346b8e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.CreditCard.class) public class CreditCard_ { public static volatile SingularAttribute customer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java index 307a3504d..a4f52caae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.criteria.results.Bar; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java index f21dd3a59..eb3ff5ef7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java @@ -23,14 +23,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="CR_CUST") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java index f92a6c59e..1b4a5170e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java @@ -23,13 +23,13 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.persistence.criteria.Customer.CreditRating; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Customer.class) public class Customer_ { public static volatile SingularAttribute accountNum; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D.java index 243497fd1..29962250f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class D { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java index 58a980414..6eb29c113 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.D.class) public class D_ { public static volatile SingularAttribute c; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java index 68ac9b53f..efbff8c7e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java index c5ddc8337..a9078b8c3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Department.class) public class Department_ { public static volatile SingularAttribute deptNo; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent.java index eddcfa9e5..921642270 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.criteria; import java.util.Date; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name="CR_DEPENDENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId.java index ebb814c96..0edd7f08c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.criteria; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class DependentId { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java index 30df60114..3a29bbcd1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.DependentId.class) public class DependentId_ { public static volatile SingularAttribute effDate; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java index 650b77d9a..81b275465 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Dependent.class) public class Dependent_ { public static volatile SingularAttribute curStatusId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java index 96afb673c..eb749d6e2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.embed.Company1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java index 8513bd0a1..54b7a848d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="CR_EMP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java index fc5b0d01b..c987ab3dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Employee.class) public class Employee_ { public static volatile SingularAttribute contactInfo; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java index 4a0773482..b54a04a14 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * A persistent class using a {@link IdTestClass separate class} as its primary identifier. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java index e75f920ba..a440c3ca7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.criteria; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class Exempt extends Employee { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java index 9e9579895..6ee1521bb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Exempt.class) public class Exempt_ extends Employee_ { public static volatile SingularAttribute hireDate; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser.java index b6b388e88..fddb6cc5b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity(name="FemUser") @DiscriminatorValue(value="F") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java index 0b1904f8e..638e5ce26 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.criteria; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.FemaleUser.class) public class FemaleUser_ extends CompUser_ { } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan.java index 5b7d1c10b..d0c715c35 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class FrequentFlierPlan { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java index bbb732375..3d9dff6c8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.FrequentFlierPlan.class) public class FrequentFlierPlan_ { public static volatile SingularAttribute annualMiles; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java index f685e078d..435fa48e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="CR_ITEM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java index dd9521c9c..f7423ebf8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Item.class) public class Item_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java index 4d373b413..a18a1ec97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java index 41a08c9d5..84a1ba993 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="CR_LI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java index 2640ef42d..3e8908f53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.LineItem.class) public class LineItem_ { public static volatile SingularAttribute cost; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java index 9a37216f8..6fda83621 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.criteria; import java.io.Serializable; import java.sql.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="CR_MG") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java index 063a1c3a2..49f6e88be 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Magazine.class) public class Magazine_ { public static volatile SingularAttribute datePublished; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java index 39af3823a..0958a01b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="M") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java index 2cee2eb8b..cd2960a47 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.criteria; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.MaleUser.class) public class MaleUser_ extends CompUser_ { } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java index b94c28139..412aad0a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="CR_MGR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java index e4401cf73..0fba2c79d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.math.BigDecimal; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Manager.class) public class Manager_ { public static volatile SingularAttribute department; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java index c17b4320e..d1a7c3934 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CR_MV") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java index 48b50b3a9..c6c534ecc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Movie.class) public class Movie_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java index ef1b72f61..4ee955bc6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Timestamp; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="CR_ODR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java index a29422d8f..52da633f0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java @@ -25,10 +25,10 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Timestamp; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Order.class) public class Order_ { public static volatile SingularAttribute count; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java index a946e7eed..83b8099bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.criteria; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CR_PSN") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java index ab4b208ae..e1d36cc10 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Person.class) public class Person_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java index 19b895499..a42bb7cdd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.criteria; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="CR_PHN") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java index f2c0349dd..470ed8b1e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Phone.class) public class Phone_ { public static volatile CollectionAttribute employees; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java index b95119e5a..ec00132c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CR_PHT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java index ece3817b4..293b09d25 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Photo.class) public class Photo_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java index 59cbd9fa5..525ec87cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java @@ -17,12 +17,12 @@ * under the License. */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="CR_PRD") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java index da942a0d3..2b9ecdafa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Product.class) public class Product_ { public static volatile SingularAttribute pid; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java index d924cf902..59b6f2c06 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.criteria; import java.io.Serializable; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="CR_PSH") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java index 578b1a0d6..c77e5a7dd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Publisher.class) public class Publisher_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java index 75e2f9526..45c99f3b3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Request { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request_.java index fdedc1f9d..c508434f8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Request.class) public class Request_ { public static volatile SingularAttribute status; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java index ed3cc76e4..de71dbeab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CR_SMT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java index c42597807..1c1deaaea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Semester.class) public class Semester_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java index 8bcf4e932..e4892ef5e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.criteria; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.Table; @Entity @Table(name="CR_STU") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java index 015b7745c..30b77b19a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Student.class) public class Student_ { public static volatile MapAttribute enrollment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java index fde96bd5e..e739898bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCQL.java index 3758b0f7d..0896a1739 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCQL.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; /** * Test logical predicates precedence is preserved and rendered correctly in CQL. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java index 18e116d93..cfdf14ed1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.query.DomainObject; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java index 64c4d02d0..c3e29950d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java @@ -23,9 +23,9 @@ import java.sql.Time; import java.sql.Timestamp; import java.util.List; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.kernel.Filters; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java index 545eac59e..2dab5bc06 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java @@ -22,11 +22,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; public class TestDistinctCriteria extends CriteriaTest { @Override diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java index 79fdd3fb7..3f072e65b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java index 4c2c7898e..a224f6a3a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java @@ -22,19 +22,19 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.apache.openjpa.persistence.embed.Company1; import org.apache.openjpa.persistence.embed.Company1_; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestFetchJoin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestFetchJoin.java index ce830273f..49a3bda41 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestFetchJoin.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestFetchJoin.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; public class TestFetchJoin extends CriteriaTest { public void testFetchJoin() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java index d55f179ee..3eade3e85 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java @@ -22,17 +22,17 @@ import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.apache.openjpa.jdbc.sql.DerbyDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java index b6e97b5a3..5e4a001f6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.metamodel.Bindable; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.metamodel.Bindable; /** * Tests Criteria Queries that use Join. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java index 1dfcaf658..0b6c13e78 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java @@ -18,33 +18,33 @@ */ package org.apache.openjpa.persistence.criteria; -import static javax.persistence.metamodel.Type.PersistenceType.EMBEDDABLE; -import static javax.persistence.metamodel.Type.PersistenceType.ENTITY; +import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE; +import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY; import java.math.BigDecimal; import java.util.List; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.SetAttribute; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.SetAttribute; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java index 6574f3925..bedc7c5e2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.metamodel.Attribute; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestRemoteQueryCacheCriteriaQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestRemoteQueryCacheCriteriaQuery.java index 7a83ea777..33588e834 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestRemoteQueryCacheCriteriaQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestRemoteQueryCacheCriteriaQuery.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; import org.apache.openjpa.persistence.datacache.SerializingConcurrentQueryCache; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java index f0dc2bf47..1c7af68b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java @@ -21,19 +21,19 @@ package org.apache.openjpa.persistence.criteria; import java.math.BigDecimal; import java.util.Collection; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestSubqueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestSubqueries.java index fc73d9f35..5e3a61b77 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestSubqueries.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestSubqueries.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Timestamp; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.*; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; public class TestSubqueries extends CriteriaTest { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java index f2d6062a7..817ecace7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java @@ -36,14 +36,14 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; /** * Tests type-strict version of Criteria API. The test scenarios are adapted diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java index c0b6cd864..09b313327 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java @@ -28,24 +28,24 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; import org.apache.openjpa.jdbc.sql.AbstractSQLServerDictionary; import org.apache.openjpa.jdbc.sql.OracleDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction.java index cc8b08f64..c81f63ac1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="CR_TRANSACTION") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory.java index 52e3d7d32..6ff2bcafc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CR_TRS") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java index 474b50bca..5aa9c2274 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.criteria; import java.sql.Timestamp; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.TransactionHistory.class) public class TransactionHistory_ { public static volatile SingularAttribute details; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction_.java index 8c645c408..f7ad753e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction_.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.criteria; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.Transaction.class) public class Transaction_ { } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java index 3cfdac29c..c3ff62b87 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.criteria; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore_.java index b97f5e230..046b0ce55 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.criteria.VideoStore.class) public class VideoStore_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressEntity.java index 9a69f90dd..922052a7e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressEntity.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria.init; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "ADDRESSES") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressPk.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressPk.java index 19fc8d27c..00332ec07 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressPk.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/AddressPk.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.criteria.init; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class AddressPk implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java index f05a239a6..e65b762eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.criteria.init; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "MY_USERS") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/TestCriteriaInitialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/TestCriteriaInitialization.java index b6ddcdf1b..eee00cba6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/TestCriteriaInitialization.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/TestCriteriaInitialization.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria.init; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay.java index 2c74e1968..38a21e5ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.criteria.multiselect; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="T_DIM_DAY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java index 9d2906e9b..15cb49ada 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria.multiselect; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=DimDay.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Feb 23 16:53:34 MST 2015") public class DimDay_ { public static volatile SingularAttribute currentMonthInd; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment.java index aa5b8d865..953a6baf3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.criteria.multiselect; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "T_FACT_WORK_ASGNMT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java index 4029f9ff1..e3bb5ea8e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.criteria.multiselect; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=FactWorkAssignment.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Feb 23 16:16:50 MST 2015") public class FactWorkAssignment_ { public static volatile SingularAttribute clockNumber; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java index 80387b57d..98d33f6a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.criteria.multiselect; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.Subquery; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar.java index ca7948bc2..679f60def 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * A simple class for testing select projections. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar_.java index 7f6eadbd2..d67b10163 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Bar_.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.StaticMetamodel; /** * Hand-written (i.e. non-canonical in techie terms). diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo.java index e91dde033..427f0e2f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * A simple class for testing select projections. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo_.java index 63916ca20..776b2ef2e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Foo_.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.StaticMetamodel; /** * Hand-written (i.e. non-canonical in techie terms). diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java index 2eaa487ae..d71ac5dc2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="CRIT_RES_ITEM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item_.java index 53f107ab2..19fb827cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item_.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.StaticMetamodel; @StaticMetamodel(value=Item.class) public class Item_ { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order.java index de048d365..0f08e3baf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order.java @@ -22,13 +22,13 @@ package org.apache.openjpa.persistence.criteria.results; import java.util.Date; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="CRIT_RES_ORD") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order_.java index 3cd1b1201..f5901fb56 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Order_.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.criteria.results; import java.util.Date; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.StaticMetamodel; @StaticMetamodel(value = Order.class) public class Order_ { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java index 1f28617ed..d496dc36f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Producer { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java index af94d1bf7..fa4acff59 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.StaticMetamodel; @StaticMetamodel(value=Producer.class) public class Producer_ { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java index 744172afb..4a2fd7562 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.criteria.results; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; @Entity @SqlResultSetMapping(name="selectShipRateMapping", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java index 678e4906b..0c1a4fe02 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.criteria.results; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="CRIT_RES_SHOP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop_.java index 6c585b428..3565431a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop_.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.criteria.results; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.StaticMetamodel; @StaticMetamodel(value=Shop.class) public class Shop_ { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestMultiselect.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestMultiselect.java index fe5855838..f451628f8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestMultiselect.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestMultiselect.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.criteria.results; import java.lang.reflect.Array; import java.util.List; -import javax.persistence.Tuple; -import javax.persistence.criteria.CompoundSelection; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.criteria.CriteriaTest; import org.apache.openjpa.persistence.criteria.Person; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java index 866036429..62e9cf3a1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java @@ -26,14 +26,14 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java index 41679946a..a75e38859 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java index 8809645c4..8680f029f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java @@ -30,7 +30,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.datacache.ConcurrentDataCache; import org.apache.openjpa.datacache.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEmployee.java index abb691b7f..81dfae63f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEmployee.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CachedEmployee extends CachedPerson { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java index 631ef61f8..b0b430c94 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java @@ -22,14 +22,14 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @Entity public class CachedEntityStatistics { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedManager.java index 411cd4e25..d3be1f493 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedManager.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.datacache; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; @Entity public class CachedManager extends CachedPerson { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedPerson.java index 8b61e572b..47064b541 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedPerson.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedPerson.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeChild.java index 895fe93c0..8db21c32b 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeChild.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class CascadeChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeParent.java index ea409db51..6d6996572 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CascadeParent.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class CascadeParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/IdentityIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/IdentityIdClass.java index 5fa00056b..3e2010cbf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/IdentityIdClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/IdentityIdClass.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class IdentityIdClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Item.java index d82cc1430..3b3828ffc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Item.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Item.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="CACHE_EXC_ITEM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapEmbeddable.java index 6978d7223..3c78c6304 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapEmbeddable.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class MapEmbeddable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapHolder.java index 00dfa6a04..23856b931 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/MapHolder.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.datacache; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity(name = "MapHolder") public class MapHolder { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java index 87c7d76a3..8bed236c3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="OPTIMISTIC_LOCK_INSTANCE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Order.java index eeac5199b..c59ba54ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Order.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="CACHE_EXC_ORDR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java index 333617ea6..0b54d6b11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class OrderedOneManyChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java index 91f5ab0a4..6b36d9f1b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.datacache; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; @Entity public class OrderedOneManyParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Purchase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Purchase.java index 156247e0e..b71a59039 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Purchase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/Purchase.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.datacache; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="CACHE_EXC_PURC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java index 418ac2e64..7ffa781c4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.datacache; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.datacache.DataCache; import org.apache.openjpa.kernel.PCData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestAutoIncrementAndDataCaching.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestAutoIncrementAndDataCaching.java index b61ed0fc3..a85f48f55 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestAutoIncrementAndDataCaching.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestAutoIncrementAndDataCaching.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java index 09255b5bf..9455e73b3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.datacache; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java index 84fa3288b..22f405427 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.OptimisticLockException; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.RollbackException; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.jdbc.meta.FieldMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java index 92311a63b..f865857dd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.Cache; -import javax.persistence.EntityManager; +import jakarta.persistence.Cache; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java index 13e9fdb7a..c59d2053e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -213,7 +213,7 @@ public class TestCacheExclusions extends AbstractCachedEMFTestCase { + Item.class.getName() + _tSep + Purchase.class.getName() + _tSep + Order.class.getName() + ")"); emf = - (OpenJPAEntityManagerFactorySPI) javax.persistence.Persistence + (OpenJPAEntityManagerFactorySPI) jakarta.persistence.Persistence .createEntityManagerFactory("test", props); return emf; } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java index e2915cbf9..0d7857621 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import org.apache.openjpa.persistence.EntityManagerImpl; import org.apache.openjpa.persistence.EntityNotFoundException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java index b43a00143..425fa1a0f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java @@ -22,9 +22,9 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.RollbackException; import org.apache.openjpa.event.RemoteCommitEvent; import org.apache.openjpa.event.RemoteCommitListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java index b50f31d28..1b712c434 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.datacache.DataCacheManager; import org.apache.openjpa.datacache.DataCacheStoreManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java index 92365ea84..041a3846b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEmbeddedCollection.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.datacache; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java index a6c13271a..b07fdd83d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.datacache; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java index c1798738b..357e30bcc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java @@ -22,8 +22,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.datacache.common.apps. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java index b079765c3..382610d8f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.datacache; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.test.SingleEMFTestCase; @@ -82,14 +82,14 @@ public class TestJPACache extends SingleEMFTestCase { /** * Ensure the cached returned by emf.getCache supports the JPA and OpenJPA interfaces. Expected interfaces are *
      - *
    • javax.persistence.Cache
      • + *
    • jakarta.persistence.Cache
      • *
    • org.apache.openjpa.persistence.StoreCache
      • *
    */ public void testInterfacesReturned() { Object cache = emf.getCache(); assertNotNull("Cache is not enabled", cache); - assertTrue(cache instanceof javax.persistence.Cache); + assertTrue(cache instanceof jakarta.persistence.Cache); assertTrue(cache instanceof org.apache.openjpa.persistence.StoreCache); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java index 2b89d79ea..2ef055e3b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.persistence.datacache.entities.ContactInfo; import org.apache.openjpa.persistence.datacache.entities.Person; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java index 40febd4e9..6581cd128 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java index fb8bb57c6..22ed8e6fb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java index 06eeb4ae2..06c57e06f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java index 0e49b17fe..46c432632 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java index e85d984fe..4baa3d951 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java index 77ceaf62a..54e734cad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java index 68d9270c9..ded157d4f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java index 7846e6492..07023f11e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.datacache.ConcurrentQueryCache; import org.apache.openjpa.persistence.OpenJPAEntityManager; @@ -97,7 +97,7 @@ public class TestQueryResultSize // query String jpql = "select p.name, c.name from CascadeParent p, CascadeChild c where p.name = c.name " + "and p.name = 'p1'"; - javax.persistence.Query query = pm.createQuery(jpql); + jakarta.persistence.Query query = pm.createQuery(jpql); List result1 = query.getResultList(); assertEquals(1, result1.size()); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java index 8b2d5c876..c370a1a37 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java index 3af710126..92f9369ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.datacache.CacheStatistics; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java index f4596d690..42ae6191d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AppIdCacheObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AppIdCacheObject.java index 584927ff1..8d94a2492 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AppIdCacheObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AppIdCacheObject.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AppIdCacheObject { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java index 6ea7f8b7e..af3e65c5c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java @@ -23,8 +23,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="L2_AttachA") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java index 7edfdb4ad..c90527eae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java index 3465342f9..441218cc4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.datacache.common.apps; import java.util.LinkedList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java index d93a62f01..2bc37151a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachD diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java index 04e061a9d..546554e9c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.datacache.common.apps; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="L2_AttachE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java index a5b6393b6..3a5bcb567 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachF diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java index 954406e29..e5d88d71b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java @@ -23,20 +23,20 @@ import java.util.Date; import java.util.LinkedList; import java.util.Locale; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.apache.openjpa.persistence.PersistentCollection; import org.apache.openjpa.persistence.jdbc.ContainerTable; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild1.java index 69206020e..178f7cedd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild1.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild2.java index 8fc908921..d51f16109 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectAChild2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectB.java index 2c7181bd6..80e6f148e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectB.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectBChild1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectBChild1.java index c94e7cec7..2711f12ce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectBChild1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectBChild1.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class CacheObjectBChild1 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java index 94d3b604f..505b06ae3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectD.java index be07a15f1..506ce1417 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectD.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectE.java index 47a05173b..31819b3be 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectE.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectF.java index 0f2fd8c69..a139e92e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectF.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectG.java index 8644d4ee6..7bada6d7c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectG.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectH.java index e625f553f..9297d1a73 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectH.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectH.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectJ.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectJ.java index be7557aff..acabf7f50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectJ.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectJ.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectWithExternalizedFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectWithExternalizedFields.java index e1488da83..6f2f5e1ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectWithExternalizedFields.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectWithExternalizedFields.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddedEntity.java index d9924ae86..f588c6674 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddedEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Embeddable; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.datacache.TestEmbeddedCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java index abc5a90ab..62ba2b6e3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.datacache.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; import org.apache.openjpa.persistence.datacache.TestEmbeddedCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/FlushDataCacheObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/FlushDataCacheObject.java index 3a6ac1857..4d550f94f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/FlushDataCacheObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/FlushDataCacheObject.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class FlushDataCacheObject { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java index 2919de813..15f66ea17 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.datacache.common.apps; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; @Entity public class M2MEntityE { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java index f93bbda68..b60e651bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.datacache.common.apps; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; @Entity public class M2MEntityF { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java index 763b5830a..d46132462 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * A Simple entity for testing. Has a version field for testing optimistic diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java index 064674f70..cc5346d0f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java @@ -26,15 +26,15 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java index 256242691..6f19fcaf4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/SelfReferencingCacheTestObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/SelfReferencingCacheTestObject.java index 6e93ae99d..0f02cc910 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/SelfReferencingCacheTestObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/SelfReferencingCacheTestObject.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SelfReferencingCacheTestObject { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/TransactionalClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/TransactionalClassPC.java index eae002b96..4b6a99786 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/TransactionalClassPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/TransactionalClassPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.datacache.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class TransactionalClassPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/ContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/ContactInfo.java index f4b856e78..41180dd14 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/ContactInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/ContactInfo.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.datacache.entities; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; @Embeddable public class ContactInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Person.java index e26687ad5..b9473cb55 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Person.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.datacache.entities; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "oaopde_person") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Phone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Phone.java index 682479731..19ebbb13d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Phone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/Phone.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.datacache.entities; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "oaopde_phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java index 676d9dea6..d2a7b6635 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.datacache.stats; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.datacache.CacheStatistics; import org.apache.openjpa.datacache.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal.java index b88b9cfd7..da1500b8c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; @Entity @Inheritance diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal2.java index 68d2bfe63..c39da2c84 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Animal2.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.ColumnResult; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @SqlResultSetMapping(name="AnimalResultSet", entities={@EntityResult(entityClass=Animal2.class, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car.java index 6496cda0e..9b4c4c21b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; @Entity @Inheritance diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car2.java index 1c62d5d10..357a4134a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Car2.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.ColumnResult; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @SqlResultSetMapping(name="AnnoCarResultSet", entities={@EntityResult(entityClass=Car2.class, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat.java index 357f08d87..4a0f4bde8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Cat") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat2.java index b2c55d906..a3a686380 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Cat2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Cat") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet.java index d3c88ab39..afa231f6c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Chevrolet") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet2.java index 53c9e6de0..6ca1590b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Chevrolet2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Chevrolet") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog.java index ce459b920..bcf1c13b7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Dog") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog2.java index c67476994..a9a41b013 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Dog2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Dog") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java index 5c15eb2b5..06b34ba1d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java @@ -23,19 +23,19 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.OrderColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name="primary entityA", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityB.java index 379a124ff..080972291 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityB.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="primary entityB", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java index e97c84899..7dde8ff47 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java @@ -23,17 +23,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; @Entity @Table(name="\"entity c\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java index 3d5871ed5..7ffd3bde9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="\"entity d\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD2.java index e668f58bf..2265445f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD2.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; @Entity @Table(name="\"entity d2\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD3.java index 883e4d13d..8fa51c6a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD3.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="\"entity d3\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD4.java index acf25e223..8ad27b927 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD4.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="\"entity d4\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityE.java index 14d97e533..ff532077e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityE.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="\"primary entityE\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java index 929e4a276..f13dc056b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java @@ -23,18 +23,18 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name="\"primary entityF\"", schema="\"delim id\"", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityG.java index 2b89f4366..c5fcf0966 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityG.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="\"entity g\"", schema="\"delim id\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java index 07abf4108..6d33d024b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java @@ -23,17 +23,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; @Entity @Table(name="entity ha", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java index 266f6074b..79fee2d90 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="entity i", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI2.java index 0b74ece87..178392956 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI2.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; @Entity @Table(name="entity i2", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI3.java index 9f56e8245..20337a6ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI3.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="entity i3", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI4.java index b89deab42..5579bb1bf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI4.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="entity i4", schema="delim id2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac.java index 5bdf792e6..a2e2685c8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Pontiac") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac2.java index 34672945e..9bc151224 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/Pontiac2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.delimited.identifiers; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Pontiac") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java index 4a802682f..d4769a022 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java index 5817dfc9f..ef92ff85d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java @@ -2,7 +2,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java index 43c4a14ad..4ad1c3550 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java index 869bd33f1..13ac14cca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.DB2Dictionary; import org.apache.openjpa.jdbc.sql.DerbyDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java index a0f47de3e..aa8937bc4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.DB2Dictionary; import org.apache.openjpa.jdbc.sql.DerbyDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java index 62ec832d2..8ca154b83 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java @@ -2,7 +2,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.DB2Dictionary; import org.apache.openjpa.jdbc.sql.DerbyDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java index 927722fa8..27fc30f52 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java index b6b374701..5b6406440 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java @@ -23,17 +23,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; @Entity @Table(name="\"nsentity c\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java index c5b22fa23..e2b30534f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.delimited.identifiers.noschema; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="\"nsentity d\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD2.java index f473853ed..be9654709 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD2.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.delimited.identifiers.noschema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; @Entity @Table(name="\"nsentity d2\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD3.java index 7c4c7be0c..52ba03c34 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD3.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.delimited.identifiers.noschema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="\"nsentity d3\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD4.java index c99af931f..18bb0149e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD4.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.delimited.identifiers.noschema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="\"nsentity d4\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java index a45b93708..1390a2503 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.delimited.identifiers.noschema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="\"nsprimary entityE\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java index ad90d7bc4..f8b3bdcbc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java @@ -23,18 +23,18 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name="\"nsprimary entityF\"", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityG.java index 452ece9c4..c69e309c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityG.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.delimited.identifiers.noschema; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="\"nsentity d4\"") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java index 93e4afd76..27b2bf1ed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers.noschema; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java index 5a19cfbc1..f5aa03312 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers.noschema; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimIdResultSets.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimIdResultSets.java index 385e75880..040e9d114 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimIdResultSets.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimIdResultSets.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers.xml; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimInheritance.java index 014920571..0ca89d8aa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimInheritance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimInheritance.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers.xml; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedJoinAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedJoinAnnotation.java index 154ab4753..76a5c5e49 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedJoinAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedJoinAnnotation.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.delimited.identifiers.xml; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigDecimalID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigDecimalID.java index 2342b595b..d0d30e9c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigDecimalID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigDecimalID.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.derivedid; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EBigDecimalID { @Id diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigIntegerID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigIntegerID.java index 96b84282d..865aa1027 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigIntegerID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EBigIntegerID.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.derivedid; import java.math.BigInteger; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EBigIntegerID { @Id diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigDecimalID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigDecimalID.java index b1c8938b8..cba55abe8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigDecimalID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigDecimalID.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.derivedid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EDBigDecimalID { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigIntegerID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigIntegerID.java index 2878a5c45..f12c617a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigIntegerID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDBigIntegerID.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.derivedid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EDBigIntegerID { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDDateID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDDateID.java index d146d9d8c..5ccdaef4e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDDateID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDDateID.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.derivedid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EDDateID { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDSQLDateID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDSQLDateID.java index fdc31bc9e..2d0fb09b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDSQLDateID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDSQLDateID.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.derivedid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EDSQLDateID { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDateID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDateID.java index 07ef0af2d..8b2ebfa2e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDateID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/EDateID.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.derivedid; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EDateID { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/ESQLDateID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/ESQLDateID.java index 88e51e272..155fe9683 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/ESQLDateID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/ESQLDateID.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.derivedid; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ESQLDateID { @Id diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java index 223de1332..7c75e11a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java @@ -23,8 +23,8 @@ import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java index 132269c0e..4c2ad82f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="detachentity_1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java index 3b11ef95f..4e52ef865 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java @@ -22,11 +22,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Entity10 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity11.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity11.java index d1c65dbc6..0bf14b4b7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity11.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity11.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Entity11 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity12.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity12.java index 080e0eb32..1d889249c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity12.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity12.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity13.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity13.java index 92933067c..106cedc09 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity13.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity13.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.detach; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class Entity13 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity14.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity14.java index 196e08113..3b23a5384 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity14.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity14.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Entity14 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity20.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity20.java index 03cc29bf1..b5a22fb3b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity20.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity20.java @@ -23,12 +23,12 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name="Entity20_detach") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity3.java index b7e2ed014..a303610e2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity3.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Entity3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java index 244f21fbb..450a45cc9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity4.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Entity4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity5.java index 333b51741..c6e42d7eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity5.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Entity5 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java index fd7053661..53afa78ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity6.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Entity6 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity7.java index 52d03cb3a..3d99d25c7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity7.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity7.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Entity7 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity8.java index 6f57c5e62..43744f071 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity8.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity8.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Entity8 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity9.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity9.java index 790e1b317..15b4267ce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity9.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity9.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Entity9 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityA.java index da2bd06ca..d8cc1016e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityA.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityB.java index 127301796..8cdd9bbe2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityB.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EntityB_detach") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityC.java index 40708d953..923740d11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityC.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EntityC_detach") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityD.java index 9cc724d72..622caa459 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityD.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EntityD_detach") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityE.java index 3e4dab60f..594518d91 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/EntityE.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EntityE_detach") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java index 9996c32ab..f9f6c736c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.detach; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class IntVersionEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntegerVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntegerVersionEntity.java index 12853b810..2577a4ad6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntegerVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntegerVersionEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class IntegerVersionEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/NoVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/NoVersionEntity.java index 6304c98b1..0af9dd4e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/NoVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/NoVersionEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detach; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class NoVersionEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TimestampVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TimestampVersionEntity.java index 967b35c18..6ccffa723 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TimestampVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TimestampVersionEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.detach; import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class TimestampVersionEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java index 3bf618117..7eea351e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.detach.serializable; import java.io.Serializable; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @Entity public class SerializableDetachedStateManager implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Driver.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Driver.java index fa99ed7e9..0093895cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Driver.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Driver.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.detach.xml; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="AUTO_DRIVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Owner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Owner.java index f9eebf447..6fef512cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Owner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Owner.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.detach.xml; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="AUTO_OWNER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Passenger.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Passenger.java index 10b736b6e..48efcbe36 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Passenger.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/Passenger.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.detach.xml; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="AUTO_PASSENGER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java index 233c356d2..4554410a7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.detach.xml; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyChild.java index 7e5273f90..c6e545a97 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyChild.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java index 453ce7ca0..ce3cc6d68 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.detachment; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Version; @Entity public class DetachmentOneManyParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/Record.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/Record.java index 910e2b5a9..47356bcdc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/Record.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/Record.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.Persistent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java index f867fcac1..fbaec09f0 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java index 1602d0c6c..af7b5ba99 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.OptimisticLockException; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java index 2e9a58f1e..7f6b84c2e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.detachment; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.kernel.EntityF; import org.apache.openjpa.jdbc.kernel.EntityG; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java index 733075f9b..2ff25eac7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.detachment; import java.util.Calendar; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.enhance.PersistenceCapable; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java index 6f42d4b73..ff006718d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.detachment.model.DMCustomer; import org.apache.openjpa.persistence.detachment.model.DMCustomerInventory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java index 2920d1ffb..46fcfd255 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java index 321eb846f..5ff15bf02 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.AutoDetachType; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java index dc280d20f..e9aa67c18 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.RollbackException; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java index fa7b59213..b66df2fe1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.detachment.model.SimpleA; import org.apache.openjpa.persistence.detachment.model.SimpleB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java index 4660f8b36..766d04529 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.detachment; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.detachment.model.SimpleA; import org.apache.openjpa.persistence.detachment.model.SimpleB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java index 33df64ea1..843420000 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java @@ -22,14 +22,14 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @Entity public class DMCustomer { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java index 0e16cb33c..fe89b6e9a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.detachment.model; -import static javax.persistence.CascadeType.MERGE; -import static javax.persistence.CascadeType.PERSIST; -import static javax.persistence.CascadeType.REFRESH; +import static jakarta.persistence.CascadeType.MERGE; +import static jakarta.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.REFRESH; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class DMCustomerInventory { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMItem.java index 081ec31b2..56deae80b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMItem.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.detachment.model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class DMItem { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityFieldAccess.java index 054504590..adc898d70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityFieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityFieldAccess.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.detachment.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="FieldAccessNoDetachedState") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityPropertyAccess.java index 3091d04d4..0061815b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/NoDetachedStateEntityPropertyAccess.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.detachment.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="PropertyAccessNoDetachedState") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java index 48417dc3e..273ddcd3f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java @@ -22,13 +22,13 @@ package org.apache.openjpa.persistence.detachment.model; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Entity public class SimpleA { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java index e8ca4d4b7..014c02919 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java @@ -22,14 +22,14 @@ package org.apache.openjpa.persistence.detachment.model; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; @Entity public class SimpleB { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java index d2c028d92..4c2f72b12 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.detachment.model; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class SimpleC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java index 43bac5302..732af3871 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.detachment.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class SimpleRef { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharAbstractEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharAbstractEntity.java index 9e11d3048..497e1bd5e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharAbstractEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharAbstractEntity.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharLeafEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharLeafEntity.java index 43459fd10..9ccbb6e8c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharLeafEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharLeafEntity.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity(name="chrLeaf") public class CharLeafEntity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharRootEntity.java index 3805b1862..ca7896aec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/CharRootEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("R") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerAbstractEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerAbstractEntity.java index 6dc79a597..674c32fe4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerAbstractEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerAbstractEntity.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerLeafEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerLeafEntity.java index 79b8027d5..7b202c0a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerLeafEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerLeafEntity.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity(name="intLeaf") public class IntegerLeafEntity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerRootEntity.java index bdaa2397b..cf9458339 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/IntegerRootEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("10101") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringAbstractEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringAbstractEntity.java index fee9cbf6e..08fa3dfec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringAbstractEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringAbstractEntity.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringLeafEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringLeafEntity.java index 73dc801b7..1ad88bdaa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringLeafEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringLeafEntity.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity(name="strLeaf") public class StringLeafEntity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringRootEntity.java index e012b4672..4b4863669 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/StringRootEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.discriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("StringRoot") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java index 727c8db26..22382f6cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.discriminator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.meta.Discriminator; import org.apache.openjpa.meta.JavaTypes; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Employee.java index 193ddc0d4..65121dbc2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Employee.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.discriminator.fetch; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity(name="D_F_Employee") @Table(name="D_F_EMPLOYEE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Manager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Manager.java index 228016002..558b2b38d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Manager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Manager.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.discriminator.fetch; import java.util.Collection; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity(name="D_F_Manager") @Table(name="D_F_MANAGER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Person.java index c2ec5ccb1..843aa2f98 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/Person.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.discriminator.fetch; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity(name="D_F_Person") @Table(name="D_F_PERSON") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/TestLazyFetch.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/TestLazyFetch.java index 443026881..43b8d7922 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/TestLazyFetch.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/fetch/TestLazyFetch.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.discriminator.fetch; import java.util.HashSet; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java index 8d8ad1704..9c4cccd70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java @@ -22,20 +22,20 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * This is a test entity to demonstrate OPENJPA-2179 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java index d73737c4f..343f09c61 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.distinctjoin; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.Index; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/LocalizedText.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/LocalizedText.java index ea55b5352..80eb28d6f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/LocalizedText.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/LocalizedText.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.distinctjoin; -import javax.persistence.Embeddable; -import javax.persistence.Lob; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Lob; /** * Embeddable for being used in {@link Course} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java index d50d0f8d0..9ad7f29ba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java @@ -22,9 +22,9 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.lib.jdbc.JDBCListener; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java index 9f7afcd0f..11a1541ab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java @@ -26,8 +26,8 @@ import java.sql.Time; import java.sql.Timestamp; import java.util.Calendar; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java index 49a245aab..d6e1b2718 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.dynamicschema; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/ResWordEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/ResWordEntity.java index 66e3903f4..6aaff8138 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/ResWordEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/ResWordEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.dynamicschema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="ALIAS_TABLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java index a14c9e8a0..049b31f5e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.dynamicschema; import java.util.Random; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java index 114bade72..38dff9d4d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java @@ -23,17 +23,17 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name = "A_EMBED") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java index 077cb782d..dd8ceda60 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * An entity that extends a MappedSuperClass and embeds an entity. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java index ff25162ff..5fe230379 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Mapped Super Class using auto-generated identity. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java index c8b74cb6e..1df9e8657 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.embed; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="BK_EMD") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java index 5a2f71a38..dc28476be 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="Comp1_EMB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1_.java index 32fc036d7..4d9394047 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Company1.class) public class Company1_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java index 102329804..7b01ea8f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="Comp2_EMB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2_.java index cc0c9b2d4..bf6ad5203 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Company2.class) public class Company2_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java index 7f3dc24b4..2e1e4df80 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed; import java.util.ArrayList; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; @Embeddable public class ContactInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java index aaa2b38be..ce2fed36e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class Department1 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1_.java index a2c0be8f8..6421f1fb3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Department1.class) public class Department1_ { public static volatile SingularAttribute deptId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java index eed5040ae..ea4303d62 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class Department2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2_.java index 89f21faa2..6488d1a80 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Department2.class) public class Department2_ { public static volatile SingularAttribute deptId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java index cca9d5a90..80d99cdbf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class Department3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3_.java index b88e171a6..bc9b2d8dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Department3.class) public class Department3_ { public static volatile SingularAttribute deptId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division.java index 92575345c..3d75b6e97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="Division_EMB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division_.java index db0d0a479..b78fa0742 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Division_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Division.class) public class Division_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EChild.java index 1aeed6b94..09d14d1d9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EChild.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EGeneric.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EGeneric.java index 492dc2a06..76367a98a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EGeneric.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EGeneric.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EGENERIC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EParent.java index 5098ef214..95de30ef7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EParent.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EMBED_EPARENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed.java index 76af7d0cf..e9c0d5a76 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Embed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java index 93d11822e..55654f549 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; @Embeddable public class EmbedXml { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_.java index 865d6d181..4753447ae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed.class) public class Embed_ { public static volatile SingularAttribute intVal1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java index 51d568fe4..aa3e97afb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed; import java.util.ArrayList; import java.util.List; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; @Embeddable public class Embed_Coll_Embed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed_.java index c7f1607ce..6c7bc4d0e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_Coll_Embed.class) public class Embed_Coll_Embed_ { public static volatile ListAttribute embeds; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java index e5f5e67b3..a74092ce1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.embed; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; @Embeddable public class Embed_Coll_Integer { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer_.java index a2ee32c90..a2f61b8b9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_Coll_Integer.class) public class Embed_Coll_Integer_ { public static volatile SingularAttribute intVal1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java index fd949fb10..fd1c3d882 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; @Embeddable public class Embed_Coll_Map { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed.java index 5ece8cd45..998d69421 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class Embed_Embed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_.java index 6bc7e04a1..0b6648cfb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_Embed.class) public class Embed_Embed_ { public static volatile SingularAttribute embed; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany.java index 2cd0d8490..eef432a04 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class Embed_Embed_ToMany { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany_.java index 87eb608d2..f28ad7fc4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Embed_ToMany_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_Embed_ToMany.class) public class Embed_Embed_ToMany_ { public static volatile SingularAttribute embed; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne.java index 67e950d01..ac5b8147b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; @Embeddable public class Embed_MappedToOne { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOneCascadeDelete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOneCascadeDelete.java index 9859bb191..f47efcd88 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOneCascadeDelete.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOneCascadeDelete.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; @Embeddable public class Embed_MappedToOneCascadeDelete { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne_.java index 87203376f..d727944e0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_MappedToOne_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_MappedToOne.class) public class Embed_MappedToOne_ { public static volatile SingularAttribute bm; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Single_Coll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Single_Coll.java index 7ee4c53da..d59a87709 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Single_Coll.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Single_Coll.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.embed; import java.sql.Date; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /* This test was created to test OJ-1793 */ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java index 3d05f20ed..0846df154 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.embed; import java.util.ArrayList; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; @Embeddable public class Embed_ToMany { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany_.java index 2669e656f..59cd25304 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_ToMany.class) public class Embed_ToMany_ { public static volatile ListAttribute bs; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne.java index 460e36a2b..f4b9837e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; @Embeddable public class Embed_ToOne { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne_.java index ae801f56d..e70684d28 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToOne_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Embed_ToOne.class) public class Embed_ToOne_ { public static volatile SingularAttribute b; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java index e92e7ce76..43ccb7735 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.embed; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EmpEmbedTest") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java index 453726fa5..7610409f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Employee1 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1_.java index 05ade968a..768673f14 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Employee1.class) public class Employee1_ { public static volatile SingularAttribute department; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java index a3502e68d..9d1d5fdce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.embed; import java.util.Date; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Employee2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2_.java index 39b130506..a47b39daa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Employee2.class) public class Employee2_ { public static volatile SingularAttribute department; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java index d5f86ec25..e1422a1f1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Employee3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3_.java index 063efbda8..c094f74a9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Employee3.class) public class Employee3_ { public static volatile SingularAttribute department; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java index 32770feea..249f96281 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeeName3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3_.java index 6fbc15bb9..ed105a01d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EmployeeName3.class) public class EmployeeName3_ { public static volatile SingularAttribute fName; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java index b00e42765..347907f84 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeePK2 implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java index ed307a4f1..eca1eb484 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.embed; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EmployeePK2.class) public class EmployeePK2_ { public static volatile SingularAttribute bDay; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java index 6c0c20957..fa63d8df4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java @@ -22,13 +22,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL1A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed_.java index 9f136c3c1..b7e36332c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Coll_Embed_Embed.class) public class EntityA_Coll_Embed_Embed_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java index 5bd4a8312..d59232099 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java @@ -22,16 +22,16 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL2A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne_.java index cb254c635..397a90ff7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Coll_Embed_ToOne.class) public class EntityA_Coll_Embed_ToOne_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java index d54add6b1..8881756a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java @@ -25,19 +25,19 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name="TBL3A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String_.java index 2df6765ca..4d00e5b32 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Coll_String.class) public class EntityA_Coll_String_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java index 8169aa045..4228b9b6c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL7B") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java index d65733b2b..353815c36 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java @@ -19,15 +19,15 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL4A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed_.java index 1f38978a6..8f57274e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_Coll_Embed.class) public class EntityA_Embed_Coll_Embed_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java index 90f2a5feb..d2856c2eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL5A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer_.java index 1fedbe671..d358d4aae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_Coll_Integer.class) public class EntityA_Embed_Coll_Integer_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java index 6d6930ffd..2f8623f84 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EETMM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java index 9bfcae912..06dc608ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java @@ -25,22 +25,22 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; @Entity @Table(name="TBL3C") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java index 32c7962c3..932ccfd80 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL7A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_.java index 26c70805b..d0af527bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_Embed.class) public class EntityA_Embed_Embed_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java index d51be560b..8101303c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL6A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany_.java index 163244332..205e6b871 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_Embed_ToMany.class) public class EntityA_Embed_Embed_ToMany_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java index 4666e79d0..563e935db 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL8A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java index ad343d530..052496fdc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TB11A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne_.java index 0ce6ee8ef..cb5fdb7de 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_MappedToOne.class) public class EntityA_Embed_MappedToOne_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java index dc620ee91..43e359dd5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class EntityA_Embed_Single_Coll implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java index 3ba2b2498..429eedebb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TBL9A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany_.java index bc03af961..a264f014b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_ToMany.class) public class EntityA_Embed_ToMany_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java index f38638f6c..11801e428 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="TB10A") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne_.java index b3ab3f490..1c3a7478d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityA_Embed_ToOne.class) public class EntityA_Embed_ToOne_ { public static volatile SingularAttribute age; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java index f861f933d..a5c5523c3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EntityB1 implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1_.java index 55c42142a..13f9f7b8e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.EntityB1.class) public class EntityB1_ { public static volatile SingularAttribute entityA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java index 7adf8249c..29c6aa69d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.embed; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EntityB2 implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java index ce2bcc457..efd6dc427 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FileName4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java index a416baafa..390e5774a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * An embedded entity. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java index 2c5f5edb2..3e99000d9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.Table; @Entity @Table(name="CR_EMBED_ITEM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1_.java index 285f20451..2166f460c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Item1.class) public class Item1_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java index 4a693eab9..03017b41a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; @Entity public class Item2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2_.java index 2fbb05da5..1a3d388b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Item2.class) public class Item2_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java index 3636c222a..2d8d35680 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; @Entity public class Item3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3_.java index e7ab16eae..588bc644f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.Item3.class) public class Item3_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java index 2d971f59b..309baa7b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Id; -import javax.persistence.MapKeyEnumerated; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyEnumerated; @Entity public class Item4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java index e481c8cfc..018577639 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java @@ -22,11 +22,11 @@ import java.sql.Timestamp; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyTemporal; -import javax.persistence.TemporalType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.TemporalType; @Entity public class Item5 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java index 01100157d..81f3d048e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class JobInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Listing.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Listing.java index b05ba6447..70ec7cb11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Listing.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Listing.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java index dd2504877..e2444b84a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; @Embeddable public class LocationDetails { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java index 91b77245a..5478c1761 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="ParkingEmbedTest") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java index 7b79f0825..3609a07a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="PhoneEmbedTest") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java index 4fcd89340..a2f4e278c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="PMEmbedTest") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java index 24c964b8f..fb9da1f9c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="SL_EMD") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java index a40e3400e..5ed0eb7a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java @@ -33,11 +33,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.ArgumentException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java index c4284d6b1..4381522fd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java index cbaca1efb..38e04993f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.embed; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java index 95b036af7..69dfb6fe5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java @@ -22,8 +22,8 @@ package org.apache.openjpa.persistence.embed; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java index fbf4d5baa..9c8e32f94 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.embed; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.RollbackException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java index 72d2c00f1..77b95119a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.embed; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="VP_EMB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident_.java index 8078abe9f..86a718492 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.embed; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.VicePresident.class) public class VicePresident_ { public static volatile SingularAttribute co; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java index bed9a2695..d3592d476 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public abstract class AbstractEmployee { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java index 64783ef65..a453251f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="ADR_AO") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AnnoOverEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AnnoOverEmbed.java index 5d608acee..201d7634b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AnnoOverEmbed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AnnoOverEmbed.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; @Embeddable public class AnnoOverEmbed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java index 369695524..f3af2af26 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.ArrayList; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; @Embeddable public class ContactInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java index c4cdb1cfc..163c3e34b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CUS_ATTROVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java index dac4cbf13..6db798b9d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; @Embeddable diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java index 1ac426d83..eb05bb5d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java @@ -21,20 +21,20 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.HashMap; import java.util.Map; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; @Entity @Table(name="EMP_ATTROVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java index a7d6f9108..fcd432c38 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class JobInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PartTimeEmployee.java index a0cc359e5..e07da6e00 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PartTimeEmployee.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; @Entity @AssociationOverrides({ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java index 9d0f37a28..d1e5c2e72 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; @Entity @Table(name="PSN") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java index 494001aea..091e1b922 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="PHONE_ATTROVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java index 1e18f29e3..a8c03b793 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="PGM_ATTROVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Project.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Project.java index 28807a016..e019bbd08 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Project.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Project.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="PROJ_ATTROVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java index 31902b1af..e6d821858 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class PropertyInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java index 2aaf19577..974d54c52 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java @@ -17,9 +17,9 @@ * under the License. */ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class PropertyOwner { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java index 891acfba2..0d2264e7e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.HashMap; import java.util.Map; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="PROPREC_ATTROVER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java index ac6f874c2..e822cfc61 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java index da1d90e34..5e850e3cb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.lib.jdbc.AbstractJDBCListener; import org.apache.openjpa.lib.jdbc.JDBCEvent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java index 941571336..0afe4e00b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java index 1c29aea04..f53932563 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.schema.Column; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java index e0048ed60..d4ede032a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.embed.attrOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class Zipcode { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject.java index cf84ec7e3..269b219b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.embed.compositepk; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "SUBJECT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey.java index 24ca03a86..b7fc87eac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.embed.compositepk; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class SubjectKey implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey_.java index 5832536ed..2fc8c22b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectKey_.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed.compositepk; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.compositepk.SubjectKey.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Fri Feb 05 14:31:20 MST 2016") public class SubjectKey_ { public static volatile SingularAttribute subjectNummer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass.java index b92bf3f8b..82d6a312a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.embed.compositepk; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "SUBJECT2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass_.java index 1335a1d53..9cb43cb96 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectWithIdClass_.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed.compositepk; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.compositepk.SubjectWithIdClass.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Fri Feb 05 14:31:20 MST 2016") public class SubjectWithIdClass_ { public static volatile SingularAttribute subjectNummer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject_.java index 75824603a..72b862da7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Subject_.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed.compositepk; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.compositepk.Subject.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Fri Feb 05 14:31:20 MST 2016") public class Subject_ { public static volatile SingularAttribute key; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java index d24f72498..467f4ef32 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java @@ -22,15 +22,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic.java index 256b8465a..dfcb8f53a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.embed.compositepk; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "TOPIC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic_.java index 52b248973..f7a01d9c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/Topic_.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.embed.compositepk; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.embed.compositepk.Topic.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Fri Feb 05 14:31:20 MST 2016") public class Topic_ { public static volatile SingularAttribute id; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/BeverageHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/BeverageHolder.java index 33a5bf37a..9263ff7ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/BeverageHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/BeverageHolder.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.embed.lazy; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; @Embeddable public class BeverageHolder { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Guy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Guy.java index 29146f5b7..5c7cea050 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Guy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Guy.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.embed.lazy; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; @Embeddable public class Guy { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Recliner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Recliner.java index 66dd20f5c..e87a6ef0a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Recliner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/Recliner.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.embed.lazy; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.Persistent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/ReclinerId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/ReclinerId.java index 54d34c5b1..ddcd43eb7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/ReclinerId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/ReclinerId.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.embed.lazy; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class ReclinerId { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java index 51fdbb9c7..3d7598282 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.lib.jdbc.AbstractJDBCListener; import org.apache.openjpa.lib.jdbc.JDBCEvent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java index fbea15d04..351109ab4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.apache.openjpa.persistence.annotations.TestAnnotationBasics; import org.apache.openjpa.persistence.annotations.TestEmbeddedId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/EntityWithEnum.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/EntityWithEnum.java index 89cc480e1..1c6780ffc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/EntityWithEnum.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/EntityWithEnum.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.enhance; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; /** * This entity contains an embedded enum diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java index 2fbcda612..fd1821a7c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.enhance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.enhance.common.apps.EmbeddableEntityWithIDAnnotation; import org.apache.openjpa.persistence.enhance.common.apps.IDOwningClassTestEntity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java index 9b72dace9..50334d419 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.enhance; import java.io.IOException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PCEnhancer; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java index fe7c9b67c..6cc237873 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.kernel.OpenJPAStateManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java index e762dc8b2..f2816e075 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * Backing field names do not match up with the property accessor names, and diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java index 8c046b195..99e9a3f40 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; /** * @see TestPCSubclasser diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java index 200785a14..4af688195 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @see TestPCSubclasser diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DerivedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DerivedEntity.java index a1bc9352d..9fbe462fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DerivedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DerivedEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; /** * @see TestPCSubclasser diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java index 98d17d8c8..6b34cc657 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.enhance.common.apps; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class DetachablePC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java index 466f78cc2..29ba034ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.enhance.common.apps; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class DetachableVersionedPC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java index 57268aae6..f30274200 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.enhance.common.apps; // default package -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Id; /** * BillingNoteId entity. @author MyEclipse Persistence Tools diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java index e2284bbb1..5579e1229 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java @@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.enhance.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "enhanceentity_1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java index 9f4d0106b..df6741584 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.enhance.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; //@Entity(name="entity2ExplicitName") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/IDOwningClassTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/IDOwningClassTestEntity.java index 6147d5230..ead0cae3d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/IDOwningClassTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/IDOwningClassTestEntity.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class IDOwningClassTestEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance.java index 5516556ed..8e5f94f90 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "MGDINVERSE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance2.java index d3b3731f8..8a8f32773 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/ManagedInverseTestInstance2.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "MGDINVERSE_2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No2NoArgs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No2NoArgs.java index 909049465..5de52e62c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No2NoArgs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No2NoArgs.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class No2NoArgs { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No3NoArgs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No3NoArgs.java index 22be679ad..9e422a4cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No3NoArgs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/No3NoArgs.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public final class No3NoArgs { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoClone.java index 4d1baaf44..79607b92a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoClone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoClone.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NoClone implements Cloneable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoNoArgs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoNoArgs.java index a1c63de28..e5b3a9c9a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoNoArgs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NoNoArgs.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NoNoArgs { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NonPCClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NonPCClone.java index a9d933882..dec385d76 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NonPCClone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/NonPCClone.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NonPCClone { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java index 6fe0e1daf..ee26b2f77 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PCClone implements Cloneable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassClone.java index e216fb930..3981e81d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassClone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassClone.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SubclassClone extends NonPCClone implements Cloneable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java index aee9428c0..ce75c01eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContact.java @@ -20,17 +20,17 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java index 24ba9f475..95990d55c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; @Embeddable public class BeneContactId implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Beneficiary.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Beneficiary.java index 59e4f8229..5cb3af7fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Beneficiary.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Beneficiary.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @@ -45,7 +45,7 @@ public class Beneficiary { private String id; - @javax.persistence.Id + @jakarta.persistence.Id public String getId() { return id; } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java index 9a518fa04..f431fab1f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java @@ -22,13 +22,13 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java index 2c82c2e25..efe6545d7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java index b162f420a..544513a70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java index e59790bbd..c07a0d51c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java index 09899c196..24bab0691 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; @Entity @Table(name="DEP2_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java index fd42dacd7..8621db29c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="DEP3_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java index f1b29952b..1312897ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity @IdClass(DependentId4.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java index eae443057..169192fc8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Entity @IdClass(DependentId5.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java index ff1fa27ad..86236de45 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Entity @IdClass(DependentId5.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java index 3a61bd088..29d03528b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class DependentId1 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java index 647ab69d2..06fb7ae1e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class DependentId2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java index 72581c8f6..65cf891a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class DependentId3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java index 9db7c28e1..cd7325850 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; public class EmpId { int empId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java index 154a2bd4f..0cc4c15b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java index c5b080c55..12309f23e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="EMP1_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java index b71e87309..9059c4c39 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.ArrayList; import java.util.List; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="EMP2_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java index 5b835ecea..423376593 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="EMP3_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java index 09215a595..a0c5dc11a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Employee4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java index 927ac7ea4..4c3505bb8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class Employee5 implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java index 325354360..4cefeee24 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeeId2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java index 8374b1471..6ee313fa7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeeId5 implements java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java index e875e4e00..bdf4bb38d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java @@ -22,11 +22,11 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java index 79c3ef4bc..998b06521 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java @@ -22,14 +22,14 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java index 8a9540dff..b0b09e734 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java index 4af465fd7..7f6418977 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java index b435d56e6..98017c7a1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MED1_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java index c8243d3fb..3ac4561a1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MED2_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java index a989fadcf..b3b31991c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MED3_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java index 8853c98f2..d455d9938 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MED4_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java index 606d8a583..ee099dc3d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java index 47fffa8b9..f6cc191e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.VersionColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java index 532912e8a..e36dc539e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.enhance.identity; import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java index bc3727bfc..f5608cc61 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java index 17f9baadc..a703bd561 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="PER1_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java index 8a399763f..ba7320277 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="PER2_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java index ddf510d0b..be844ac57 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="PER3_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java index bbd63bb5f..7e9f487e3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="PER4_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java index fe2f68ad1..bad68ab26 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java @@ -17,7 +17,7 @@ * under the License. */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class PersonId1 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java index 92396e169..1e3e78f8d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class PersonId4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java index 3db4c3a8c..fb3f0a8e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="PH_MBI") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java index 29f8fb283..a25fca4ba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.enhance.identity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.PersistenceException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java index 5e254908f..aebc3362a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java @@ -23,9 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java index e950dbeeb..35b49e16c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java index f470ce8c8..302bf991d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java index 04d2f8500..b0dcb4a64 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.enhance.identity; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.SQLSniffer; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java index 961f60581..da7cf2b46 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java @@ -22,14 +22,14 @@ import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; @Entity(name="oaopeEntityA") public class EntityA implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java index 3909d0f54..ec863fc50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.entity; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; @Entity(name="oaopeEntityB") public class EntityB { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityC.java index 0dc23be60..d063650da 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityC.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.entity; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity(name="oaopeEntityC") public class EntityC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java index 40d7c9978..dade9bf7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.entity; -import javax.persistence.Basic; +import jakarta.persistence.Basic; /** * This class doesn't have an @Entity and @Basic on purpose. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java index 3ac1e8791..632a8247d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.entity; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Transient; public class MixedMappingLocationEmbeddedId implements Serializable { @Transient diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java index 7fb3089dc..c939ec9a9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java @@ -22,7 +22,7 @@ package org.apache.openjpa.persistence.entitymanager; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.EntityManagerImpl; import org.apache.openjpa.persistence.datacache.common.apps.PObject; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java index 0e9e0e39a..2d0998ca9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.entityoperation.common.apps; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.Dependent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java index ac438c2e5..9a6610065 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.event; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class AnEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java index 1d5a5f6ee..825ec1c28 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.event; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageListener; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.Topic; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicConnectionFactory; +import jakarta.jms.TopicSession; +import jakarta.jms.TopicSubscriber; import javax.naming.Context; import javax.naming.InitialContext; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/PostRemoveCallbackEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/PostRemoveCallbackEntity.java index ab9f6cb2d..ca46c4a91 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/PostRemoveCallbackEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/PostRemoveCallbackEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.event; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostRemove; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostRemove; /** * An entity for testing PostRemove callback. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java index bae02ac43..9e45379bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.event; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.event.TransactionEvent; import org.apache.openjpa.event.TransactionListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestPostRemove.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestPostRemove.java index 55f74ed3c..8cccf7117 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestPostRemove.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestPostRemove.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.event; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jta.ContainerTest; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java index 09bea0da0..5ac0ee0e7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.event.RemoteCommitEvent; import org.apache.openjpa.event.RemoteCommitListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java index bf334db10..70f8b467c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.event.RemoteCommitEvent; import org.apache.openjpa.event.RemoteCommitListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java index 40ef5af18..74c851e74 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.event.RemoteCommitEvent; import org.apache.openjpa.event.RemoteCommitListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java index f73a43827..4bdcbf929 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.event.RemoteCommitEvent; import org.apache.openjpa.event.RemoteCommitListener; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java index 8c586c5f6..4ec4c06ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.event.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java index 3aa977966..488b323fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java @@ -26,10 +26,10 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java index d75309e17..f75113675 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.event.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java index 1344b6b33..545cdbc97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.event.common.apps; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class RuntimeTest4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/TransactionalClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/TransactionalClassPC.java index 994376aa5..b1ec02003 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/TransactionalClassPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/TransactionalClassPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.event.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class TransactionalClassPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java index 59fee0efa..a7224938f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.exception; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * A Simple entity for testing. Has a version field for testing optimistic diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java index 527ac4cdd..cc149414b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java @@ -22,11 +22,11 @@ import java.io.InputStream; import java.sql.SQLException; import java.util.List; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.persistence.OptimisticLockException; -import javax.persistence.Query; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; @@ -51,7 +51,7 @@ public class TestException extends SingleEMFTestCase { /** * Tests that when Optimistic transaction consistency is violated, the - * exception thrown is an instance of javax.persistence.OptimisticException. + * exception thrown is an instance of jakarta.persistence.OptimisticException. */ // TODO: Re-enable this test once OPENJPA-991 issue is corrected. public void disabledTestThrowsOptimisticException() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java index 38ce9eaba..28235e23b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java @@ -22,10 +22,10 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.RollbackException; import org.apache.openjpa.lib.log.AbstractLog; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/EntityA.java index 5f3fe2731..7c5d27376 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/EntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/EntityA.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.external; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.ExternalValues; import org.apache.openjpa.persistence.Type; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java index 5201d08bc..da5eb4043 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.external; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.RollbackException; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java index ec6873d35..e46f94305 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.fetchgroups; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class FGAddress { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java index b28cc95b3..f417cdaed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.fetchgroups; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class FGDepartment { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java index c17588ebb..c93930347 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.persistence.fetchgroups; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java index b1975e9b7..28600064a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.fetchgroups; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java index f2a40bda9..2a10d17e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.fields; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.GenerationType.IDENTITY; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ByteArrayHolder implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java index 3c888aedf..1ecefb4d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.fields; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java index 7f25bf817..8cfb79788 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java @@ -22,9 +22,9 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.Externalizer; import org.apache.openjpa.persistence.Persistent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java index d5ac1d6ef..0340536b7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.fields; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java index 12ff5c164..391a73228 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.fields; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java index c6cf7d172..9b0dd3a91 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.fields; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Assignment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Assignment.java index 43bf62246..6f99268d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Assignment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Assignment.java @@ -20,17 +20,17 @@ package org.apache.openjpa.persistence.flush; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="FL_ASSIGN") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/ClassPeriod.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/ClassPeriod.java index ae0c7c0f2..8222a39ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/ClassPeriod.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/ClassPeriod.java @@ -21,18 +21,18 @@ package org.apache.openjpa.persistence.flush; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.ElementDependent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Course.java index 27a94953c..6eee0e757 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Course.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.flush; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.ElementDependent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/SubTopic.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/SubTopic.java index 878340d13..09dd0a444 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/SubTopic.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/SubTopic.java @@ -20,17 +20,17 @@ package org.apache.openjpa.persistence.flush; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="FL_SUBTOPIC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java index 8c6ce4f42..c498e8f53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java @@ -26,7 +26,7 @@ import java.io.ObjectOutputStream; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Topic.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Topic.java index b7f54e413..7d582f40d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Topic.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/Topic.java @@ -21,18 +21,18 @@ package org.apache.openjpa.persistence.flush; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.ElementDependent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/ContainsMultSimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/ContainsMultSimpleEntity.java index d12f04d42..33d994eeb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/ContainsMultSimpleEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/ContainsMultSimpleEntity.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.foreign.keys; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Embeddable public class ContainsMultSimpleEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/SimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/SimpleEntity.java index cc4de7fd7..f1ccf16f8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/SimpleEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/SimpleEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.foreign.keys; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="FK_SIMPLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java index 1bf968ce1..abfd32f4e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.foreign.keys; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TopLevel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TopLevel.java index 56f66844c..af3d68a6d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TopLevel.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TopLevel.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.foreign.keys; import java.io.Serializable; import java.util.Collection; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TopLevel implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog.java index 8d0703969..fa3708f26 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; @Entity public class Dog { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java index e3ae64b59..7eb74e805 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.generationtype; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity(name = "Dog1") @Table(name = "DOGAUTO", schema = "SCHEMA1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java index 9289d28ab..948f7efa9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.generationtype; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity(name = "Dog2") @Table(name = "DOGAUTO", schema = "SCHEMA2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog3.java index 9ff1dfcb2..3e3cb81cd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog3.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity(name = "Dog3") @Table(name = "DOGIDENT", schema = "SCHEMA1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog4.java index 7919be60b..dd64f7334 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog4.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity(name = "Dog4") @Table(name = "DOGIDENT4") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java index 38572bba0..5d3d97d28 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.generationtype; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; @Entity(name = "DogTable") @Table(name = "DOGTABLES", schema = "SCHEMA1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java index b49e92f62..32374fe6d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.generationtype; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; @Entity(name = "DogTable2") @Table(name = "DOGTABLES", schema = "SCHEMA2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java index a4d85cc1e..6fd76fdea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.generationtype; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; @Entity(name = "DogTable3") @Table(name = "DOGTABLES", schema = "SCHEMA3") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java index a30fa590a..f0d3e07a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.generationtype; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; @Entity(name = "DogTable4") @Table(name = "DOGTABLES4") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityE2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityE2.java index 754c1bf16..f6e02cc30 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityE2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityE2.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="primary_entityE2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java index 96ee70e89..10b922259 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostPersist; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostPersist; +import jakarta.persistence.Transient; @Entity public class EntityWithGeneratedValueAndPostPersist { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/GeneratedValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/GeneratedValues.java index 4aca25f53..4f7c031c8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/GeneratedValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/GeneratedValues.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity public class GeneratedValues { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java index 55c29ddf3..82593565e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java index 88f1a09ea..2d568d154 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java index 7d230b702..33d56f492 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.generationtype; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java index 10b3d947c..887ab5ccf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java index 536c8c479..da9410110 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java index ad3ba5b4e..874939315 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.generationtype; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java index 90394a273..b03555f10 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.graph; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * A simple persistent entity to become member of a graph. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java index 79bf9ad07..aa44c6146 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.graph; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * A simple persistent entity to become member of a graph. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java index 636894e83..d8a023a38 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.graph; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Persistent Graph is a marker for persistent version of a {@link Graph}. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java index 2b530299f..72c0d9c05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.graph; import java.io.Serializable; import java.util.Properties; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; /** * Generic, directed, attributed Relation as a first-class, persistent entity. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java index 6f40b5553..0498c079a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java @@ -22,9 +22,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; /** * RelationGraph is a first-class persistent entity that express its persistent state as a set of diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java index fb0b2e2a5..589d16a88 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java @@ -22,8 +22,8 @@ import java.sql.Date; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NoResultException; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.jdbc.meta.FieldMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFieldDuplicates.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFieldDuplicates.java index 7e624c248..f3ed785cd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFieldDuplicates.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFieldDuplicates.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.hugariannotation; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Created by IntelliJ IDEA. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFields.java index 8787c0ca6..e9a518afb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFields.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/HungarianNotationFields.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.hugariannotation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Created by IntelliJ IDEA. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/OtherClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/OtherClass.java index bd90d148d..e91705819 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/OtherClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/OtherClass.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.hugariannotation; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Created by IntelliJ IDEA. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/BooleanIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/BooleanIdEntity.java index d5f6db49a..4d010a389 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/BooleanIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/BooleanIdEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * An entity containing a boolean id diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/ComplexCompoundIdTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/ComplexCompoundIdTestEntity.java index de1eb4cd4..798c5c329 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/ComplexCompoundIdTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/ComplexCompoundIdTestEntity.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * JPA Entity with a compound Id of two fields, one simple and one an Entity. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/CompoundBooleanIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/CompoundBooleanIdEntity.java index d47837f45..85b4722ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/CompoundBooleanIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/CompoundBooleanIdEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * An entity containing a compound id with a boolean field diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/DoubleObjIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/DoubleObjIdEntity.java index 47660f25f..3b168c8d4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/DoubleObjIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/DoubleObjIdEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DoubleObjIdEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/FloatIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/FloatIdEntity.java index d4c613e62..cfbb4c0e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/FloatIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/FloatIdEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class FloatIdEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/IdentityGenerationType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/IdentityGenerationType.java index 651ce4993..fff24130f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/IdentityGenerationType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/IdentityGenerationType.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * Using a class type (Long) instead of a primitive type (long) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigDecimalIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigDecimalIdEntity.java index 067e1dbef..22d10bd44 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigDecimalIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigDecimalIdEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.identity; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author     Miroslav Nachev diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java index ec95f3706..4d414814d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.identity; import java.math.BigInteger; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Miroslav Nachev diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java index 167e78ecd..b37ea62be 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.identity; import java.sql.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SQLDateIdEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SimpleCompoundIdTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SimpleCompoundIdTestEntity.java index 732a688e3..77e074e2a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SimpleCompoundIdTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SimpleCompoundIdTestEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; /** * JPA Entity with a compound Id of two fields, both simple. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/StringIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/StringIdEntity.java index f8bee5024..5c4d08b53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/StringIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/StringIdEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class StringIdEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java index 1f2755a91..db67967f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java index 8eac2b759..107432414 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.identity; import java.sql.Connection; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java index 237f4ad48..c6b188664 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java index 9c70fc43b..4ff32865d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.identity; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.OracleDictionary; @@ -33,7 +33,7 @@ import junit.textui.TestRunner; /** * Simple test case to test the GenerationType for - * {@link javax.persistence.Id}. + * {@link jakarta.persistence.Id}. * Tests both ways of generated keys retrieval: separate query * and JDBC3 {@link java.sql.Statement#getGeneratedKeys} * if the database supports them. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java index 93c73c633..e5d83fde6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.identity; import java.math.BigDecimal; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.AllowFailure; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java index 9f7e40ac4..8d2ddbd09 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.identity; import java.math.BigDecimal; import java.math.BigInteger; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java index ab021927e..8f70cdb87 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.identity; import java.sql.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java index 76408a08d..0ef5f0708 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java index 3012aac9a..b06f4691d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * JPA Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Account.java index 893ea5b81..96c8db796 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.identity.entityasidentity; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="EAIAccount") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java index 07891c4bf..60309e8ba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.identity.entityasidentity; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="EAIAccountGroup") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Person.java index 473fe1ce4..2e246c27f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/Person.java @@ -18,9 +18,9 @@ s * Licensed to the Apache Software Foundation (ASF) under one */ package org.apache.openjpa.persistence.identity.entityasidentity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="EAIPerson") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java index deb0ef506..9a95e1c8b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.identity.entityasidentity; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java index 4c9ac7636..4e961f318 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.identity.entityasidentity2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "EAI2Attendance") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Course.java index 89e9c5eb1..885320896 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Course.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.identity.entityasidentity2; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "EAI2Course") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Person.java index 6786c9000..a7b925169 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Person.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.identity.entityasidentity2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "EAI2Person") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Student.java index 032e96534..91867d0fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Student.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Student.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.identity.entityasidentity2; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "EAI2Student") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java index 591eef8ef..77c881177 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.identity.entityasidentity2; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/AbstractBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/AbstractBase.java index 03e8c014e..30f2a6275 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/AbstractBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/AbstractBase.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/ConcreteSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/ConcreteSubclass.java index 9879b0b6a..b547e3f7a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/ConcreteSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/ConcreteSubclass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ConcreteSubclass diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3.java index 75f2969c1..8bcbf661b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EntityL3 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3Sibling.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3Sibling.java index 3e07e82fc..332a312fb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3Sibling.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3Sibling.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EntityL3Sibling diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassBase.java index f70f1a01a..e2faffc6b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassBase.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class MappedSuperclassBase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassL2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassL2.java index 5cffa6cb0..7635b300a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassL2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassL2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class MappedSuperclassL2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3.java index ad713ea46..48d5b4feb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NoGenEntityL3 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3Sibling.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3Sibling.java index 3e85acbaa..3ce1d3ee9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3Sibling.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenEntityL3Sibling.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NoGenEntityL3Sibling diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassBase.java index 0d73d82c3..708a379b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassBase.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class NoGenMappedSuperclassBase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassL2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassL2.java index b12d9f6b2..d19058d28 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassL2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/NoGenMappedSuperclassL2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class NoGenMappedSuperclassL2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestCallbackEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestCallbackEntity.java index 43256a2ba..23db4e5e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestCallbackEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestCallbackEntity.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.inheritance; import java.util.Random; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.inheritance.entity.BaseCallback; import org.apache.openjpa.persistence.inheritance.entity.XMLCallback; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java index d8f03d698..58eebe2e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.inheritance; import java.lang.reflect.Method; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.jdbc.meta.Discriminator; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java index 88066e30a..44beda770 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.inheritance; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java index cb7578b77..f88ac456e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.inheritance.entity.Admin; import org.apache.openjpa.persistence.inheritance.entity.ComputerUser; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java index f9ff9c0cc..2114ed087 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.inheritance; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.inheritance.entities.EntityMapping; import org.apache.openjpa.persistence.inheritance.entities.EntityMapping. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java index 238503d48..f2fc5d7ba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.inheritance.entity.Department; import org.apache.openjpa.persistence.inheritance.entity.Employee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java index fd3cc7669..8a7c0006d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.inheritance.entity.BaseClass; import org.apache.openjpa.persistence.inheritance.entity.MappedSuper; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java index f9dfc2bed..fe93a8c57 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java index 0672d20eb..4743d5edc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java index f15ddb42e..1e7595cb2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.inheritance.abstractjoinedappid; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ElementJoinColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java index 63d9005ac..31d68e43d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.abstractjoinedappid; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @IdClass(SubID.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java index 0e3dca4ab..804a195c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.inheritance.abstractjoinedappid; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @IdClass(SuperID.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java index a3c0c073c..43db475cd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/datacache/TestInheritanceWithDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/datacache/TestInheritanceWithDataCache.java index 3b5a242ab..7d06ca564 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/datacache/TestInheritanceWithDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/datacache/TestInheritanceWithDataCache.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.datacache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.inheritance.entity.Department; import org.apache.openjpa.persistence.inheritance.entity.Employee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/embeddable/SharedName2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/embeddable/SharedName2.java index 886f1236a..64e94f28b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/embeddable/SharedName2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/embeddable/SharedName2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.embeddable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * This class has the same name as {@link diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/PrimitiveIDMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/PrimitiveIDMappedSuperclass.java index 7be5cd0e7..6969f79de 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/PrimitiveIDMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/PrimitiveIDMappedSuperclass.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Mapped Superclass defining an integer-type primary key field. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java index 15cdb12a0..5f3e06bdc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java index 9a77e8ec9..0363bfe0e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityD; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java index 4615cda7a..f2826a961 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java index 6271cddd7..e69621c15 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java index 5fad69ddb..65073088c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java index f23ffb6ec..d3833fd56 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java index 9b97efd13..d9aa1eca0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java index bd023574c..db42b2b19 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java index 980689942..3764f70d9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.MSC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java index c79a4bf88..56e173dca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.inheritance.entities.idmsc. PrimitiveIDMappedSuperclass; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java index 45e45ac17..d267d981a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java index 92a3ee3cd..79f981ca2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityD; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java index 3965bf0ac..fb3a9111a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java index 2e84b47b0..ab04f2eb3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java index 2c6eaa2e5..5deca4662 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java index 7649ccc83..b1102247e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java index 38d969245..b2f4332f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java index 1f9db74c1..99e268d31 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java index 35fc1fe5c..966f63d3b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.MSC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java index 42cffeaa1..170046090 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.inheritance.entities.idmsc. PrimitiveIDMappedSuperclass; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java index 24d7d0e5b..c8ee49067 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java index 24519a018..e5fd568e7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityD; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java index ff659a9b0..ae6f0b86b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java index 5e0075122..43896a681 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java index 0c4c5958f..c6a6e975f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java index 2439d659f..49e0f218c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java index b78435ed7..5549028cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java index c7963320e..55855b4e3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java index 653796944..48e63e524 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.MSC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java index 6e63af4df..20237c979 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.inheritance.entities.idmsc. PrimitiveIDMappedSuperclass; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java index 36adc7163..28afc5b4d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java index c57e48019..a8c2c562e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityD; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java index 802a2cf09..29c189a2d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java index 82d5bd8f8..e4e1a1427 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java index 4e04227cd..66f446931 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java index cc886810d..7fb6c7a87 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java index d5e86d487..7ad47a0d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java index 3ad902211..f7dbd4605 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java index bfd3aeb30..bfc09b658 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.MSC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java index 37e053ef7..a0aa31d03 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.inheritance.entities.idmsc. PrimitiveIDMappedSuperclass; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java index fc2ce731a..89adfee62 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java index e927d7c7a..306b1edb2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityD; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java index 7cf240f71..a75d86b7f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java index 948b8e79e..5f24553a0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java index 6ae45a381..cd307fc0c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java index d2f3a3e83..52b0946d3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java index 0a21e6e47..1b23ee76a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java index dfc2cd546..b9f9eb816 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java index b3a584083..6ebc85dd0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.MSC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java index 446cefe81..44aa77a19 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.inheritance.entities.idmsc. PrimitiveIDMappedSuperclass; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java index a37b00466..a3d83709c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java index e4b7271dc..227f4d2ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. EntityD; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java index 47193195b..fc722b5fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java index a48fb1af0..8ce437470 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java index 3464de881..ce21c83a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafB2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java index 900f44338..a80ec5023 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.LeafC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java index ee81ccd3d..1cdb7b44b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java index 2670e2827..1ad11b162 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces. LeafD2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java index f8a9fa9de..29939d326 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.MSC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java index 8ae8a3b8b..6f60075d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.inheritance.entities.idmsc. PrimitiveIDMappedSuperclass; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java index 8bef74fcd..d64fe7669 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public abstract class AbstractClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java index 35de3020a..874ac2577 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.inheritance.entity; import java.util.HashSet; import java.util.Set; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; @Entity @DiscriminatorValue("admin") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseCallback.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseCallback.java index 1a4ae5a72..e6e8cb16b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseCallback.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseCallback.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PostPersist; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PostPersist; /* * Annotated entity class with no persistent attributes or access type diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java index 0427462f7..9a380e35f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BaseClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java index d679b4adf..d65141256 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BaseClass2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java index 561fef8ad..37730a3f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BaseClass3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java index d14481c17..41ea65ecd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BaseClass4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java index ef84943fa..ae2a13552 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class BaseClass5 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java index fc279e256..3709e8243 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class BaseClass6 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ComputerUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ComputerUser.java index 81830f698..b2e5242f5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ComputerUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ComputerUser.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java index 28a200017..397908361 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.inheritance.entity; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * Test case and domain classes were originally part of the reported issue diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java index a37b43f90..f126183ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * Test case and domain classes were originally part of the reported issue diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java index add14e1e0..8cc1e0e15 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * Test case and domain classes were originally part of the reported issue diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java index ca2c48266..da0cef9e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ImplClassA implements ManagedIface { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java index 7e6b56dab..4d0fe1ca5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.ManagedInterface; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java index 2273a2c83..a03ae5007 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.ManagedInterface; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java index 145839152..ca448d99d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.inheritance.entity; import java.util.List; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; /** * Test case and domain classes were originally part of the reported issue diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java index 27d27498a..dc39782fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Basic; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class MappedSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java index 4c4b0b410..867500c51 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class MidClass extends BaseClass2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java index 051335980..0390ce7ab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class MidClass2 extends BaseClass5 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java index 02b1c0c1a..2e873e289 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java @@ -17,8 +17,8 @@ * under the License. */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * Test case and domain classes were originally part of the reported issue diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/RegularUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/RegularUser.java index e30883a94..4862301f6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/RegularUser.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/RegularUser.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorValue("user") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName1.java index ff6857bbb..47398356f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName1.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * This class has the same name as {@link diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName2.java index 58947ed00..1d471bd80 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SharedName2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * This class has the same name as {@link diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java index 07aae75cf..cf89d60f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassA extends BaseClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java index bccfc2545..2393e89fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassB extends BaseClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java index 01c81a4ad..fb5a22ced 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassC extends MappedSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java index c25d41c16..b91feb454 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassD extends MappedSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java index b7581b4a7..9f7eaafb3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassE extends MidClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java index a0e248079..2d9797bc3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassF extends BaseClass3 implements ManagedIface2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java index f64be1ee8..fb6d34e02 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java index 551b0f619..77f688e2a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class SubclassH extends MidClass2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java index 044f2fdf1..807bd9105 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity public class SubclassI extends AbstractClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java index 0331aaf7a..78dbd696a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity public class SubclassJ extends AbstractClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java index 10d80710e..6175a2ffc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class SubclassK extends MidClass3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java index 1a57ef3ed..35115162f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.inheritance.jointable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.Index; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Department.java index c3d2aa899..d2efb31f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Department.java @@ -18,18 +18,18 @@ */ package org.apache.openjpa.persistence.inheritance.jointable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Inheritance(strategy=InheritanceType.JOINED) @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Employee.java index e671da487..152ffa748 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Employee.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.inheritance.jointable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Table(name="WEmployee") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java index 227dc3659..fc0edd087 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.inheritance.jointable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.Index; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java index 3833a4f0b..1e8796952 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.inheritance.jointable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.Index; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Person.java index d14847c5f..38bdeb511 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Person.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.inheritance.jointable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; @Entity @Table(name="WPerson") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java index ceafb7a2b..5ceeb3147 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java index f8c1d93b6..ee8b6a026 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java index 1f8232def..8e3ad9d35 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLClass.java index 4ae1e3644..87623543a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLClass.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class UMLClass extends UMLType implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLNamed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLNamed.java index bc6abcf44..bda844780 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLNamed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLNamed.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java index fbcca9f34..d29f62d32 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; import java.io.Serializable; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity //@Inheritance(strategy = InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPrimitiveType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPrimitiveType.java index 452369a09..ed3ca15f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPrimitiveType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPrimitiveType.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class UMLPrimitiveType extends UMLType implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLType.java index 3d91bb34d..7098df6c7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLType.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class UMLType extends UMLNamed implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java index d34292f31..2d7d44e13 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; /** * Entity used to test MappedSuperClass which does not have IdClass. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/DerivedEntityFromMappedSuperWithoutId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/DerivedEntityFromMappedSuperWithoutId.java index 25a277693..768e95ff1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/DerivedEntityFromMappedSuperWithoutId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/DerivedEntityFromMappedSuperWithoutId.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * A Mapped Super Class without a declared identity field. The derived classes diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/MappedSuperWithoutId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/MappedSuperWithoutId.java index 32ed8a33c..7e68735cd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/MappedSuperWithoutId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/MappedSuperWithoutId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * A Mapped Super Class without a declared identity field. The derived classes diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SharedName1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SharedName1.java index ae0534c85..8995fe0f1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SharedName1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SharedName1.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * This class has the same name as {@link diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java index 38e15c974..28e5310ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; /** * Entity used to test MappedSuperClass which does not have IdClass. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java index d245cfc31..c7ca3b837 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java index ede3ffdf0..66d45cf91 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Entity used to test MappedSuperClass which does not have IdClass. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassEntity.java index 1b5b822be..648bb6086 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass.idclass; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass(TIdClass.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassTestMSC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassTestMSC.java index d67ca1b4d..becd7ec09 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassTestMSC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/IdClassTestMSC.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass.idclass; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class IdClassTestMSC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java index f54255f39..3ccfca3ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.inheritance.mappedsuperclass.idclass; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/BaseEntity.java index 10cde7b38..d2ee3fb0f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/BaseEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/BaseEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.polymorphic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; /** * An abstract base entity class with auto-generated identty and version field. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/EnglishParagraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/EnglishParagraph.java index 5735f301c..296fb65fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/EnglishParagraph.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/EnglishParagraph.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.polymorphic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * A persistent class derived from an abstract persistent class and diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/FrenchParagraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/FrenchParagraph.java index 32489e200..b41df6923 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/FrenchParagraph.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/FrenchParagraph.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.polymorphic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * A persistent class derived from an abstract persistent class and diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/GermanParagraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/GermanParagraph.java index 24ece7340..ba2e8313c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/GermanParagraph.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/GermanParagraph.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.polymorphic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * A persistent class derived from an abstract persistent class and diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java index 96c997e48..f8d7c5321 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java @@ -22,11 +22,11 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; /** * An abstract persistent class used as root of inheritance hierarchy and diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translation.java index 7c617d7a1..daaedb5f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translation.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.inheritance.polymorphic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="TRANSLATIONS") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java index 5136e5abc..3d6fd785b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.inheritance.serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Employee extends Person { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Person.java index 1f838434d..a1f5ee2ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Person.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.inheritance.serializable; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="PERSON_SERIAL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java index 896c50129..cffa5dbec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/FKColumnNamesInner1Entity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/FKColumnNamesInner1Entity.java new file mode 100644 index 000000000..65d771e46 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/FKColumnNamesInner1Entity.java @@ -0,0 +1,48 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.jdbc; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; + +@Entity +public class FKColumnNamesInner1Entity { + @Id + @GeneratedValue + int id; + + @OneToOne + FKColumnNamesInner2Entity select; + + public FKColumnNamesInner2Entity getSelect() { + return select; + } + + public void setSelect(FKColumnNamesInner2Entity select) { + this.select = select; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/FKColumnNamesInner2Entity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/FKColumnNamesInner2Entity.java new file mode 100644 index 000000000..fa335eb71 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/FKColumnNamesInner2Entity.java @@ -0,0 +1,48 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.jdbc; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; + +@Entity +public class FKColumnNamesInner2Entity { + @Id + @GeneratedValue + int id; + + @OneToOne + FKColumnNamesInner1Entity from; + + public FKColumnNamesInner1Entity getFrom() { + return from; + } + + public void setFrom(FKColumnNamesInner1Entity from) { + this.from = from; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java index e070572f2..2272e9dcd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java @@ -18,11 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.apache.openjpa.jdbc.meta.MappingRepository; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -52,63 +48,12 @@ public class TestFKColumnNames extends AbstractPersistenceTestCase { (MappingRepository) emf.getConfiguration() .getMetaDataRepositoryInstance(); - assertEquals("SELECT_ID", repos.getMapping(Inner1.class, null, true) + assertEquals("SELECT_ID", repos.getMapping(FKColumnNamesInner1Entity.class, null, true) .getFieldMapping("select").getColumns()[0].getName()); - assertEquals("FROM_ID", repos.getMapping(Inner2.class, null, true) + assertEquals("FROM_ID", repos.getMapping(FKColumnNamesInner2Entity.class, null, true) .getFieldMapping("from").getColumns()[0].getName()); closeEMF(emf); } - @Entity - public static class Inner1 { - @Id - @GeneratedValue - int id; - - @OneToOne - Inner2 select; - - public Inner2 getSelect() { - return select; - } - - public void setSelect(Inner2 select) { - this.select = select; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - } - - @Entity - public static class Inner2 { - @Id - @GeneratedValue - int id; - - @OneToOne - Inner1 from; - - public Inner1 getFrom() { - return from; - } - - public void setFrom(Inner1 from) { - this.from = from; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java index 4748dafdc..0490f2e47 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.jdbc; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java index 095760cd8..61ad3638a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java index bc8fe07df..4fe203819 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.RollbackException; import org.apache.openjpa.jdbc.sql.SybaseDictionary; import org.apache.openjpa.persistence.kernel.common.apps.Blobs; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java index 2913b0e60..0a994edcc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java index c51cfeb4f..24f539f5e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java index bd55a9010..977a3e4e7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.simple.EntityWithTimestampPK; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java index 7b8c5999b..da958e0bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java @@ -24,31 +24,31 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ElementJoinColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java index 37c5b82bc..8f1d3e686 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java @@ -23,23 +23,23 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "ANNOTEST2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java index adf9cc0dc..cd0602d4b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java @@ -19,15 +19,15 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.Table; @Entity @DiscriminatorValue("ANNO3") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedOwner.java index f17346518..57970fca8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedOwner.java @@ -21,19 +21,19 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.util.Set; -import javax.persistence.AssociationOverride; -import javax.persistence.AttributeOverride; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.SqlResultSetMapping; @Entity @SqlResultSetMapping(name = "EmbedMapping", entities = { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java index da11c5324..5ff37afbb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Transient; @Embeddable public class EmbedValue { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java index bd405c9b9..e9101daf4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * Same as EmbedValue but no blobs for suitable use as key/value/element diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java index 77074f972..f36faaa5a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.awt.Point; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.openjpa.persistence.Persistent; import org.apache.openjpa.persistence.jdbc.Strategy; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java index 1b474d33d..bbed6c9d4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java @@ -19,13 +19,13 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @MappedSuperclass public class EmbeddableSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java index 6a8e43f0f..8c95c45cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorColumn(name = "DISC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java index b71bbd46c..0cc73651a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.GeneratedValue; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.GeneratedValue; @Embeddable public class EmbeddedIdClass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java index a3b017811..e0deb6354 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java @@ -19,16 +19,16 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @Entity @Table(name = "EMIDENTITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EntityWithIndices.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EntityWithIndices.java index 1cf9b84b1..96641f659 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EntityWithIndices.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EntityWithIndices.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; @Entity @Table(name = "INDICES1" diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java index 1ded53145..8d6674fec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.jdbc.meta.strats.StateComparisonVersionStrategy; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java index 42e6684b5..48d3daa72 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java @@ -19,15 +19,15 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity(name="Flat1") @Table(name="Flat1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java index 25be89c9a..7249ec831 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity(name="Flat2") public class Flat2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java index 7037b5465..c957c37bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.util.StringTokenizer; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.TableGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.TableGenerator; @Entity // non-psql/ora dbs cause issues with SequenceGenerator in auto-mapping diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnSecondaryVersionPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnSecondaryVersionPC.java index a7a7a7551..a21b43e20 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnSecondaryVersionPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnSecondaryVersionPC.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.VersionColumn; import org.apache.openjpa.persistence.jdbc.VersionColumns; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnVersionPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnVersionPC.java index f4c7a143b..550cf4cff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnVersionPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/MultiColumnVersionPC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.VersionColumn; import org.apache.openjpa.persistence.jdbc.VersionColumns; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java index 6867e73cd..629efe4c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.GenerationType.SEQUENCE; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="NativeSeqEnt") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java index df5175c7e..2bfdd67a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java @@ -25,12 +25,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Table; import org.apache.openjpa.jdbc.meta.strats.ClassNameDiscriminatorStrategy; import org.apache.openjpa.persistence.Persistent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java index 9fe7e9a80..79bafbd2f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java @@ -22,13 +22,13 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity4.java index 883c33766..91150ca7e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity4.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java index ae7f41b90..9cb9bc7da 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java @@ -22,8 +22,8 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.util.ArrayList; import java.util.List; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.PersistentCollection; import org.apache.openjpa.persistence.jdbc.Nonpolymorphic; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java index b0399aa55..c4e4e0339 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.awt.Point; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import org.apache.openjpa.persistence.Persistent; import org.apache.openjpa.persistence.jdbc.Strategy; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java index 386420adf..0d76ea48c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Entity test object that uses property access mode. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java index 71a924ace..f95e93d58 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java @@ -19,15 +19,15 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java index e1334c77a..3fb089dbd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class TablePerClass2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java index 80f1e107e..fb74f5892 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java @@ -22,7 +22,7 @@ import java.sql.Types; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java index 1391e0b4b..a3ba09dbc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java index 25551fba2..4199c7eca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.InheritanceType; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.jdbc.meta.FieldMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java index 65c87b50b..fd0d45a33 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java index 04a2c30d7..5f035b8ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.ClassRedefiner; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java index ed8a17f69..ee6887226 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java index 443c5af76..8ad8c56d5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java index afbf57aa1..0124cba44 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.MapKey; +import jakarta.persistence.MapKey; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java index 6cb4fc193..926664453 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java index d3bed7d79..ee082b5b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.annotations; import java.awt.Point; import java.util.Map; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java index 028fdc6cc..7745832f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java index 9cdbdcea2..4b58e6fe0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java index 81e61dc4c..ae10dd275 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java @@ -25,7 +25,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java index b2589c9ea..1bcc290ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java index 626f4f960..fef81f48d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Transient; @Entity public class UnenhancedInappropriateTransient { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedMixedAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedMixedAccess.java index b0b71c1b4..e4a3322b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedMixedAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedMixedAccess.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.annotations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Entity public class UnenhancedMixedAccess { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/AutoIncrementEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/AutoIncrementEntity.java index f1a4fd205..578cc5da5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/AutoIncrementEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/AutoIncrementEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.auto; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class AutoIncrementEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java index 0d591b85b..cbebd700b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java @@ -23,8 +23,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="JDBC_AttachA") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java index 7d3a62bc5..c935a1f74 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java index 42630286f..01a57d062 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.LinkedList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java index 3f405550d..74e2cadf1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachD diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java index e27fbcac7..f9043d31d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="JDBC_AttachE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java index c92fdf716..e092f8a62 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java index 32ecb56c7..a20d5c5f8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java @@ -22,8 +22,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java index 55754d1c9..ba35ce1b3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java index 20ff94080..7529ec15d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java @@ -22,14 +22,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java index d1e01ce00..e03870b0c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java index 1ff9c4c84..7de213c19 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java @@ -22,13 +22,13 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java index e55a5dc5d..60c1b69b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Base diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1.java index 08ba7231e..7c9887225 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class BaseSub1 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub1.java index 003335c99..5435f5f44 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub1.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class BaseSub1Sub1 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub2.java index 6b54c91ed..0f587ff95 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub1Sub2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class BaseSub1Sub2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub2.java index 21bfaa8f1..935fb7b34 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BaseSub2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class BaseSub2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BuildSchemaPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BuildSchemaPC.java index 382339756..f66c2545d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BuildSchemaPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/BuildSchemaPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing the mappingtool's buildSchema action.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java index 3aac63c41..ae5803300 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.jdbc.kernel.TestByteArrayAppId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java index eba465803..f0e3418ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.jdbc.kernel.TestByteArrayAppId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC.java index 4766c118d..e5f1ab73f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC2.java index d633ab71f..f43a6decb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CircularFKPC2.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java index b6dfecc13..c659cf3db 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Embedded type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java index 1600f4dc7..b9fa3a226 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ConstantJoinPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC2.java index a8e56ff91..8675fab7f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ConstantJoinPC2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC3.java index 9a032f819..c1d56b671 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ConstantJoinPC3 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java index 8ee2f40b2..b71059da5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java @@ -22,13 +22,13 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="CONJOINPC4") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java index 0a8d2d385..74639bf22 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="CONJOINPC5") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java index ed4b28267..ac1b4e4eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** *

    Persistent type used in testing.

    * diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DFGTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DFGTest.java index 30bc644b5..86322e6c3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DFGTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DFGTest.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DataStoreTripsPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DataStoreTripsPC.java index 5b90d4b59..1e393a2c9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DataStoreTripsPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/DataStoreTripsPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java index ce42f409f..09f1f7601 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java @@ -23,8 +23,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** *

    Class that uses eager outer joins for its collection fields.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java index dd6a696c8..9d644021d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Helper class in eager to-many join testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java index 415204795..ab9cdd6a1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.LinkedList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java index a8da45125..b2935caa3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.LinkedList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedOwnerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedOwnerPC.java index 523a97ef1..15ac361db 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedOwnerPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedOwnerPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing embedded instances.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedPC.java index 65b386313..0e61154a3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EmbeddedPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Embedded type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EntityWithFailedExternalizer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EntityWithFailedExternalizer.java index 9ae796bb3..c0170c7b2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EntityWithFailedExternalizer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EntityWithFailedExternalizer.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; @Entity public class EntityWithFailedExternalizer implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java index 2a16eb3eb..f2b7118f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java index cfe0d2b6f..94a1d0366 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.LinkedList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java index ef59be1ac..7390b0025 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java index 214e68edf..5ee078699 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java index 7e1a3f1c9..b24146f48 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public abstract class HorizA diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java index e124bfb84..3226afc4e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java index 6aecc8523..d2d9fc4e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java index f54965c51..27f7ed0fb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java index 9e093f659..6ae8aa239 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java index ffc389303..866e035fc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppMultiA diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java index 2e62317bf..520d04c07 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppMultiB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java index 9cc00f796..26aed74ee 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppMultiC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java index 09c90218a..5fc0ae67f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppMultiD diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java index e894e7f76..a63fe8fd6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppSingleA diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java index 96d72eb96..07b0afa46 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppSingleB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java index 55d38d6ed..82814aebc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppSingleC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java index 4cbe6d956..026579ff6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizAppSingleD diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java index f73c3db22..9ae6a1d45 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java index 39fee97bc..2332f003a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public abstract class HorizC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java index 7cfa8df53..87f9ecccb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizD diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java index a19c98e6e..2b919a719 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizE diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java index 0c61fb486..a5b63674d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizF diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java index 69dea0570..6ad068a2e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizG diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java index 74c017aaf..6eda0e734 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizH diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java index edc3331d4..661fa9106 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizI diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java index df7e653df..9bc12bb84 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java index ffb539acf..6142a0157 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java index 649e179b9..a7bfc05a7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java index b2aedc662..b72c6531d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java index a950e2926..bc6fef5ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java index 2766d680b..05e2e7e40 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java index 9dfb6f377..5f692f118 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java index 7c5ae6414..498fb4b1d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Interface for intermediate horizontal mappings with flat mappings. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java index 799e373eb..649933f7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizJ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java index 184982a78..48ccefcc7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizK diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java index a018b2b43..0e1bcf071 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizL diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java index 41165dd61..2b180f93a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizM diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java index 856f4a3d0..2694a6475 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizN diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java index ae64d7681..b6586a250 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class HorizO diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java index 195cf0131..a70614e01 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java @@ -27,7 +27,7 @@ import java.util.LinkedList; import java.util.Map; import java.util.Vector; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Normal class that has relations to and from various horizontal diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java index 4122be55b..71c1f078f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class InverseKeyMapPC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java index 705025465..d6a2492b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * Used to test invert one-to-ones and stuff diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java index 4f36cb38e..fa51ded97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java index 919d7f248..a08b370a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class JoinSubclassBase diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubFlat.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubFlat.java index c2fecf9c1..e779d755d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubFlat.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubFlat.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class JoinSubclassBaseSubFlat diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubVert.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubVert.java index 815d56542..76089de16 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubVert.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBaseSubVert.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class JoinSubclassBaseSubVert diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java index 222842f64..8a13e027c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class JoinTableMapPC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java index d042f1010..7721182fd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type with a compound primary key and LRS fields.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java index a7b42c662..97a022714 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type with LRS fields.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LocatorTestObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LocatorTestObject.java index 729633866..cf8ad408e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LocatorTestObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LocatorTestObject.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java index 28a2b5091..92a6769af 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class LockGroupSubclass diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java index 06fcc238e..c7b274983 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used for testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java index d7d126960..c172aa814 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java @@ -22,7 +22,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent class used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest3.java index 511f5452d..7b4d68829 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest4.java index 781f7055c..c5b07cd13 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest4.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest5.java index b8163dd1a..03e6b4bbe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest5.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java index f1258bbdc..61d58a045 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java @@ -22,8 +22,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java index e6b6184fa..8509d748d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OpOrderPCSub diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java index cea25045a..aca2da845 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingHelperPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingHelperPC.java index 208ea676e..3919c29cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingHelperPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingHelperPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java index d58de5d4e..7975d6205 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java index 9df32263f..c83f5ba11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RecursivelyEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RecursivelyEmbeddedPC.java index 98d32dce2..24c2ed560 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RecursivelyEmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RecursivelyEmbeddedPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Embedded type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java index cab27b7b5..760ef7edc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java @@ -23,16 +23,16 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java index ab271fc7e..6185dd397 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java index c24c5c206..f5248de9c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/TransactionalClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/TransactionalClassPC.java index a15a305b6..bb6516716 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/TransactionalClassPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/TransactionalClassPC.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** *

    Transactional type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwned.java index 067ee4539..830561d48 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwned.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwned.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Entity which is traget of a unidirectional one-to-one relation. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwner.java index 6d6145d0f..4ea868357 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/UnidirectionalOneToOneOwner.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; /** * Persistent entity with unidirectional one-to-one relation. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java index dc16e772d..5608eb66b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java @@ -20,20 +20,20 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedNativeQuery; -import javax.persistence.OneToOne; -import javax.persistence.QueryHint; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java index ee8c87bdb..abbe09721 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; //@Entity(name="entity2ExplicitName") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java index 26e805687..26ef804b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @IdClass(CompositeId.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java index 204ed82ed..e0aca79e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java @@ -18,18 +18,18 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; @SqlResultSetMappings(value={ @SqlResultSetMapping(name="SQLSelectsBothEndOfTheRelation", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java index 4e25862ec..c79a8c065 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java @@ -18,19 +18,19 @@ */ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; @SqlResultSetMappings(value={ @SqlResultSetMapping(name="SQLSelectsChainedRelation", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java index 5747dc856..232d0ea8a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java @@ -20,16 +20,16 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; /** This domain class uses a all possible nature of annotations. Nature of * annotation from the point of view of nature of result they produce are diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java index cc2f62695..0bccc7afb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; /** This simple domain class without any relationship is for testing basic diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java index 07992856c..5f8050851 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; import java.io.Serializable; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PostLoad; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PostLoad; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; /** Exemplifies a mapping that is overwritten in orm.xml file. * diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java index 6447a42ef..4bf38618d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; /** * @author ppoddar diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/MyDBCSEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/MyDBCSEntity.java index 89139fd9b..4453d3975 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/MyDBCSEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/MyDBCSEntity.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.dbcs; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MyDBCSEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBatchFlushWithMetadataException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBatchFlushWithMetadataException.java index 87c381195..68afd06e3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBatchFlushWithMetadataException.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestBatchFlushWithMetadataException.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.kernel; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.PersistenceException; import org.apache.openjpa.persistence.RollbackException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java index 29625323a..9dda4037c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.MappingTool; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java index e1a6e2d51..c7e77370c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java @@ -29,7 +29,7 @@ package org.apache.openjpa.persistence.jdbc.kernel; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java index cbdc02a42..a9e5cb02e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.common.apps.AutoIncrementPC1; import org.apache.openjpa.persistence.jdbc.common.apps.AutoIncrementPC2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java index dfcd303d4..03060d27c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java @@ -28,7 +28,7 @@ package org.apache.openjpa.persistence.jdbc.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.meta.ClassMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java index ee5632314..98466eeaf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java @@ -24,8 +24,8 @@ import java.sql.Statement; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.jdbc.kernel.JDBCStore; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java index 9e3f29b08..e7350a211 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java @@ -23,8 +23,8 @@ package org.apache.openjpa.persistence.jdbc.kernel; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.jdbc.common.apps.AutoIncrementOpOrderPCSub; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java index 01c3bcc91..711095501 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java index 9d2f6b09f..5d50d9037 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java @@ -25,7 +25,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.kernel.GenericResultObjectProvider; import org.apache.openjpa.jdbc.kernel.JDBCStore; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java index 33dde85a8..1596be2fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java @@ -29,7 +29,7 @@ package org.apache.openjpa.persistence.jdbc.kernel; import java.sql.Connection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import javax.sql.DataSource; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java index 114caedd6..f17b6f0e6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/Authority.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/Authority.java index 24f32998e..f2e1c16eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/Authority.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/Authority.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.jdbc.mapping; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/PrecisionTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/PrecisionTestEntity.java index e418f8ab7..ba555dcd1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/PrecisionTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/PrecisionTestEntity.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.mapping; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class PrecisionTestEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java index 6a03bd02a..8a2c37213 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.mapping; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.jdbc.common.apps.mappingApp.EntityWithCompositeId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java index f0b70289b..361221501 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.mapping; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Address.java index 43ed8a47c..c2b49917e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Address.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.mapping.bidi; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Demonstrate usage of a JoinTable for a bi-directional one-to-many mapping. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Child.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Child.java index 33a7bf25f..21551be39 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Child.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Child.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.mapping.bidi; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.meta.ValueStrategies; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java index fec79a603..ac7559ee1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.jdbc.ElementJoinColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java index 08ec0d902..f358b0381 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java @@ -22,15 +22,15 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.PostPersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PreUpdate; import org.apache.openjpa.persistence.jdbc.ElementJoinColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java index 2d07f05ab..166d721c1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java @@ -22,15 +22,15 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.PostPersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PreUpdate; import org.apache.openjpa.persistence.jdbc.ElementJoinColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java index ac9af18fe..ee5903513 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.mapping.bidi; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * Demonstrate usage of a JoinTable for a bi-directional one-to-many mapping. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java index 8c231af9e..70006d13d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.mapping.bidi; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java index e2b9111ff..38b1a1537 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.mapping.bidi; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.meta.FieldMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java index 801dc3c80..951488a52 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="m2mDivision") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java index 0ee11163e..2d7afa186 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="m2mEmp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java index 811ccbd3f..5989da6e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="m2mPhone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java index 77b740ee1..58b705ce2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java @@ -23,9 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.ArgumentException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java index 572eb8ac8..a1afe9785 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="MEx1Dept") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java index 3817962e6..4d12413fc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MEx1Division") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java index 9f5fbf6f6..b86353945 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx1Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java index e7b45a3a2..6670106d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MEx1Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java index 761ec81e3..be58427e3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java @@ -23,10 +23,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java index 5c15f5a46..bb141192b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java @@ -23,10 +23,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="M10Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java index bca7060f5..db8da0938 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex10; import java.io.Serializable; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeePK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java index a20f5d1a1..fc51eb70e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="M10Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java index 7ef7257ed..e7b0189ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex10; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class PhonePK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java index 63bae5ee7..113c20671 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.ArgumentException; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java index fb0da6949..de6eff6fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="MEx2Dept") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java index ee2f200c6..7e662953d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx2Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java index 8ff55dbbf..3841542ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx2Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java index d213eedf9..9cfad6556 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java @@ -23,9 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java index d347ec509..b67655b05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex3; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="MEx3Dept") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java index 87de2f15c..17ba06559 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx3Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java index 0ed5cf33e..911539891 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex3; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FullName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java index e5a32241e..d5d99dc32 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx3Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java index 19ffbd14e..cdc48a73d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java @@ -23,9 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java index 0d421886c..10b19f719 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex4; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Address { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java index 4573edb95..6004751af 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex4; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEX4Division") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java index 10b93783e..a65a3ed95 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx4Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java index a63b3e162..724341010 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex4; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="MEX4Office") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java index 1e272792c..d2de449c7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx4Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java index 5a3ecb834..5e1794d60 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java index 858fc53c9..d2255c65a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx5Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java index 27121eabd..e82026918 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx5Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java index 7b950af96..265e12722 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java index bd09bc709..15c28d01c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx6Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java index 766eaa836..0f168d0cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex6; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; @Embeddable @Access(AccessType.FIELD) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java index e7d55c754..3515c4218 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx6Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java index 9b7c11cc8..3f2af3fc4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java index c2ff138c9..9646a7b2e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex7; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="MEx7Division") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java index 9d3042b00..cb8a71dad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx7Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java index fbf3faab0..55894af13 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex7; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FullName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java index bcee48c59..59172845a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx7Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java index f067236a4..759f92ec1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java index f7e370203..087c4ce73 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx8Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java index 7bfeb6da3..068b2b618 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex8; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FullName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java index 187736a23..242fca769 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx8Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java index 68217e2b0..13b126872 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java @@ -23,9 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java index 557b2e60b..b3d7d430c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx9Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java index 938ceb439..da8c11c73 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex9; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FullName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java index 26361bd6f..83f6f01a8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex9; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FullPhoneName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java index 5a4b2154f..160cf3ffd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="MEx9Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java index b59f44d86..f2eb0fb3a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java index e77972efc..3d1143583 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.qualified.path; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="qual_path_Division") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Employee.java index 0cb40a900..31a27cdfb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Employee.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.qualified.path; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="qual_path_Employee") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java index a4e180f57..ed7271a9b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jdbc.maps.qualified.path; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; @Embeddable public class PersonalInfo { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Phone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Phone.java index 3ea799c18..002a19ab4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Phone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Phone.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.qualified.path; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="qual_path_Phone") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java index 5aebf6841..a9cd491b2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java index e4fb89667..b427e929a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="T6D1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java index 8d1720329..08cec2619 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="T6D2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java index a1affe77d..1c30162a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="T6D3") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java index 4039f6a13..ad40a3185 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="T6E1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java index b21458a09..9f58c3a74 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; import java.util.Date; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="T6E2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java index 2f206a77e..1cf025c50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="T6E3") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java index 7aa45e2d1..708cb00cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeeName3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java index d3c990ccb..80089c044 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0; import java.io.Serializable; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeePK2 implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java index 6e4b8ed89..7bb499335 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java index 9aac0700c..35216647d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex1; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S26x1Dept") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java index d5b027e29..9f454df53 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S26x1Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java index 91159d190..3e9e15ff4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java index 3312e2aa7..ddacd9791 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex2; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S6Dept") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java index 468621c11..16d8d5c4f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex2; import java.util.Date; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S6E2Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java index fdeaf2842..b4476e119 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex2; import java.io.Serializable; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeePK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java index 499c5f266..ba31e37d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java index 649837a21..5d6024c39 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex3; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="A63Dept") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java index b285acac0..15d863772 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex3; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="A63Emp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java index d0bc0e9fb..ec535612f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex3; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeeName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java index 263ef915f..416c67c2a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java index ccaf953ac..ae12e45cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S27x0Comp1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java index adf68232c..9b709b80d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Compny2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java index 87fa93dd5..59ffbce46 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="S27x0Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java index 3441a4ec1..cec9d4ce8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.Table; @Entity @Table(name="S27x0Itm1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java index 0ecad9275..226910407 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="S27x0Itm2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java index a87709539..e0015dc1f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java index d8c5ee585..cceaf78ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x0VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java index 304790093..98fffc72c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex3; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S273Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java index 1322cd30f..807e539bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex3; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="S27x3Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java index 716f77d3f..0bbf53f25 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java index a3d9eba52..6b0e4420e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex3; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x3VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java index f3e95262e..24d7cc3ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex4; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S274Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java index 77c267b16..43a806e94 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex4; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="S27x4Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java index 242a28f09..7b9d217d0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java index 708ef5c16..582793dde 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex4; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x4VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java index 2439ae67d..1cfedf097 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex5; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S275Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java index 61e3f2262..420cc72b8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex5; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="S27x5Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java index 58c22fd1a..5f2126865 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java index 180d8de26..92bdac1fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex5; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x5VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java index 544bbfeb1..de7c706a4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex6; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S276Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java index f3a0f765e..9579dbddd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex6; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="S27x6Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java index 9b65c8747..2558b5061 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java index 20dff5dc4..23662d413 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex6; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x6VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java index 5c1033399..ae4ddd20a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex7; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S277Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java index aab5a0f9f..19031c68e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex7; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x7Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java index bc3aee938..52a65bbb9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java index 4458697c6..e48d54e34 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex7; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x7VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java index 77344ea16..deaf681b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex8; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="S278Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java index 2ab4cfa16..5b4c3449c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex8; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class FileName { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java index ec0210648..9c465ab71 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java index 03435fba3..790c3df7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex8; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="S27x8VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java index a5e2c1a27..c50524b5c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex1; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="T291Comp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java index 47eaca0c2..e78c4fcb0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex1; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="T29x1Div") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java index 6ba29dfed..1947ebe95 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java @@ -22,10 +22,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java index e2ba8860f..a8b2c2bc1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="T29x1VP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java index 728876223..0aa84da73 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex3; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="T29x3Cors") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Semester.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Semester.java index 11908a838..8771a1cfb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Semester.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Semester.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex3; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="T29x3Sem") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java index 0844aa500..a4516041a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex3; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.Table; @Entity @Table(name="T29x3Stud") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java index f305b41b2..74421cc0b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex3; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryImpl; import org.apache.openjpa.persistence.test.AllowFailure; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/LocalizedString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/LocalizedString.java index d2f700cee..ef3587aca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/LocalizedString.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/LocalizedString.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.maps.update; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * A LocalizedString is any text string combined with a language code. The diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java index 32ea59d88..648897b7e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java @@ -21,17 +21,17 @@ package org.apache.openjpa.persistence.jdbc.maps.update; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java index fb69b99fd..274f79061 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.maps.update; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java index 2394b2fc7..3f6ef66ba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java @@ -27,7 +27,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.meta.FieldMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java index 1d8224ee0..1e8f0839a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.kernel.common.apps.ByteArray; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java index 4f2cf0315..1088a1ad5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.kernel.common.apps.ColumnIOPC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java index cd02def44..821cef4e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.meta; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.common.apps.ConstantJoinPC4; import org.apache.openjpa.persistence.jdbc.common.apps.ConstantJoinPC5; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java index c68fe2c66..9610fc25f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.common.apps.CustomMappingPC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java index 011f8d01c..8d226cb2f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.kernel.common.apps.DateVersion; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java index 22114c607..1d7b7a0ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.common.apps.EagerPC; import org.apache.openjpa.persistence.jdbc.common.apps.EagerPCSub; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java index a94d00546..0346a5dd1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.jdbc.common.apps.InvertA; import org.apache.openjpa.persistence.jdbc.common.apps.InvertB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java index a1092280e..9accde0ee 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.kernel.common.apps.OuterJoinValuePC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java index f2af588f5..c0bdfcafd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java @@ -27,7 +27,7 @@ */ package org.apache.openjpa.persistence.jdbc.meta; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.meta.FieldMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java index 7ae7ac33b..af4e05ef1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java index c8acf8581..bcd4e194c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java @@ -22,8 +22,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.util.Scanner; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ReverseMappingTool; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java index 12e3a30dc..ea378c4c7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.oracle; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A persistent entity to verify IDENTITY strategy for primary key value diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObjectNative.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObjectNative.java index 15afa44a9..4d4ba7eb4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObjectNative.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObjectNative.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.oracle; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * A persistent entity to verify IDENTITY strategy for primary key value diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java index 7880c3e51..817965061 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.oracle; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BattingOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BattingOrder.java index 85cdced03..0338869aa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BattingOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BattingOrder.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; @Entity public class BattingOrder { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java index 9a20ad2f1..57ce3b99d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class BiOrderEntity implements java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java index 39ba61a6a..39e377d81 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; @Entity public class BiOrderMappedByEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java index c54b1656e..6e08f128a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class Bicycle { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java index 947275367..4848b549b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="OC_CAR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java index ca2ed32ae..147efc345 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ColDefTestElement { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestEntity.java index 9ca410543..7b1252cc2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestEntity.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; /* * Entity used for testing order column base values. All metadata and diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java index 07d6aa54e..fcc9dd9a4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; @Entity @Table(name="OCCourse") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java index a1f01b78e..b4706b72c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.Collection; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; @Entity @Table(name="OCGame") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java index 326a28088..a3d9fbaea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Home { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java index 330265cf2..fcd8776c4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Inning { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ObOcEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ObOcEntity.java index 5c7a13169..e308ad69e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ObOcEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ObOcEntity.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; @Entity public class ObOcEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java index 94aefc053..c3339ab70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java @@ -18,20 +18,20 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import static javax.persistence.InheritanceType.SINGLE_TABLE; +import static jakarta.persistence.InheritanceType.SINGLE_TABLE; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; @Entity @Table(name="OC_OWNER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java index 06af3201c..29e99d074 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.order; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class Person { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java index 05bc5c150..77115bed1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; @Entity public class Player extends Person { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java index 568cb84af..0627823ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="OCStudent") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java index a2acd5f70..bf3a637ab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Random; import java.util.TreeMap; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Trainer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Trainer.java index 19e6fc3c5..2ff113cf2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Trainer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Trainer.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; @Entity public class Trainer extends Person { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java index 2c99020de..c0df318a7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.order; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class Widget { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java index febefb0ed..fc74930ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.query; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.query.domain.Chess; import org.apache.openjpa.persistence.jdbc.query.domain.Game; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java index a1031a593..4d0c1dc8f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java index 3beed7418..e512d494f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.query.domain.Chess; import org.apache.openjpa.persistence.jdbc.query.domain.Game; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java index 4fc7b6c09..a93718bfc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java index aa4758f84..6ff8fb5e8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.query; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.query.GroupingTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java index 0d34a4c92..d64992ac7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java @@ -25,8 +25,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.jdbc.query.domain.Magazine; import org.apache.openjpa.persistence.jdbc.query.domain.Publisher; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java index 7802f8554..d3668af4b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.query; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java index 02015936a..8c0c0b8f7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DerbyDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java index c331a81d8..f793de4e8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.query.domain.DtaSrc; import org.apache.openjpa.persistence.jdbc.query.domain.DtaSrcField; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java index 411f03710..091fdcb6d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.query.domain.Chess; import org.apache.openjpa.persistence.jdbc.query.domain.Game; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java index 9fa4c8007..db4a9803b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.jdbc.query.domain.Binder; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java index 634c7c713..46c7032b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java @@ -23,9 +23,9 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TemporalType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.jdbc.query.domain.TimeEntity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java index d40353859..860915ea1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.query; import java.util.List; -import javax.persistence.Cache; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.Cache; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.jdbc.query.domain.Applicant; import org.apache.openjpa.persistence.jdbc.query.domain.Application; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java index ce4dd3ebc..f933f0286 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.query.cache; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.datacache.ConcurrentQueryCache; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java index ead504e6a..d95d7b6a7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.query.cache; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ElementClassCriteria; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Employee.java index ea4fa48dc..a393473ad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Employee.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.jdbc.query.cache; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "EMP") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/FullTimeEmployee.java index 5f8827767..1cd083e84 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/FullTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/FullTimeEmployee.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.query.cache; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("F") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java index 5d72c2bcb..7a8c87c9a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.jdbc.query.cache; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; /** * @version $Revision$ $Date$ */ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java index 5cf459e9e..a66acd3cd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java @@ -15,9 +15,9 @@ * limitations under the License. */ package org.apache.openjpa.persistence.jdbc.query.cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @version $Revision$ $Date$ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java index c4b9cac44..1321ba802 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.jdbc.query.cache; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java index ab970adea..a7fa00fff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java index 266464288..326509360 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.jdbc.query.cache; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartTimeEmployee.java index 7ca9c7177..c739421b3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartTimeEmployee.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.query.cache; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("P") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java index 622ced416..6b94ce25b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java index f01e23e38..913f841cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.query.cache; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java index c2b02eee0..2e54332d7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.query.cache; import java.util.ArrayList; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.datacache.AbstractQueryCache.EvictPolicy; import org.apache.openjpa.datacache.ConcurrentQueryCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java index d7287854a..8d5ab5c6a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.jdbc.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DataCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java index 096a0ad49..6055ce654 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Simple persistent entity as a target of uni-directional one-to-one diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java index 04eb6ae9e..f215a0656 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.jdbc.ForeignKey; import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java index bb2b73682..0fb402173 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name="JPQL_POSITIONAL", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Chess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Chess.java index c08b4e829..df2baab70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Chess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Chess.java @@ -27,7 +27,7 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Chess extends IndoorGame { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java index 5605a47b6..9eb228ee2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.query.domain; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="P_CUSTOMER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java index a01ea6fe5..399762c11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.query.domain; import java.io.Serializable; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.Generator; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java index a40e28072..220c191bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.jdbc.query.domain; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import org.apache.openjpa.persistence.Generator; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Game.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Game.java index 082204199..891e2c64e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Game.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Game.java @@ -27,11 +27,11 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Simple unrelated persistent entity used to test logically union queries. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/IndoorGame.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/IndoorGame.java index 18e42659c..38c646797 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/IndoorGame.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/IndoorGame.java @@ -27,7 +27,7 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class IndoorGame extends Game { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java index da38f95ae..9be96de31 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.query.domain; import java.sql.Timestamp; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * Simple persistent entity as a target of bi-directional one-to-one diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Order.java index e585bf292..f318fc9c2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Order.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="P_ORDER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java index c028018d3..bfe054bd2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Simple persistent entity as a target of uni-directional one-to-one diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Scrabble.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Scrabble.java index 067882ad3..d95e3a817 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Scrabble.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Scrabble.java @@ -27,7 +27,7 @@ */ package org.apache.openjpa.persistence.jdbc.query.domain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Scrabble extends IndoorGame { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeEntity.java index 9e4425d24..258dac26b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeEntity.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.query.domain; import java.util.Calendar; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class TimeEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeKeeper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeKeeper.java index e9a421274..352e4a660 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeKeeper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/TimeKeeper.java @@ -22,10 +22,10 @@ import java.sql.Time; import java.sql.Timestamp; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class TimeKeeper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryEntity.java index a8515f59d..047b5ee12 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.query.sub; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "OPENJPA_MAXQUERY_ENTITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryMapEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryMapEntity.java index 869ca35ca..563d4c84a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryMapEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/MaxQueryMapEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.query.sub; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "OPENJPA_MAXQUERY_MAPENTITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java index dd326f804..55b8ec84b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.query.sub; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TableNameInXmlEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TableNameInXmlEntity.java index f7d73fa96..b3c76e2e0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TableNameInXmlEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TableNameInXmlEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.query.xml; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "TableNameInXmlEntity.findAll", query = "SELECT t FROM TableNameInXmlEntity t") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java index 4d59b8fa2..725a049ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.query.xml; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java index 23b67cdc0..5e4f93adf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java @@ -91,7 +91,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenMetadataDrop() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop"); + properties.put("jakarta.persistence.schema-generation.database.action", "drop"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -103,7 +103,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenMetadataCreate() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "create"); + properties.put("jakarta.persistence.schema-generation.database.action", "create"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -115,7 +115,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenMetadataDropAndCreate() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop-and-create"); + properties.put("jakarta.persistence.schema-generation.database.action", "drop-and-create"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -129,9 +129,9 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { testSchemaGenMetadataCreate(); Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop"); - properties.put("javax.persistence.schema-generation.drop-source", "script"); - properties.put("javax.persistence.schema-generation.drop-script-source", + properties.put("jakarta.persistence.schema-generation.database.action", "drop"); + properties.put("jakarta.persistence.schema-generation.drop-source", "script"); + properties.put("jakarta.persistence.schema-generation.drop-script-source", "org/apache/openjpa/persistence/jdbc/schema/drop.sql"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -156,9 +156,9 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "create"); - properties.put("javax.persistence.schema-generation.create-source", "script"); - properties.put("javax.persistence.schema-generation.create-script-source", + properties.put("jakarta.persistence.schema-generation.database.action", "create"); + properties.put("jakarta.persistence.schema-generation.create-source", "script"); + properties.put("jakarta.persistence.schema-generation.create-script-source", createSql); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -187,12 +187,12 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { } Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop-and-create"); - properties.put("javax.persistence.schema-generation.drop-source", "script"); - properties.put("javax.persistence.schema-generation.drop-script-source", + properties.put("jakarta.persistence.schema-generation.database.action", "drop-and-create"); + properties.put("jakarta.persistence.schema-generation.drop-source", "script"); + properties.put("jakarta.persistence.schema-generation.drop-script-source", "org/apache/openjpa/persistence/jdbc/schema/drop.sql"); - properties.put("javax.persistence.schema-generation.create-source", "script"); - properties.put("javax.persistence.schema-generation.create-script-source", + properties.put("jakarta.persistence.schema-generation.create-source", "script"); + properties.put("jakarta.persistence.schema-generation.create-script-source", createSql); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -215,12 +215,12 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { } catch (SQLException e) {} Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop-and-create"); - properties.put("javax.persistence.schema-generation.drop-source", "metadata-then-script"); - properties.put("javax.persistence.schema-generation.drop-script-source", + properties.put("jakarta.persistence.schema-generation.database.action", "drop-and-create"); + properties.put("jakarta.persistence.schema-generation.drop-source", "metadata-then-script"); + properties.put("jakarta.persistence.schema-generation.drop-script-source", "org/apache/openjpa/persistence/jdbc/schema/drop-after-metadata.sql"); - properties.put("javax.persistence.schema-generation.create-source", "metadata-then-script"); - properties.put("javax.persistence.schema-generation.create-script-source", + properties.put("jakarta.persistence.schema-generation.create-source", "metadata-then-script"); + properties.put("jakarta.persistence.schema-generation.create-script-source", "org/apache/openjpa/persistence/jdbc/schema/create-after-metadata.sql"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -246,8 +246,8 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { } catch (SQLException e) {} Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "create"); - properties.put("javax.persistence.schema-generation.create-script-source", + properties.put("jakarta.persistence.schema-generation.database.action", "create"); + properties.put("jakarta.persistence.schema-generation.create-script-source", "org/apache/openjpa/persistence/jdbc/schema/create-after-metadata.sql"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -258,7 +258,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenNoCreateSourceAndCreateScriptSourceSpecified() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "create"); + properties.put("jakarta.persistence.schema-generation.database.action", "create"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -272,8 +272,8 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { testSchemaGenMetadataCreate(); Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop"); - properties.put("javax.persistence.schema-generation.drop-script-source", + properties.put("jakarta.persistence.schema-generation.database.action", "drop"); + properties.put("jakarta.persistence.schema-generation.drop-script-source", "org/apache/openjpa/persistence/jdbc/schema/drop.sql"); SchemaGroup dbSchemaGroup = getSchemaGroup(properties); @@ -288,7 +288,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { testSchemaGenMetadataDropAndCreate(); Map properties = new HashMap<>(); - properties.put("javax.persistence.sql-load-script-source", + properties.put("jakarta.persistence.sql-load-script-source", "org/apache/openjpa/persistence/jdbc/schema/load.sql"); OpenJPAEntityManagerFactory pmf = getEmf(properties); @@ -310,8 +310,8 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenOutputScriptCreate() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "create"); - properties.put("javax.persistence.schema-generation.scripts.create-target", + properties.put("jakarta.persistence.schema-generation.database.action", "create"); + properties.put("jakarta.persistence.schema-generation.scripts.create-target", "target/create-db-output.sql"); getEmf(properties).createEntityManager(); @@ -323,8 +323,8 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenOutputScriptDrop() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop"); - properties.put("javax.persistence.schema-generation.scripts.drop-target", + properties.put("jakarta.persistence.schema-generation.database.action", "drop"); + properties.put("jakarta.persistence.schema-generation.scripts.drop-target", "target/drop-db-output.sql"); getEmf(properties).createEntityManager(); @@ -336,10 +336,10 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest { public void testSchemaGenOutputScriptDropAndCreate() throws Exception { Map properties = new HashMap<>(); - properties.put("javax.persistence.schema-generation.database.action", "drop-and-create"); - properties.put("javax.persistence.schema-generation.scripts.create-target", + properties.put("jakarta.persistence.schema-generation.database.action", "drop-and-create"); + properties.put("jakarta.persistence.schema-generation.scripts.create-target", "target/create-db-output.sql"); - properties.put("javax.persistence.schema-generation.scripts.drop-target", + properties.put("jakarta.persistence.schema-generation.scripts.drop-target", "target/drop-db-output.sql"); getEmf(properties).createEntityManager(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Address.java index 5e2a9eca4..c073b61b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Address.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="ADDR_PQC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java index 00736b5fe..bfe6c0836 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.HashSet; import java.util.Set; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToMany; @Entity @DiscriminatorValue("AUTHOR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java index ff8dfe408..7bbff1e47 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.HashSet; import java.util.Set; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.ExternalValues; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CD.java index 408859648..fe5ef57eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CD.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorValue("CD") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java index 62003d1cf..3f9c4899a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Child in a bidirectional parent-child relationship. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKEmbeddedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKEmbeddedEntity.java index 757625c2e..2d43575f5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKEmbeddedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKEmbeddedEntity.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class CombinedPKEmbeddedEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKListEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKListEntity.java index def133e2e..2a3ee9505 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKListEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKListEntity.java @@ -19,12 +19,12 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Entity public class CombinedPKListEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKTestEntity.java index 430f9991d..85f8b3d0c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/CombinedPKTestEntity.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class CombinedPKTestEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java index 660c49c4b..65adffa55 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.Collection; import java.util.HashSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="COMPANY_PQC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java index a9928597e..a69a7979f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="DEPT_PQC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java index 2706e1032..8861ea01c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.Date; -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.persistence.OneToOne; -import javax.persistence.Table; +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.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="EMPLOYEE_PQC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Merchandise.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Merchandise.java index 207a591c7..899ea3e78 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Merchandise.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Merchandise.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Table(name="MERCHANDISE_PQC") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java index bb2444829..6718a4d05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.sqlcache; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * A simple entity for a complex test. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java index 93205f715..2c7d98ee9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * Parent in a bidirectional parent-child relationship. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Person.java index eb7f11c4e..21e7c1f3a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Person.java @@ -20,17 +20,17 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java index 28c546d11..b4e1ef4a7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.HashSet; import java.util.Set; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; @Entity @DiscriminatorValue("SINGER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java index 732f7056e..b4b472b7a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.List; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.kernel.StoreQuery; import org.apache.openjpa.kernel.exps.QueryExpressions; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java index 06d617ad5..14b59273e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.kernel.FinderCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java index 2cdadc2c5..876d6855a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java @@ -22,7 +22,7 @@ package org.apache.openjpa.persistence.jdbc.sqlcache; import java.util.Arrays; import java.util.List; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.kernel.PreparedQuery; import org.apache.openjpa.kernel.PreparedQueryCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java index 7639c1442..61c6d4eba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java @@ -24,9 +24,9 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.kernel.QueryStatistics; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java index c8ff3e7d4..6f406b8da 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java @@ -28,10 +28,10 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.kernel.PreparedQuery; import org.apache.openjpa.kernel.PreparedQueryCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/AbstractExtValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/AbstractExtValue.java index 6f500d9a2..51cce8a92 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/AbstractExtValue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/AbstractExtValue.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.jdbc.sqlcache.discrim; import java.io.Serializable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @DiscriminatorColumn(discriminatorType = DiscriminatorType.INTEGER, name = "EXTDISCR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ComposedPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ComposedPK.java index 0e468fdb7..3008e8260 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ComposedPK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ComposedPK.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.sqlcache.discrim; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class ComposedPK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ExtValue1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ExtValue1.java index 6800753d8..e40e025a1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ExtValue1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/ExtValue1.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.sqlcache.discrim; import java.io.Serializable; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("9") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/TestFinderCacheWithNulls.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/TestFinderCacheWithNulls.java index a2c0ed219..bc8ad47bb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/TestFinderCacheWithNulls.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/TestFinderCacheWithNulls.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.sqlcache.discrim; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/UserData.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/UserData.java index 3b0aad9ca..8c1243c43 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/UserData.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/discrim/UserData.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.sqlcache.discrim; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "TB1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java index 80909ae76..886217136 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.jdbc.strategy; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="ADDR_STR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MappedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MappedEntity.java index 1f05849a5..9baf12490 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MappedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MappedEntity.java @@ -15,10 +15,10 @@ */ package org.apache.openjpa.persistence.jdbc.strategy; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * Defines the aggregated side of the entity relation diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java index 7d0683bf8..ceb0ac46b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java @@ -18,13 +18,13 @@ package org.apache.openjpa.persistence.jdbc.strategy; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.FetchType; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.FetchType; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.jdbc.strategy.MappedEntity.Key; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java index 03a14a2d1..bdb64c6ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.jdbc.strategy; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.Strategy; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestHandlerStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestHandlerStrategy.java index eb38ae5fd..ed685d082 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestHandlerStrategy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestHandlerStrategy.java @@ -15,7 +15,7 @@ */ package org.apache.openjpa.persistence.jdbc.strategy; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.jdbc.strategy.MappedEntity.Key; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestStrategyAnnotaion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestStrategyAnnotaion.java index 4f206d5e3..5aa2a8f5b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestStrategyAnnotaion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/TestStrategyAnnotaion.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jdbc.strategy; import java.util.List; -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 org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueA.java index d28c230bd..e741947c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueA.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.jdbc.unique; import java.util.Collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * Data structures for testing unique constraint settings on ORM Annotations. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java index 1489dba4c..9ebcd8143 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java @@ -20,16 +20,16 @@ package org.apache.openjpa.persistence.jdbc.unique; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name="N_UNIQUE_B", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java index 17dcf0753..7cec40c20 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java index b9c2136a2..0b8499f28 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.unique; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java index aefe437fa..4aeb328de 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.unique; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.SQLSniffer; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java index 2d0d3baa6..67c34a870 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jdbc.unique; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.SQLSniffer; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java index 1c4141f1e..124c08f67 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.jdbc.unique; import java.util.Collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * Data structures for testing unique constraint settings on ORM Annotations. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java index 247a3dc53..e17b2640e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.jdbc.unique; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name="UNIQUE_B", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/BaseTimestampedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/BaseTimestampedEntity.java index 1f0e3a661..bb2b9b5f6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/BaseTimestampedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/BaseTimestampedEntity.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.jdbc.update; import java.sql.Timestamp; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public abstract class BaseTimestampedEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Child.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Child.java index 24e486742..2fd5bd7de 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Child.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Child.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.update; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Child in a bidirectional parent-child relationship. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/NumericVersionedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/NumericVersionedEntity.java index 7a7448393..a2f5f68bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/NumericVersionedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/NumericVersionedEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.jdbc.update; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * An entity using a Timestamp as Version field. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java index bec1003e2..5353a9c3f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc.update; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * Parent in a bidirectional parent-child relationship. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java index 3f43b462b..55d639327 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jdbc.update; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.meta.FieldMapping; import org.apache.openjpa.jdbc.schema.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java index ee3152b6c..0d6eb3ab3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java @@ -22,8 +22,8 @@ import java.sql.Timestamp; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TimestampedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TimestampedEntity.java index f227c8bae..c83c9d6b3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TimestampedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TimestampedEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jdbc.update; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * An entity using a Timestamp as Version field. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java index 02c838574..899975819 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java @@ -20,8 +20,8 @@ import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.jdbc.version.model.IntVersion; import org.apache.openjpa.persistence.jdbc.version.model.ShortVersion; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/IntVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/IntVersion.java index d24827a79..ca8926a48 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/IntVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/IntVersion.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.version.model; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="IntVersion") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/ShortVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/ShortVersion.java index 0d944a23a..fe9016552 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/ShortVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/ShortVersion.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jdbc.version.model; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="ShortVersion") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/TimestampVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/TimestampVersion.java index 7bae18314..c76abffdb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/TimestampVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/model/TimestampVersion.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.jdbc.version.model; import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "TimestampVersion") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java index f8e1e4695..d8226a7fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jpql; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; import org.apache.openjpa.persistence.util.EagerEmbed; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java index d8d2cd93e..17a02336b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jpql.clauses; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.common.apps.Entity1; import org.apache.openjpa.persistence.common.apps.Entity2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java index a4bae9f9f..3a7943423 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jpql.clauses; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.apps.ArtCourse; import org.apache.openjpa.persistence.common.apps.Course; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java index 2e299e71e..0e766c413 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jpql.clauses; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.common.apps.RuntimeTest1; import org.apache.openjpa.persistence.common.apps.RuntimeTest2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java index c7de2de54..13ea9d5b0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jpql.clauses; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.apps.RuntimeTest1; import org.apache.openjpa.persistence.common.apps.RuntimeTest2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java index 4b3a0571d..f486f36db 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jpql.clauses; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.NamedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NamedQuery; import org.apache.openjpa.persistence.common.apps.Entity1; import org.apache.openjpa.persistence.common.apps.Entity2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java index 9cb33ad0a..1bbe11e50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jpql.entities; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; @Entity public class OrderedElementEntity implements IOrderedElements, java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java index 0509c80a7..23ef00eea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jpql.entities; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; @Entity public class OrderedManyToManyEntity implements IOrderedEntity, java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java index 3c8289f44..5b9df798f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jpql.entities; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; @Entity public class OrderedNameEntity implements IColumnEntity, java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java index ba327f3f2..ebe05a2ba 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jpql.entities; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; @Entity public class OrderedOneToManyEntity implements IOrderedEntity, java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java index 3a726fba6..7eafcf714 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jpql.entities; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class UnorderedNameEntity implements INameEntity, java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java index 9533e8063..3bd0da2d4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jpql.entities; import java.util.ArrayList; import java.util.List; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; public class XMLOrderedNameEntity implements INameEntity, java.io.Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java index 409a25b6a..614b164ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jpql.expressions; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.apps.Address; import org.apache.openjpa.persistence.common.apps.CompUser; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java index 627c33583..ffa57c821 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.apps.Address; import org.apache.openjpa.persistence.common.apps.CompUser; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java index 5b02aefe6..115d9df56 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jpql.expressions; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java index 60fc86456..1268904c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.persistence.jpql.entities.IColumnEntity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java index 95f5a8f21..131b88b6a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jpql.expressions; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java index e44d80deb..c337e0f8a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jpql.functions; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java index cb61095b0..b20da0a13 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.jpql.functions; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.common.apps.Address; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java index e6e80389c..dd5eaa091 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jpql.joins; import java.io.Serializable; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * Entity implementation class for Entity: Parent diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java index 3221ae497..596f097eb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.jpql.joins; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.jpql.joins.Department.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Tue Jun 03 09:13:08 CDT 2014") public class Department_ { public static volatile SingularAttribute deptno; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java index 0e35559e0..0569aaa78 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.jpql.joins; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * Entity implementation class for Entity: Child diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java index f07afa22f..eb9a206e5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.jpql.joins; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.jpql.joins.Employee.class) -@javax.annotation.Generated +@jakarta.annotation.Generated (value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Tue Jun 03 09:14:37 CDT 2014") public class Employee_ { public static volatile SingularAttribute dept; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java index c708c6bc6..b398831dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.jpql.joins; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.apps.ArtCourse; import org.apache.openjpa.persistence.common.apps.Course; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java index b2f879cf8..7029bf8b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jpql.joins; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java index 74feba7ab..be69a4f5b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jpql.joins.leftfetch; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; @Entity public class DepartmentTest{ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/PersonTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/PersonTest.java index dcef756e0..89643f69b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/PersonTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/PersonTest.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jpql.joins.leftfetch; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java index 7ba778419..ca94f05ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jpql.joins.leftfetch; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAPersistence; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java index 956c12c3f..67f236e13 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jpql.literals; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Author.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Author.java index bc86c86c8..2e801596f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Author.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Author.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jpql.version; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class Author { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Document.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Document.java index 6ecc61983..12fa42d24 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Document.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Document.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.jpql.version; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Document { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java index 496d0683f..34f844118 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jpql.version; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java index 756048a93..85a858877 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jpql.version.type; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass abstract class BaseEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ChildVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ChildVersionEntity.java index 2d3f168c8..6e7206526 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ChildVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ChildVersionEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.jpql.version.type; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ChildVersionEntity extends BaseEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java index 744b33505..407e9a9d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jpql.version.type; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class LongVersionEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java index a360a651a..0a05a733a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jpql.version.type; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class PrimativeLongVersionEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java index eef644b31..0437e18ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jpql.version.type; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class PrimativeShortVersionEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java index 3c2047ccb..356a6f8fd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.jpql.version.type; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class ShortVersionEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java index e154651e9..05333c794 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.jpql.version.type; import java.sql.Timestamp; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java index e52f51047..0c7a591a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.jpql.version.type; import java.io.Serializable; import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class TimestampVersionEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/EJBNoPersistentFieldsNoPersistentFieldsPCEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/EJBNoPersistentFieldsNoPersistentFieldsPCEntity.java new file mode 100644 index 000000000..e9c846a25 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/EJBNoPersistentFieldsNoPersistentFieldsPCEntity.java @@ -0,0 +1,30 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.kernel; + +import java.io.Serializable; + +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "npfp") +public class EJBNoPersistentFieldsNoPersistentFieldsPCEntity implements Serializable { + private static final long serialVersionUID = 1L; + public transient int blankInt; + public transient String blankString; +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/PessimisticLockEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/PessimisticLockEntity.java index 8b5119ce8..7c5a0777b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/PessimisticLockEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/PessimisticLockEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class PessimisticLockEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/StaticInnerClassesContainer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/StaticInnerClassesContainer.java new file mode 100644 index 000000000..3b7002ce6 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/StaticInnerClassesContainer.java @@ -0,0 +1,54 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.kernel; + +import java.util.LinkedList; +import java.util.List; + +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +/** + * Test entities as static inner classes + */ +public class StaticInnerClassesContainer { + + @Entity + @Table(name="StaticInner") + public static class Inner { + + @SuppressWarnings("unused") + private int num = 0; + private String string = null; + private List twins = new LinkedList(); + + protected Inner() { + } + + public Inner(String string) { + this.string = string; + } + + public void addTwin() { + twins.add(new Inner(string)); + } + + public String getString() { + return string; + } + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java index 9e85f0b51..1d0ba1bb0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.Entity1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBulkDelete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBulkDelete.java index ce675449b..aed9a2557 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBulkDelete.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBulkDelete.java @@ -16,8 +16,8 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.CalendarFields; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java index 01ba7cf4b..2a3ce976a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.kernel.common.apps.ComplexEmbeddedPC; import org.apache.openjpa.persistence.kernel.common.apps.EmbeddedOwnerPC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java index a064a89c4..978b76dec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.kernel; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java index dc1d70c81..1d65dc877 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.AImplB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java index 7095c12c3..ec055fecc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.InstanceCallbacksTest; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java index 6878b0762..4819b5c95 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.InterfaceHolder; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java index 954106636..8057e8e92 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java @@ -18,21 +18,14 @@ */ package org.apache.openjpa.persistence.kernel; -import java.io.Serializable; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; public class TestEJBLobs extends AbstractTestCase { private EntityManager _pm = null; - private Inner _inner = null; + private TestEJBLobsInnerEntity _inner = null; public TestEJBLobs(String name) { super(name, "kernelcactusapp"); @@ -40,7 +33,7 @@ public class TestEJBLobs extends AbstractTestCase { @Override public void setUp() throws Exception { - super.setUp(Inner.class, Inner2.class); + super.setUp(TestEJBLobsInnerEntity.class, TestEJBLobsInner2Entity.class); EntityManager em = currentEntityManager(); startTx(em); @@ -48,12 +41,12 @@ public class TestEJBLobs extends AbstractTestCase { endTx(em); endEm(em); - Inner inner = new Inner(); + TestEJBLobsInnerEntity inner = new TestEJBLobsInnerEntity(); inner.setString("string"); inner.setClob("clobField"); inner.setEBlob("eblob"); - Inner2 inner2 = new Inner2(); + TestEJBLobsInner2Entity inner2 = new TestEJBLobsInner2Entity(); inner2.string = "inner2"; inner.setBlob(inner2); @@ -71,7 +64,7 @@ public class TestEJBLobs extends AbstractTestCase { endEm(_pm); _pm = currentEntityManager(); - _inner = _pm.find(Inner.class, "string"); + _inner = _pm.find(TestEJBLobsInnerEntity.class, "string"); } public void testOtherFields() { @@ -98,13 +91,13 @@ public class TestEJBLobs extends AbstractTestCase { } public void testDelete() { - deleteAll(Inner.class); + deleteAll(TestEJBLobsInnerEntity.class); } public void testUpdate() { startTx(_pm); _inner.setClob("newvalue"); - Inner2 inner2 = new Inner2(); + TestEJBLobsInner2Entity inner2 = new TestEJBLobsInner2Entity(); inner2.string = "newinner2"; _inner.setBlob(inner2); endTx(_pm); @@ -113,64 +106,4 @@ public class TestEJBLobs extends AbstractTestCase { assertEquals("newinner2", _inner.getBlob().string); } - @Entity - @Table(name = "inntable") - public static class Inner { - - @Id - private String string = null; - private String clobField = null; - private Object eblob = null; - - @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.REMOVE }) - private Inner2 blobField = null; - - public String getString() { - return string; - } - - public void setString(String val) { - string = val; - } - - public String getClob() { - return clobField; - } - - public void setClob(String val) { - clobField = val; - } - - public String getEBlob() { - return ((String) eblob); - } - - public void setEBlob(String val) { - eblob = val; - } - - public Inner2 getBlob() { - return blobField; - } - - public void setBlob(Inner2 val) { - blobField = val; - } - } - - @Entity - @Table(name="Inner2") - public static class Inner2 implements Serializable { - private static final long serialVersionUID = 1L; - @Id - public String string = null; - - public String getString() { - return string; - } - - public void setString(String string) { - this.string = string; - } - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobsInner2Entity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobsInner2Entity.java new file mode 100644 index 000000000..d26239e15 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobsInner2Entity.java @@ -0,0 +1,39 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.kernel; + +import java.io.Serializable; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "Inner2") +public class TestEJBLobsInner2Entity implements Serializable { + private static final long serialVersionUID = 1L; + @Id + public String string = null; + + public String getString() { + return string; + } + + public void setString(String string) { + this.string = string; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobsInnerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobsInnerEntity.java new file mode 100644 index 000000000..70aa48646 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobsInnerEntity.java @@ -0,0 +1,68 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.kernel; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "inntable") +public class TestEJBLobsInnerEntity { + + @Id + private String string = null; + private String clobField = null; + private Object eblob = null; + + @OneToOne(cascade = {CascadeType.PERSIST, CascadeType.REMOVE}) + private TestEJBLobsInner2Entity blobField = null; + + public String getString() { + return string; + } + + public void setString(String val) { + string = val; + } + + public String getClob() { + return clobField; + } + + public void setClob(String val) { + clobField = val; + } + + public String getEBlob() { + return ((String) eblob); + } + + public void setEBlob(String val) { + eblob = val; + } + + public TestEJBLobsInner2Entity getBlob() { + return blobField; + } + + public void setBlob(TestEJBLobsInner2Entity val) { + blobField = val; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java index 0b8ffb83c..6540389b8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java index 8db8c1549..e56e12e4b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.InverseA; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java index 6df8ae223..d7010499b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java @@ -18,20 +18,13 @@ */ package org.apache.openjpa.persistence.kernel; -import java.io.Serializable; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; public class TestEJBNoPersistentFields extends AbstractTestCase { - private Nholder holder; + private TestEJBNoPersistentFieldsNholderEntity holder; public TestEJBNoPersistentFields(String test) { super(test, "kernelcactusapp"); @@ -39,21 +32,21 @@ public class TestEJBNoPersistentFields extends AbstractTestCase { @Override public void setUp() throws Exception { - deleteAll(Nholder.class); + deleteAll(TestEJBNoPersistentFieldsNholderEntity.class); } public void testNoPersistentFields() { EntityManager em = currentEntityManager(); startTx(em); - holder = new Nholder(); - holder.setNpf(new NoPersistentFieldsPC()); + holder = new TestEJBNoPersistentFieldsNholderEntity(); + holder.setNpf(new EJBNoPersistentFieldsNoPersistentFieldsPCEntity()); holder.setIdKey(1); em.persist(holder); endTx(em); - Nholder holder2 = em.find(Nholder.class, 1); + TestEJBNoPersistentFieldsNholderEntity holder2 = em.find(TestEJBNoPersistentFieldsNholderEntity.class, 1); assertEquals(1, holder2.getIdKey()); assertNotNull(holder2); assertNotNull(holder2.getNpf()); @@ -61,47 +54,4 @@ public class TestEJBNoPersistentFields extends AbstractTestCase { endEm(em); } - @Entity - @Table(name = "nholder2") - public static class Nholder implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - private int idkey; - - @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.REMOVE }) - private NoPersistentFieldsPC npf; - - public Nholder() { - } - - public Nholder(NoPersistentFieldsPC npf, int idkey) { - this.npf = npf; - this.idkey = idkey; - } - - public void setNpf(NoPersistentFieldsPC npf) { - this.npf = npf; - } - - public NoPersistentFieldsPC getNpf() { - return this.npf; - } - - public int getIdKey() { - return idkey; - } - - public void setIdKey(int idkey) { - this.idkey = idkey; - } - } - - @Entity - @Table(name = "npfp") - public static class NoPersistentFieldsPC implements Serializable { - private static final long serialVersionUID = 1L; - public transient int blankInt; - public transient String blankString; - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFieldsNholderEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFieldsNholderEntity.java new file mode 100644 index 000000000..dd7cd5111 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFieldsNholderEntity.java @@ -0,0 +1,61 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.kernel; + +import java.io.Serializable; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "nholder2") +public class TestEJBNoPersistentFieldsNholderEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private int idkey; + + @OneToOne(cascade = {CascadeType.PERSIST, CascadeType.REMOVE}) + private EJBNoPersistentFieldsNoPersistentFieldsPCEntity npf; + + public TestEJBNoPersistentFieldsNholderEntity() { + } + + public TestEJBNoPersistentFieldsNholderEntity(EJBNoPersistentFieldsNoPersistentFieldsPCEntity npf, int idkey) { + this.npf = npf; + this.idkey = idkey; + } + + public void setNpf(EJBNoPersistentFieldsNoPersistentFieldsPCEntity npf) { + this.npf = npf; + } + + public EJBNoPersistentFieldsNoPersistentFieldsPCEntity getNpf() { + return this.npf; + } + + public int getIdKey() { + return idkey; + } + + public void setIdKey(int idkey) { + this.idkey = idkey; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java index 001a481d0..4ef7beb49 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.Inner; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java index 65658dd15..f07a1f220 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.kernel; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.AllFieldsTypeTest; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java index d996070c5..5d5489c4f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java index 0778db3ae..0a46f7c2a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel; import java.math.BigDecimal; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.AllFieldsTypeTest; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java index 2ac80ed0e..f9b950285 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.TransactionalClassPC; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java index ce1b6d706..258127145 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.kernel; import java.util.ArrayList; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java index 060eb088a..585f15107 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java index 1984841c3..fa11fa3c2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.common.apps.RuntimeTest1; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java index f976067d8..66b402934 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java @@ -35,8 +35,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityNotFoundException; import org.apache.openjpa.kernel.BrokerFactory; import org.apache.openjpa.kernel.DelegatingBrokerFactory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java index a1b1433fb..eea49e5ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java index be64f59ea..40f179181 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; import org.apache.openjpa.persistence.kernel.common.apps.UnAnnotPojo; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java index 53de300fc..2259a51aa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java @@ -58,7 +58,7 @@ public class TestSecurityContext extends BaseKernelTest { @Override public void tearDown() - throws Exception { + throws Exception { System.setSecurityManager(oldManager); oldManager = null; super.tearDown(); @@ -73,7 +73,7 @@ public class TestSecurityContext extends BaseKernelTest { } public class StrictSecurityManager - extends SecurityManager { + extends SecurityManager { private void debug(String msg) { // log.debug (msg); @@ -97,12 +97,6 @@ public class TestSecurityContext extends BaseKernelTest { super.checkAccess(g); } - @Override - public void checkAwtEventQueueAccess() { - debug("checkAwtEventQueueAccess"); - super.checkAwtEventQueueAccess(); - } - @Override public void checkConnect(String host, int port) { debug("checkConnect: " + host + "," + port); @@ -151,12 +145,6 @@ public class TestSecurityContext extends BaseKernelTest { super.checkListen(port); } - @Override - public void checkMemberAccess(Class clazz, int which) { - debug("checkMemberAccess: " + clazz + "," + which); - super.checkMemberAccess(clazz, which); - } - @Override public void checkMulticast(InetAddress maddr) { debug("checkMulticast: " + maddr); @@ -241,18 +229,6 @@ public class TestSecurityContext extends BaseKernelTest { super.checkSetFactory(); } - @Override - public void checkSystemClipboardAccess() { - debug("checkSystemClipboardAccess"); - super.checkSystemClipboardAccess(); - } - - @Override - public boolean checkTopLevelWindow(Object window) { - debug("checkTopLevelWindow: " + window); - return super.checkTopLevelWindow(window); - } - @Override public void checkWrite(FileDescriptor fd) { debug("checkWrite: " + fd); @@ -265,64 +241,10 @@ public class TestSecurityContext extends BaseKernelTest { super.checkWrite(file); } - @Override - protected int classDepth(String name) { - debug("classDepth: " + name); - return super.classDepth(name); - } - - @Override - protected int classLoaderDepth() { - debug("classLoaderDepth"); - return super.classLoaderDepth(); - } - - @Override - protected ClassLoader currentClassLoader() { - debug("currentClassLoader"); - return super.currentClassLoader(); - } - - @Override - protected Class currentLoadedClass() { - debug("currentLoadedClass"); - return super.currentLoadedClass(); - } - @Override protected Class[] getClassContext() { debug("getClassContext"); return super.getClassContext(); } - - @Override - public boolean getInCheck() { - debug("getInCheck"); - return super.getInCheck(); - } - - @Override - public Object getSecurityContext() { - debug("getSecurityContext"); - return super.getSecurityContext(); - } - - @Override - public ThreadGroup getThreadGroup() { - debug("getThreadGroup"); - return super.getThreadGroup(); - } - - @Override - protected boolean inClass(String name) { - debug("inClass: " + name); - return super.inClass(name); - } - - @Override - protected boolean inClassLoader() { - debug("inClassLoader"); - return super.inClassLoader(); - } } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java index 944b7a0f5..4877686fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java @@ -27,12 +27,6 @@ */ package org.apache.openjpa.persistence.kernel; -import java.util.LinkedList; -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Table; - import org.apache.openjpa.persistence.OpenJPAEntityManager; public class TestStaticInnerClasses extends BaseKernelTest { @@ -52,8 +46,8 @@ public class TestStaticInnerClasses extends BaseKernelTest { @Override public void setUp() throws Exception { - super.setUp(Inner.class); - Inner inner = new Inner("foo"); + super.setUp(StaticInnerClassesContainer.Inner.class); + StaticInnerClassesContainer.Inner inner = new StaticInnerClassesContainer.Inner("foo"); inner.addTwin(); OpenJPAEntityManager pm = getPM(); startTx(pm); @@ -65,7 +59,7 @@ public class TestStaticInnerClasses extends BaseKernelTest { public void testGetById() { OpenJPAEntityManager pm = getPM(); - Inner inner = pm.find(Inner.class, _oid); + StaticInnerClassesContainer.Inner inner = pm.find(StaticInnerClassesContainer.Inner.class, _oid); assertNotNull(inner); assertEquals("foo", inner.getString()); endEm(pm); @@ -121,28 +115,4 @@ public class TestStaticInnerClasses extends BaseKernelTest { } - @Entity - @Table(name="StaticInner") - public static class Inner { - - @SuppressWarnings("unused") - private int num = 0; - private String string = null; - private List twins = new LinkedList(); - - protected Inner() { - } - - public Inner(String string) { - this.string = string; - } - - public void addTwin() { - twins.add(new Inner(string)); - } - - public String getString() { - return string; - } - } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java index 0e987917c..ba715d44a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.kernel; import java.util.ArrayList; import java.util.List; -import javax.persistence.RollbackException; +import jakarta.persistence.RollbackException; import org.apache.openjpa.jdbc.kernel.EntityA; import org.apache.openjpa.jdbc.kernel.EntityB; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java index 89529d2e6..c7354b81c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "aimplb") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AbstractMappedAppIdSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AbstractMappedAppIdSuper.java index 717f802a3..eeed3765f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AbstractMappedAppIdSuper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AbstractMappedAppIdSuper.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractMappedAppIdSuper { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java index 1f8c4152c..b0eadfb17 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java @@ -25,14 +25,14 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java index 3200787fe..620eaacca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java @@ -24,10 +24,10 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Used in testing; should be enhanced. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java index 178b1e6f7..662799c97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; //import java.lang.annotation.Annotation; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java index 61cac9cef..0cb42e35b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java @@ -25,7 +25,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Holder for one-one and one-many relations to app id hierarchy classes. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java index a5f27578b..18261152f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.StringTokenizer; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Abstract subclass that defines one more primary key field than its diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubC.java index 78a337e97..638be09d3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Concrete subclass that defines two more primary key fields than its diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubD.java index 079f6f01d..f7a0e9d4e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Concrete subclass that defines one more primary key field than its diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubE.java index e7b4190e7..95b26b9f6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubE.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Concrete subclass that does not define any more primary key fields diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubF.java index 9b4ab9b57..ddcaabef8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubF.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Concrete subclass that does not define any more primary key fields diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java index 0b8f2c513..3f9c2878c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java index eac2220c5..d70d4d2fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java @@ -23,14 +23,14 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java index 36efed29e..9f74240b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java @@ -23,10 +23,10 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java index 3912db61b..ba3fa5cf8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.LinkedList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java index c857be969..91bdbdd63 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java @@ -26,17 +26,17 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java index b74a1eb21..6d2eb9d69 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java @@ -21,20 +21,20 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java index 80216a518..6422e1cd1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java @@ -23,14 +23,14 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java index 5f31d4b5a..5feac0572 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachVersionA { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionB.java index a900dd954..38d509c14 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionB.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachVersionB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionC.java index c563478c7..ccf071c93 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachVersionC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/BlobTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/BlobTest.java index 98646c6a3..733e6db8b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/BlobTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/BlobTest.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class BlobTest { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java index 8e79a9206..5f0c9c2df 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; @Entity @Table(name = "blobs") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ByteArray.java index 9882238a8..f9cfe192e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ByteArray.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ByteArray.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "bytearray") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java index bc2f097ce..bc19b367e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java @@ -23,11 +23,11 @@ import java.util.Calendar; import java.util.List; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "CAL_FLDS") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ColumnIOPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ColumnIOPC.java index ccabe3c0f..166e973de 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ColumnIOPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ColumnIOPC.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "columnpc") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java index 3d428f4cf..6e4271273 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** *

    Embedded type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ConcreteMappedAppIdSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ConcreteMappedAppIdSub.java index 6f214fa1f..61796080c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ConcreteMappedAppIdSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ConcreteMappedAppIdSub.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ConcreteMappedAppIdSub diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java index e028636ad..c67631715 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "dversion") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java index b5bcfde73..b32eb4e7f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java @@ -23,17 +23,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.Dependent; import org.apache.openjpa.persistence.ElementDependent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java index a931b1a87..54471710c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.PersistentCollection; import org.apache.openjpa.persistence.jdbc.KeyColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java index 490cc8f7d..72c24aed9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.EmbeddedMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedPC.java index 5b7c03dfc..16fa7d95a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedPC.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** *

    Embedded type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java index 12f592044..dc793eb2d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java @@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "kernentity_1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java index fe6ad4fa6..b66263246 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity(name = "entity2ExplicitName") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ExternalValues.java index 0946fcd8f..a478ccc85 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ExternalValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ExternalValues.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "extnlval") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchA.java index fecd5240a..5395fc524 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchA.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; /** * A persistent entity to verify behavior of dynamically constructed FetchPlan diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchB.java index 5ee5497e8..fd9b282a3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchB.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * A persistent entity to verify behavior of dynamically constructed FetchPlan diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchBase.java index e8d572bf2..6ba7f3aad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchBase.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * A base entity to verify behavior of dynamically constructed FetchPlan by diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java index c92a46ea4..8c53c2b38 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java @@ -21,17 +21,17 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.math.BigInteger; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObjectChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObjectChild.java index 9ab4429cb..c2dd3a80b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObjectChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObjectChild.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java index 8a9dfe6d8..e404b526f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "nullvalue") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InstanceCallbacksTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InstanceCallbacksTest.java index 97e81c87d..7d1d9aa3e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InstanceCallbacksTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InstanceCallbacksTest.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.PostLoad; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java index dab89e890..b860bff0d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java @@ -22,14 +22,14 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "holder") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java index 7b876b1ff..33ba6fd25 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** *

    Persistent type used in testing

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java index c2e22e677..5fa040cd5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** *

    Persistent type used in testing

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java index 2588ae427..37aa87c4e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java index 3e461ccd2..d76ebb215 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persistent type used in testing

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java index 4a3a5a793..600004d9b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "inverseA") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java index 4a3b2a90a..b61ae650a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "inverseB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java index 841b0bc2d..ec09b8200 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; @Entity @Table(name = "zlobs") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java index fce9fefa1..834d7ffab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class LockGroupPC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java index 148f017b8..cec5176f8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Used to test lock-group="none" in isolation.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java index 5b2a6e3cb..6c003f903 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class LockGroupPCKnownSubclass diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwner.java index 602c1248d..0ff64d681 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwner.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ManagedInterfaceOwner { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwnerAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwnerAppId.java index fa6cb2301..e64cd6eea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwnerAppId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceOwnerAppId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ManagedInterfaceOwnerAppId { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java index 560d37f88..4047986cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java index 94c129a54..6ea18cd5a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.common.utils.AbstractTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java index a7169ef82..3c323bf2a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MixedInterfaceImpl implements MixedInterface { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModInstanceCallbackTests.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModInstanceCallbackTests.java index 92e71f92d..d398a1f0d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModInstanceCallbackTests.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModInstanceCallbackTests.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.PostLoad; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java index b0af4b726..678359832 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java @@ -22,18 +22,18 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @Entity @Table(name = "Modrtest1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java index 461681a81..fe48c7d50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("ModRT2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java index 536189cc7..7521868ad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NonMappedInterfaceImpl diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java index 4117ccead..f82ad1d86 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "objchol") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/OuterJoinValuePC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/OuterJoinValuePC.java index cdbc55082..7f66dfa90 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/OuterJoinValuePC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/OuterJoinValuePC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "outerjvp") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCAddress.java index 7d09eef32..ed36aeea8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCAddress.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCAddress.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java index 980252014..4f1a29176 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.Persistent; import org.apache.openjpa.persistence.Type; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java index f76c0073a..18a489873 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCountry.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCountry.java index f920591d7..1678ccb1c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCountry.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCountry.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Pinaki Poddar */ -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; @Entity public class PCFile { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java index 958b8e329..35d7e388d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistenceAware.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistenceAware.java index 89b019101..582f63e8b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistenceAware.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistenceAware.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    A persistence-aware type that should be enhanced.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java index ceee96d99..919012e85 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.PersistentMap; import org.apache.openjpa.persistence.jdbc.KeyColumn; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java index c9cc941e5..33f63f163 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java @@ -29,16 +29,16 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.apache.openjpa.lib.util.collections.ComparableComparator; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RecursivelyEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RecursivelyEmbeddedPC.java index 2195c2f29..b24563bfd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RecursivelyEmbeddedPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RecursivelyEmbeddedPC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; /** *

    Embedded type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java index 6bd6a68e8..acca5cb59 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java @@ -24,20 +24,20 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java index f53d87af1..e4547b14a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java index 0d7a1d322..6a79260fe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java index 0f446453c..ca89388ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="RuntimeTest4k") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest5.java index e42cd42a6..d37f733e9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest5.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="RuntimeTest5k") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java index 201a5aa21..2d38e894c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java @@ -24,10 +24,10 @@ import java.util.Collection; import java.util.Date; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; import org.apache.openjpa.persistence.PersistentMap; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SecondaryTab.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SecondaryTab.java index 90bad0760..045377b7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SecondaryTab.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SecondaryTab.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.Table; @Entity @Table(name = "sectables") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java index 2efcef6c8..2dfde125f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "seqAssigned") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned2.java index ac580c15e..175fd83ad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("seqAss2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java index 6c20b1fb6..1b3777627 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "seqAss3") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java index b821abc44..87b99bd32 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.ByteId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java index dc577f07f..02d6b19ea 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.CharId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java index 92583a509..b8aafc09c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.IntId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java index 708402255..9d7f8d47d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.LongId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java index 879f43a69..8773bf2f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.ShortId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java index 1a011ee16..789784d68 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.StringId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java index 6cfef53d6..ffcd4bd32 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.util.IntId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java index 76d329945..616523f4a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java @@ -22,13 +22,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java index cc18213d2..5936e30b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.kernel.common.apps; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.apache.openjpa.persistence.kernel.TestIndirectRecursion; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ValueStrategyPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ValueStrategyPC.java index d0c020326..5c2c33494 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ValueStrategyPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ValueStrategyPC.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.kernel.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "valstratpc") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java index 52d5aca44..a97e7fa21 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lifecycle; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.relations.BidiChild; import org.apache.openjpa.persistence.relations.BidiParent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java index 4de8342d3..cb4caf981 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lifecycle; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.UnenhancedPropertyAccess; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java index ab2db919f..e0c6b9b74 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.log; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.lib.log.AbstractLog; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java index 5c91ffca5..ebfcbbf36 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.managedinterface; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.ManagedInterface; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java index 2fda1fc4a..59827ffa2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.apache.openjpa.persistence.ManagedInterface; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java index ca43172cb..4fb926b02 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.CascadeType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class ManagedInterfaceOwner { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java index c7b056077..9e537d6a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.ManagedInterface; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java index 24a077a96..820154dda 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.ManagedInterface; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java index 89c997584..08847894e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class MixedInterfaceImpl implements MixedInterface { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java index 8ab1659e3..826a814c1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NonMappedInterfaceImpl diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java index c501d51eb..2a1babe1d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.ManagedInterface; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java index 8da9d2c14..7c7c8786b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java @@ -24,8 +24,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.persistence.EntityNotFoundException; -import javax.persistence.Query; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.Query; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.persistence.Extent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java index 9f32bcdaf..f9e80c0c1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.managedinterface; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.kernel.AbstractBrokerFactory; import org.apache.openjpa.meta.ClassMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java index 88c6de74b..a01d66b46 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @IdClass(ChildPK.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/GrandChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/GrandChild.java index f5813475a..4c883978d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/GrandChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/GrandChild.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.merge; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @IdClass(GrandChildPK.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItem.java index 1fc5580e3..b4d65e3f4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItem.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.merge; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table( name = "ITEM_TABLE" ) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItemPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItemPK.java index 431444b70..746e0ac51 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItemPK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/LineItemPK.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.merge; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class LineItemPK implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java index 91a6df87e..58f393b4b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java @@ -22,16 +22,16 @@ import java.sql.Date; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table( name = "ORDER_TABLE" ) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java index a71e551ad..3b24b88b7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java @@ -22,14 +22,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @IdClass(ParentPK.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java index 346e2fc49..5eb1162b7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.merge; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.merge.model.Toy; import org.apache.openjpa.persistence.merge.model.ToyBox; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java index 25813ca9c..3668c66c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.merge; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.merge.model.Inner; import org.apache.openjpa.persistence.merge.model.Outer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java index 0a156ca65..5faf89d01 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.merge; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java index 24afe483b..acb192a63 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.merge; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.merge.model.Car; import org.apache.openjpa.persistence.merge.model.Label; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java index 59be611da..8438cb20e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.merge; import java.io.IOException; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java index fec267e4c..21bbffb59 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.merge; import java.sql.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Car.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Car.java index 508099888..167b2005e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Car.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Car.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="MRG_CAR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java index 6bd1dd70a..2384924a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.merge.model; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name = "INNER_TBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label.java index c5f4fed03..26fc2e0b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DetachedState; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label2.java index ac9ac3e73..47f21e858 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Label2.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DetachedState; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Make.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Make.java index 8fd3d1cdb..1417a7032 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Make.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Make.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.merge.model; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DetachedState; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Model.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Model.java index ddce7e2be..ca9387f91 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Model.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Model.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Outer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Outer.java index 4bde4ded7..bcb7384d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Outer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Outer.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.merge.model; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name = "OUTER_TBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage.java index 26ca79453..99d309cd6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage.java @@ -18,16 +18,16 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; @Entity @Table(name = "MRG_PACKAGE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage2.java index 4ce617e6e..7538ef376 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ShipPackage2.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; @Entity @Table(name = "MRG_PACKAGE2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Toy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Toy.java index f02f8da37..aab25ff7c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Toy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Toy.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.merge.model; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Toy { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java index 184d5de08..e9386294a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.merge.model; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @Entity public class ToyBox { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember.java index 2afa3e5a7..5ad4eafc0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.meta; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class ArrayMember { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember_.java index 23197b797..6f213acc8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ListAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ArrayMember.class) public class ArrayMember_ { public static volatile ListAttribute Array; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0.java index 04df782c3..ccf6e1dc0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0_.java index e3e09e357..d001b7df3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.Embed0.class) public class Embed0_ { public static volatile SingularAttribute entity1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1.java index 4b15f36a2..071ac0c94 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1_.java index 78ecef3f8..504550b93 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.Embed1.class) public class Embed1_ { public static volatile SingularAttribute entity0; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess.java index d8906b25f..7891a3ea8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed.java index c69cc1712..3c8c36f15 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed_.java index d5c928930..c3c9ca37b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ExplicitFieldAccessMixed.class) public class ExplicitFieldAccessMixed_ { public static volatile SingularAttribute f1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess_.java index 060f0f583..2bc47e551 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ExplicitFieldAccess.class) public class ExplicitFieldAccess_ { public static volatile SingularAttribute f1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess.java index bd8ebc41e..f82f2a51f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed.java index 175582a2d..112eeb645 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed_.java index a05ac3721..f3942d983 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ExplicitPropertyAccessMixed.class) public class ExplicitPropertyAccessMixed_ { public static volatile SingularAttribute f1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess_.java index 07dd3959d..ca014014f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess_.java @@ -23,9 +23,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ExplicitPropertyAccess.class) public class ExplicitPropertyAccess_ { public static volatile SingularAttribute f1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase.java index 0e3723289..3a420f748 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase.java @@ -24,11 +24,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -// import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +// import jakarta.persistence.Transient; /** * Domain classes used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase_.java index 59e6308a4..2c9ea60c3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase_.java @@ -23,13 +23,13 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ImplicitFieldAccessBase.class) public class ImplicitFieldAccessBase_ extends ImplicitFieldAccessMappedSuperclass_ { public static volatile SingularAttribute boxedInt; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass.java index 2ba224337..69e895b43 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java index eee4a2418..36120226b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java @@ -25,9 +25,9 @@ package org.apache.openjpa.persistence.meta; import java.util.Date; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ImplicitFieldAccessMappedSuperclass.class) public class ImplicitFieldAccessMappedSuperclass_ { public static volatile SingularAttribute createTime; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java index 5fa9a638f..cb586913c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.meta; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; /** * Domain class used by meta-model testing. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass_.java index bca39ed38..4cebf7912 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass_.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass_.java @@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -@javax.persistence.metamodel.StaticMetamodel +@jakarta.persistence.metamodel.StaticMetamodel (value=org.apache.openjpa.persistence.meta.ImplicitFieldAccessSubclass.class) public class ImplicitFieldAccessSubclass_ extends ImplicitFieldAccessBase_ { public static volatile SingularAttribute base; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MdrTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MdrTestEntity.java index 1765fe8a9..bfce23929 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MdrTestEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MdrTestEntity.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.meta; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; @Entity @NamedQueries( { @NamedQuery(name = "query", query = "SELECT p FROM MdrTestEntity p") }) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MetamodelWithEnumEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MetamodelWithEnumEntity.java new file mode 100644 index 000000000..799bb97c1 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/MetamodelWithEnumEntity.java @@ -0,0 +1,44 @@ +/* + * 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. + */ +package org.apache.openjpa.persistence.meta; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +@Entity +public class MetamodelWithEnumEntity { + @Id + private String id; + + private TestMetamodelWithEnum.MyEnum enumColumn; + + public String getId() { + return id; + } + + public void setId(final String id) { + this.id = id; + } + + public TestMetamodelWithEnum.MyEnum getEnumColumn() { + return enumColumn; + } + + public void setEnumColumn(final TestMetamodelWithEnum.MyEnum enumColumn) { + this.enumColumn = enumColumn; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java index 8343700f6..784a3e61d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.meta; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java index 58603c974..c3a87f514 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java @@ -22,8 +22,8 @@ package org.apache.openjpa.persistence.meta; import java.util.List; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.ArgumentException; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java index f6fa29c33..10d50a20c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.meta; import java.lang.reflect.Member; import java.lang.reflect.Method; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.kernel.Broker; import org.apache.openjpa.meta.ClassMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java index 5d4b3c2a6..464f8731c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java @@ -24,18 +24,18 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Attribute.PersistentAttributeType; -import javax.persistence.metamodel.Bindable.BindableType; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.PluralAttribute.CollectionType; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type.PersistenceType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute.PersistentAttributeType; +import jakarta.persistence.metamodel.Bindable.BindableType; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.PluralAttribute.CollectionType; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type.PersistenceType; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.persistence.embed.Address; @@ -167,7 +167,7 @@ public class TestMetamodel extends SingleEMFTestCase { ManagedType e0 = model.entity(ImplicitFieldAccessBase.class); ManagedType r1 = model.entity(ExplicitFieldAccess.class); CollectionAttribute relColl = e0.getCollection("collectionRelation", ExplicitFieldAccess.class); - assertEquals(javax.persistence.metamodel.PluralAttribute.CollectionType.COLLECTION, + assertEquals(jakarta.persistence.metamodel.PluralAttribute.CollectionType.COLLECTION, relColl.getCollectionType()); assertEquals(e0, relColl.getDeclaringType()); assertEquals(r1, relColl.getElementType()); @@ -193,7 +193,7 @@ public class TestMetamodel extends SingleEMFTestCase { ManagedType e0 = model.entity(ImplicitFieldAccessBase.class); ManagedType r1 = model.entity(ExplicitFieldAccess.class); SetAttribute relSet = e0.getSet("setRelation", ExplicitFieldAccess.class); - assertEquals(javax.persistence.metamodel.PluralAttribute.CollectionType.SET, relSet.getCollectionType()); + assertEquals(jakarta.persistence.metamodel.PluralAttribute.CollectionType.SET, relSet.getCollectionType()); assertEquals(e0, relSet.getDeclaringType()); assertEquals(r1, relSet.getElementType()); assertEquals(ExplicitFieldAccess.class, relSet.getBindableJavaType()); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodelWithEnum.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodelWithEnum.java index 3ccc97b07..e9a13af35 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodelWithEnum.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodelWithEnum.java @@ -19,10 +19,8 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.apache.openjpa.persistence.test.SingleEMFTestCase; @@ -33,7 +31,7 @@ public class TestMetamodelWithEnum extends SingleEMFTestCase { super.setUp( "openjpa.RuntimeUnenhancedClasses", "unsupported", "openjpa.DynamicEnhancementAgent", "false", - Main.class, AttributeConverterImpl.class); + MetamodelWithEnumEntity.class, AttributeConverterImpl.class); } public void testEnsureEnumDontFail() { // OPENJPA-2743 @@ -53,30 +51,6 @@ public class TestMetamodelWithEnum extends SingleEMFTestCase { } } - @Entity - public static class Main { - @Id - private String id; - - private MyEnum enumColumn; - - public String getId() { - return id; - } - - public void setId(final String id) { - this.id = id; - } - - public MyEnum getEnumColumn() { - return enumColumn; - } - - public void setEnumColumn(final MyEnum enumColumn) { - this.enumColumn = enumColumn; - } - } - public enum MyEnum { A } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java index 4f7d6c329..70c1ff0b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.meta.MetaDataRepository; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java index 6975d0bf8..72a169c3f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.meta; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ExternalValues.java index 1a1788d79..ffade865d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ExternalValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ExternalValues.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.meta.common.apps; import java.util.UUID; -import javax.persistence.Convert; +import jakarta.persistence.Convert; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.Externalizer; import org.apache.openjpa.persistence.Factory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPC.java index 9027a45d9..39bd51edd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class FieldOrderPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPCSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPCSubclass.java index 7c0ed3a6a..dc672abc1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPCSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/FieldOrderPCSubclass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class FieldOrderPCSubclass diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest1.java index 1fdd37719..3c5749a7b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest1.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java index d95a8e06c..141727fbb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.meta.common.apps; import java.util.Collection; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; @Entity public class MetaTest2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java index e0d49458a..c07cdc280 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.meta.common.apps; import java.util.Map; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MetaTest3 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest4.java index 4545faf48..1eaac6504 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest4.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MetaTest4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java index 121fd2055..57d56b2ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest6.java index 44157e3b5..1003fa4b8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest6.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest6.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MetaTest6 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest7.java index 5679ef0ee..601ebc462 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest7.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest7.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.Externalizer; import org.apache.openjpa.persistence.Factory; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java index a8b82ad62..4cd150816 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.meta.common.apps; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.meta.ClassMetaData; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java index 1d78393f4..37d4b4d71 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.meta.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRel.java index 8f28ebeba..f4841864d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRel.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRel.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderByPCRel { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRelSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRelSub.java index 7647a56bc..c192fd9c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRelSub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPCRelSub.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderByPCRelSub diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java index 0bff77a48..b0dfb6a03 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class RuntimeTest1 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java index 92c812fe5..78e43fe6e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class RuntimeTest2 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java index 7626b124c..1df8931f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class RuntimeTest3 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java index 3a9085f0d..7ae69b0d5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SequenceAssigned { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned2.java index 76e55cf00..696d1d3f1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned2.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SequenceAssigned2 extends SequenceAssigned { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java index 777bca227..f4aa0087d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SequenceAssigned3 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/TransactionalClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/TransactionalClassPC.java index af8b08b43..81155c348 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/TransactionalClassPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/TransactionalClassPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/UuidAttributeConverter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/UuidAttributeConverter.java index 736326826..0f14fecd3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/UuidAttributeConverter.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/UuidAttributeConverter.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.meta.common.apps; import java.util.UUID; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class UuidAttributeConverter implements AttributeConverter diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ValueStrategyPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ValueStrategyPC.java index 0c5b2e196..bd373240f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ValueStrategyPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/ValueStrategyPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.meta.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ValueStrategyPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java index 4f7fc52e8..e337d75c0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.models.company.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.models.company.IAddress; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java index 2e4f641e9..caaa7a369 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.models.company.basic; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICompany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java index 741b9f98c..33f09abe6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.models.company.basic; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICustomer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java index 90139e464..e0298b4b8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.models.company.basic; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java index efec92f6d..a8a316e22 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.models.company.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.models.company.IFullTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java index 772b50611..db20eafac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.models.company.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ILineItem; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java index bbc638948..455f4aa3c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.models.company.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.models.company.IPartTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java index 5430efa90..0d4c5c17c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.models.company.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.IPerson; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java index 1e64154ef..9c66442a2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.models.company.basic; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java index 94ce4f8a0..4bd685573 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java @@ -22,11 +22,11 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICustomer; import org.apache.openjpa.persistence.models.company.ILineItem; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java index 1fb6c7e3d..28d7379a7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.models.company.fetchlazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.models.company.IAddress; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java index 96a7bc318..a172efd12 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.models.company.fetchlazy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICompany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java index d328e613f..bc472a562 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.models.company.fetchlazy; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICustomer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java index 5e79e4ac9..4b919e8c9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.models.company.fetchlazy; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java index 2c437e83f..0fc906a60 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.models.company.fetchlazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import org.apache.openjpa.persistence.models.company.IFullTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java index b6787616f..8306e06f6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.models.company.fetchlazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ILineItem; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java index 09cede065..b1be15ccf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.models.company.fetchlazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import org.apache.openjpa.persistence.models.company.IPartTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java index af4304d3a..eb6bd68a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.models.company.fetchlazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.IPerson; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java index 0fafb29a3..906768711 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.models.company.fetchlazy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java index 8bdc7d615..052af981f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java @@ -22,12 +22,12 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICustomer; import org.apache.openjpa.persistence.models.company.ILineItem; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java index 13fd7c68b..fd879e306 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.models.company.idclass; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.models.company.IAddress; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java index 7a6a4518b..12a68e1d2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.models.company.idclass; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICompany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java index aef5ce0eb..fc2996ed1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.models.company.idclass; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICustomer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java index 61c95242d..dd789abeb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.models.company.idclass; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java index 89445c76c..95d0209c5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.models.company.idclass; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.models.company.IFullTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java index 73da4d748..1d7bc28b9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.models.company.idclass; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ILineItem; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java index 2213f82dd..701202675 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.models.company.idclass; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.apache.openjpa.persistence.models.company.IPartTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java index 570daf9e6..fdbbf9b70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.models.company.idclass; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.IPerson; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java index 5d033ca79..b8b831ea8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.models.company.idclass; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java index 4537a6a6d..16feb0641 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java @@ -22,11 +22,11 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICustomer; import org.apache.openjpa.persistence.models.company.ILineItem; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java index 6ef36ff24..48b5771ca 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.models.company.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.models.company.IAddress; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java index d62f3c8f2..f0acf2967 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.models.company.joined; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICompany; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java index 3ff9efa41..1d0ec8ed4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.models.company.joined; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.ICustomer; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java index ae1608462..90f06704d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.models.company.joined; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java index 82abfc463..5e0afe068 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.models.company.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.models.company.IFullTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java index 5f523acd3..720be0a92 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.models.company.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ILineItem; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java index 53a637948..d5442ce6d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.models.company.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.models.company.IPartTimeEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java index 6c52af699..803f09234 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.models.company.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.IAddress; import org.apache.openjpa.persistence.models.company.IPerson; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java index a219c135f..1110bd362 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.models.company.joined; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.apache.openjpa.persistence.models.company.ICompany; import org.apache.openjpa.persistence.models.company.IProduct; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java index caf10cc2d..56a68f308 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java @@ -22,11 +22,11 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.models.company.ICustomer; import org.apache.openjpa.persistence.models.company.ILineItem; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java index 390f9dfcb..2ffb170a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java @@ -24,16 +24,16 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name="LIBBOOK") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java index 9b8cb9c80..4507097a4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java @@ -23,15 +23,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="LIBBORROWER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java index 74e60c531..8a452fc9c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java @@ -23,12 +23,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity @Table(name="LIBSUBJECT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java index c520785dd..3ac7ba268 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.models.library; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="LIBVOLUNTEER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java index 4f3faa33a..8fa97e684 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/AbstractNullityTestCase.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.nullity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/NullValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/NullValues.java index 39c2186ea..63de693ae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/NullValues.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/NullValues.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.nullity; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; /** * Persistent entity used to test behavior of null constraint on basic fields. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java index 3a89b76d5..a5c2edbcb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.nullity; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.RollbackException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java index e40a1b29e..5b3534362 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.nullity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.AbstractDB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TimestampedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TimestampedEntity.java index 757ff4a55..6f5414d0b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TimestampedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TimestampedEntity.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.nullity; import java.sql.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * This Entity contains two date fields which are updated by the database. The diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/TestTimestampOptLockEx.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/TestTimestampOptLockEx.java index 422da7d5c..32a95a2dd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/TestTimestampOptLockEx.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/TestTimestampOptLockEx.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.optlockex.timestamp; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/VersionTSEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/VersionTSEntity.java index a317f14a0..76f0c22ae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/VersionTSEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/optlockex/timestamp/VersionTSEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.optlockex.timestamp; import java.io.Serializable; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class VersionTSEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/AccessModsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/AccessModsEntity.java index a3043bbb3..4a0de406f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/AccessModsEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/AccessModsEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @Entity @Table(name="PUBPROT_TBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java index 11fd78f6a..3e00093e6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmbeddableAddress implements IAddress { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java index 4a5dea299..39a194e50 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/PrivAccessModsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/PrivAccessModsEntity.java index 2bf6ebc15..b86d005ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/PrivAccessModsEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/PrivAccessModsEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @Entity @Table(name="PRIV_TBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java index 5913d7887..387252d9d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatAccessMods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatAccessMods.java index 41fa1001d..3e49795d2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatAccessMods.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatAccessMods.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java index 6856f30c5..d42ed19e6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.property; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestEMProperties.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestEMProperties.java index bcff7b196..da7f14e7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestEMProperties.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestEMProperties.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.property; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; import org.apache.openjpa.persistence.OpenJPAQuery; @@ -37,7 +37,7 @@ public class TestEMProperties extends SingleEMFTestCase { public void setUp() { setUp(EntityContact.class, EmbeddableAddress.class, - DROP_TABLES, "javax.persistence.query.timeout", 23456); + DROP_TABLES, "jakarta.persistence.query.timeout", 23456); } public void testQueryTimeoutPropertyDefault() { @@ -53,7 +53,7 @@ public class TestEMProperties extends SingleEMFTestCase { public void testQueryTimeoutPropertyOnEntityManagerCreation() { Map properties = new HashMap(); - properties.put("javax.persistence.query.timeout", "12345"); + properties.put("jakarta.persistence.query.timeout", "12345"); // Setting a value of type String should convert if possible and not return an error EntityManager em = emf.createEntityManager(properties); @@ -69,7 +69,7 @@ public class TestEMProperties extends SingleEMFTestCase { EntityManager em = emf.createEntityManager(); // Setting a value of type String should convert if possible and not return an error - em.setProperty("javax.persistence.query.timeout", "12345"); + em.setProperty("jakarta.persistence.query.timeout", "12345"); String sql = "select * from EntityContact"; OpenJPAQuery query = OpenJPAPersistence.cast(em.createNativeQuery(sql)); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java index 07e74a609..d00bdaf69 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.proxy; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @MappedSuperclass public abstract class AbstractEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/ConcreteEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/ConcreteEntity.java index ba89bb43b..17281a184 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/ConcreteEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/ConcreteEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.proxy; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class ConcreteEntity extends AbstractEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java index f42467f83..1156326c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java @@ -25,7 +25,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java index 099d4a468..16910c40d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy; import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java index c27dc1afc..95769e9dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy; import java.util.LinkedHashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; import org.apache.openjpa.util.ChangeTracker; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java index c199f6b41..2db720a48 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java @@ -23,13 +23,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DetachedState; import org.apache.openjpa.persistence.ElementDependent; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Award.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Award.java index e91223f78..38284eaf9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Award.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Award.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Award implements Serializable, Comparable{ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Certification.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Certification.java index 2370c4f2b..b4da0e7da 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Certification.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Certification.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.proxy.delayed; import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Embeddable public class Certification implements Serializable, Comparable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java index 8cedd78a9..849c7bf75 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Random; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.kernel.DetachedStateManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java index 671ddf47c..1b8b2bc5a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.proxy.delayed; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Product.java index e3ea83c6b..5fe8beac6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Product.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Product.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.proxy.delayed; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java index f91551fd6..06a8bcca3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.alist; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Department.java index b4e1d84bc..c4bdb01c1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Department.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.Collection; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java index 1f2966272..f76cae240 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.alist; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java index 93a685677..22c004f7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.alist; import java.util.Collection; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java index 7a1e62ee7..a7dad9b0b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxyDetachLite.java index 87ae3ed59..5d61568e9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.alist; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java index 623d22388..d87a3d00b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.alist; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java index 630b05609..d3f17b70a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.hset; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Department.java index d81388d91..8ef974693 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Department.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.Collection; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java index 17a3f9583..fecdb405c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.hset; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java index 8d6d91e23..437cd1a03 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.hset; import java.util.Collection; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java index 18114a769..70cfda421 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxyDetachLite.java index 417e18dad..194215798 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.hset; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java index 0d40bd59c..f21e630d3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.hset; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java index 55e1ceaa4..cc193414f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.lhset; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Department.java index f4e5c6938..313b119bd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Department.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.Collection; import java.util.LinkedHashSet; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java index 466fc3c9e..d1fbfa1e4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.lhset; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java index caf4502d0..51019d1ff 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.lhset; import java.util.Collection; import java.util.LinkedHashSet; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java index 6c2fe8fdb..9e7f8e010 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxyDetachLite.java index cc3068fec..dbd70f361 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.lhset; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java index 1b1d46240..a14dccbfc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.lhset; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java index 84b16a560..67c1ba612 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.llist; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Department.java index 34049ee59..be4277ae7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Department.java @@ -23,17 +23,17 @@ import java.util.Collection; import java.util.LinkedList; import java.util.Queue; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java index 28a56a20c..d069845aa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.llist; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java index 457ec14b7..bd6441d0d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.llist; import java.util.Collection; import java.util.Queue; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java index 95d04fcbf..b53dbcf26 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxyDetachLite.java index 603491a95..b56faf693 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.llist; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java index 16f20832a..92b4a49af 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.llist; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java index 30692a90c..14972a6d5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.pqueue; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Department.java index 2aab88cb2..10c673c65 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Department.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.Collection; import java.util.PriorityQueue; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java index 01d4e6fc8..fe2db6dfb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.pqueue; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java index 818180805..886bd7b69 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.pqueue; import java.util.Collection; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java index f65fb14ec..2d9f0aba5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.PriorityQueue; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxyDetachLite.java index cc512635e..9026a0cc8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.pqueue; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java index 9d3af4a01..02c892413 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.pqueue; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java index 5d111c544..fa16fe3f0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.tset; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Department.java index 806377454..b6200397a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Department.java @@ -23,17 +23,17 @@ import java.util.Collection; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java index 4b006c30a..536de5187 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.tset; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java index 4ec136b9c..9b6eecffe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.tset; import java.util.Collection; import java.util.PriorityQueue; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java index cbed3d42f..2067d47d8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.TreeSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxyDetachLite.java index 67311c75f..9ea4d3713 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.tset; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java index df5a1eb92..e26c54388 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.tset; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java index 2dd8d34aa..15eb82dc0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.delayed.vec; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Department.java index bb8e4c6b9..3cf870b05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Department.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Department.java @@ -22,17 +22,17 @@ import java.io.Serializable; import java.util.Collection; import java.util.Vector; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java index 53ca0c8c6..cbae79ac3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.delayed.vec; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; import org.apache.openjpa.persistence.proxy.delayed.IEmployee; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java index 25c40fdea..a56922331 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.delayed.vec; import java.util.Collection; import java.util.Vector; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.proxy.delayed.IAccount; import org.apache.openjpa.persistence.proxy.delayed.IMember; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java index 997d1eab7..eea617bab 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.Vector; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.proxy.delayed.Award; import org.apache.openjpa.persistence.proxy.delayed.Certification; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxyDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxyDetachLite.java index 145bb2af0..7b17b6116 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxyDetachLite.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxyDetachLite.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.proxy.delayed.vec; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.persistence.proxy.delayed.IDepartment; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java index d7d6ca0ac..3508a24d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.proxy.delayed.vec; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.proxy.delayed.IMember; import org.apache.openjpa.persistence.proxy.delayed.IUserIdentity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java index 1439adae2..11ed54d76 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.proxy.entities; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="ADDRESS_ANNUITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java index 38d32ee4a..66972752e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java @@ -23,24 +23,24 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java index 7c13200d5..026c54f7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.proxy.entities; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; @Entity @PrimaryKeyJoinColumn(name="ID") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java index 620d4b7c9..d35016afb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.proxy.entities; import java.util.Date; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @MappedSuperclass public class AnnuityPersistebleObject implements JPAPersisteble { @@ -44,7 +44,7 @@ public class AnnuityPersistebleObject implements JPAPersisteble { } @Override - @javax.persistence.Id + @jakarta.persistence.Id public String getId() { return id; } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java index aefcb6133..bc233341f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.proxy.entities; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @Entity @Table(name="CONTACT_ANNUITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java index 804389cc6..975516b03 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.proxy.entities; import java.text.DecimalFormat; import java.text.ParseException; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value = "EQUITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java index 4cdc6d25f..efeae5d11 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.proxy.entities; import java.text.DecimalFormat; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value = "FIXED") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java index b86f93def..442da9704 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.proxy.entities; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity @AttributeOverride(name="lastUpdateDate", column=@Column(name="LAST_UPDATE_TS")) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java index 69791e70e..1c2a68080 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java @@ -22,12 +22,12 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.Calendar; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity @AttributeOverride(name="lastUpdateDate", column=@Column(name="LAST_UPDATE_TS")) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java index 3130cfd17..85fbc080e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java @@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.proxy.entities; import java.util.Date; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name="PERSON_ANNUITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java index 811201397..5d718598d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.entities; import java.util.Date; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Table; @Entity @Table(name="RIDER_ANNUITY") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/puconf/TestPersistenceUnitConfig.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/puconf/TestPersistenceUnitConfig.java index b637d2c62..e6f478ea0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/puconf/TestPersistenceUnitConfig.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/puconf/TestPersistenceUnitConfig.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.puconf; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAPersistence; import org.apache.openjpa.persistence.test.PersistenceTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUDefaultSchemaEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUDefaultSchemaEntity.java index 86b49b7e6..11096ea37 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUDefaultSchemaEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUDefaultSchemaEntity.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.pudefaults; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; /* * An entity which has a sequence where the sequence doesn't defined a schema, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceAnnotationEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceAnnotationEntity.java index 7a6ab0bfb..2eccd1eb5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceAnnotationEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceAnnotationEntity.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.pudefaults; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; /* * An entity which has a sequence where the sequence defines a schema, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceMappingEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceMappingEntity.java index cb1cb0fc3..3857a5aa7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceMappingEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInSequenceMappingEntity.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.pudefaults; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; /* * An entity which has a sequence where the sequence defines a schema, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableAnnotationEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableAnnotationEntity.java index 36116a478..e084bc212 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableAnnotationEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableAnnotationEntity.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.pudefaults; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; /* * An entity which has a @Table annotation which contains a schema name, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableMappingEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableMappingEntity.java index c784a2cd7..2e1db97d5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableMappingEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/PUSchemaInTableMappingEntity.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.pudefaults; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; /* * An entity which has a @Table annotation which contains a schema name, diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java index 7042528d2..bee82ecfa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.pudefaults; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java index db162301a..1485186b2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.pudefaults; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Account.java index 88a36dd58..eaa515433 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Account.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Account.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Persistent class used in testing subquery. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Case.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Case.java index 27224784f..5152d93c9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Case.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Case.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "cases") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java index 2b2bcdf71..ef107f6e2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java @@ -23,17 +23,17 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="TCUS") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Dependent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Dependent.java index 6353356f3..17f9a8c01 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Dependent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Dependent.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.query; import java.util.Date; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @Table(name="SUBQ_DEPENDENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/DependentId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/DependentId.java index 2669eb140..e51a0d786 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/DependentId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/DependentId.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class DependentId { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Employee.java index c297650f3..0216daa97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Employee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Employee.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.query; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @NamedQueries( { @NamedQuery(name = "Employee.findByName", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java index 0c0a4ff31..657ab0c5b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.query; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Hardware.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Hardware.java index 6a2ef1df1..3410646d3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Hardware.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Hardware.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.query; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; /** * The persistent class for the Hardware table. Include references to diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Lookup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Lookup.java index 0a269c695..ce2f53dd4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Lookup.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Lookup.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "lookups") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java index 027e2c9b4..06c0ab9bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.query; import java.io.Serializable; import java.sql.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Magazine implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java index 0dd9be6dd..da30cbc8d 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.query; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity @Inheritance(strategy=InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java index ff89a9971..6853189aa 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ManyOneEntitySub diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/NamedQueryEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/NamedQueryEntity.java index 43773aa25..b14176ce3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/NamedQueryEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/NamedQueryEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name="NamedQueryEntity.namedQuery", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java index ecce1f505..f37b66321 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java @@ -22,15 +22,15 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="TODR") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java index dbf364bd6..65ebe2508 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java @@ -17,14 +17,14 @@ * under the License. */ package org.apache.openjpa.persistence.query; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="TODREITM") public class OrderItem { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Person.java index c7fe0d025..e68c18ac7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Person.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.query; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * The persistent class for the People table. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java index 9be016039..5543039a9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.query; import java.io.Serializable; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Publisher implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Role.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Role.java index 3ea0d4522..1660e395e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Role.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Role.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "rolesx") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduleDay.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduleDay.java index 757176246..92493ddee 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduleDay.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduleDay.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.query; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name = "scheduledays", uniqueConstraints = @UniqueConstraint(columnNames = "scheduledate")) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduledAssignment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduledAssignment.java index 93975b3b0..44605d4b5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduledAssignment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ScheduledAssignment.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "scheduledassignments") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java index 1a0c446fd..ff5423d56 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java @@ -20,19 +20,19 @@ package org.apache.openjpa.persistence.query; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; @NamedQuery(name="FindXTwo", query="select s from simple s where s.name = ?1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java index 9ba207e08..0d0bc9a70 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @NamedQuery(name="FindXTwo", query="select s from simple2 s where s.name = ?1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java index 4fddedbb2..bad9fefef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.query; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java index 8f1465ba2..5a5f2b361 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.simple.NamedEntity; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java index 0824ac13e..3264500a4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.simple.AllFieldTypes; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java index 183a17941..a625cfc10 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.query; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java index 38ee94a1f..2d2df87d3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.query.common.apps.Entity1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java index feb8a0535..678e287d8 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1; import org.apache.openjpa.persistence.query.common.apps.RuntimeTest2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java index 2d8596615..f143340a9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.query.common.apps.Entity1; import org.apache.openjpa.persistence.query.common.apps.Entity2; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java index 185350406..96ca20a75 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java index 706d4da0a..dea840569 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; import org.apache.openjpa.persistence.OpenJPAQuery; import org.apache.openjpa.persistence.simple.AllFieldTypes; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java index 637503a13..dce4be63a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.query; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java index 1f641a909..5aeb72c61 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java index 42edd347d..520856767 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java @@ -28,7 +28,7 @@ package org.apache.openjpa.persistence.query; import java.util.Collection; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.meta.QueryMetaData; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java index 965ae78d5..c81cd3074 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.query.common.apps.Osoba; import org.apache.openjpa.persistence.query.common.apps.Projekt; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java index f730d5a7a..f54d01fae 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java index 85d2738a6..ff845fcf9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java @@ -22,8 +22,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.FetchPlan; import org.apache.openjpa.persistence.QueryImpl; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java index 6717b8955..a7c341586 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.jdbc.common.apps. UnidirectionalOneToOneOwned; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryConvertPositionalParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryConvertPositionalParameters.java index ce19f5359..c93f7c944 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryConvertPositionalParameters.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryConvertPositionalParameters.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.kernel.jpql.JPQLParser; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java index ed56e6f6e..2eb2ac70c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java index 4d3dc138e..a5fac65ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAQuery; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java index e305ea120..cda762fa6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java index 03670a4a7..1ae319de1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; -import javax.persistence.TransactionRequiredException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TransactionRequiredException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.apache.openjpa.persistence.query.common.apps.Entity1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java index 1798d8672..d6a3b5213 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java index 52e141f9c..4fae4c3ec 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java @@ -18,17 +18,17 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.kernel.jpql.JPQLParser; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java index bf2adf69a..052d3f59d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.kernel.PreparedQuery; import org.apache.openjpa.kernel.PreparedQueryCache; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java index 0d4865806..b0fcba66d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.apache.openjpa.persistence.Extent; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java index ea0deb079..39d191801 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; @@ -52,7 +52,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase; * 2.2) using the QueryHint annotation * 2.3) using setHint() * 3) Setting timeout to msecs < DELAY value causes new - * javax.persistence.QueryTimeoutException for databases that do not + * jakarta.persistence.QueryTimeoutException for databases that do not * cause a rollback or a PersistenceException if they do, when set by: * 3.1) using persistence.xml PU properties (or createEMF Map properties) * 3.2) using the QueryHint annotation @@ -161,9 +161,9 @@ public class TestQueryTimeout extends SQLListenerTestCase { em = emf.createEntityManager(); assertNotNull(em); Query q = em.createNamedQuery("NoHintList"); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); try { long startTime = System.currentTimeMillis(); @SuppressWarnings("unchecked") @@ -205,9 +205,9 @@ public class TestQueryTimeout extends SQLListenerTestCase { Query q = em.createQuery("UPDATE QTimeout q SET q.stringField = " + ":strVal WHERE q.id = 1"); q.setParameter("strVal", new String("updated")); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); try { long startTime = System.currentTimeMillis(); em.getTransaction().begin(); @@ -249,7 +249,7 @@ public class TestQueryTimeout extends SQLListenerTestCase { Integer setTime = 0; // create the Map to test overrides Mapprops = new HashMap<>(); - props.put("javax.persistence.query.timeout", "0"); + props.put("jakarta.persistence.query.timeout", "0"); try { // create our EMF with our timeout property @@ -261,13 +261,13 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(conf); assertEquals("Map provided query timeout", setTime.intValue(), conf.getQueryTimeout()); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied // as the Map properties are not passed through as hints em = emf.createEntityManager(); assertNotNull(em); OpenJPAQuery q = em.createNamedQuery("NoHintSingle"); Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // verify internal config values were updated assertEquals("Map provided query timeout", setTime.intValue(), q.getFetchPlan().getQueryTimeout()); @@ -311,13 +311,13 @@ public class TestQueryTimeout extends SQLListenerTestCase { em = emf.createEntityManager(); assertNotNull(em); Query q = em.createNamedQuery("Hint0msec"); - // verify javax.persistence.query.timeout is supplied + // verify jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); Integer timeout = new Integer( - (String) hints.get("javax.persistence.query.timeout")); + (String) hints.get("jakarta.persistence.query.timeout")); getLog().trace("testQueryTimeout22a() - Retrieved hint " + - "javax.persistence.query.timeout=" + timeout); + "jakarta.persistence.query.timeout=" + timeout); assertEquals(timeout, new Integer(0)); try { @@ -362,20 +362,20 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(em); Query q = em.createNamedQuery("NoHintSingle"); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // update the timeout value to 0 and verify it was set getLog().trace("testQueryTimeout23b() - Setting hint " + - "javax.persistence.query.timeout=" + setTime); - q.setHint("javax.persistence.query.timeout", setTime); + "jakarta.persistence.query.timeout=" + setTime); + q.setHint("jakarta.persistence.query.timeout", setTime); hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); Integer timeout = (Integer) hints.get( - "javax.persistence.query.timeout"); + "jakarta.persistence.query.timeout"); getLog().trace("testQueryTimeout23b() - Retrieved hint " + - "javax.persistence.query.timeout=" + timeout); + "jakarta.persistence.query.timeout=" + timeout); assertEquals(timeout, setTime); try { @@ -433,9 +433,9 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(em); OpenJPAQuery q = em.createNativeQuery(nativeUpdateStr); q.setParameter(1, new String("updated")); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // verify internal config values were updated assertEquals("PU provided query timeout", setTime.intValue(), q.getFetchPlan().getQueryTimeout()); @@ -499,7 +499,7 @@ public class TestQueryTimeout extends SQLListenerTestCase { // create the Map to test overrides Map props = new HashMap<>(); - props.put("javax.persistence.query.timeout", "0"); + props.put("jakarta.persistence.query.timeout", "0"); try { // create our EMF with our PU set timeout property @@ -516,15 +516,15 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(em); OpenJPAQuery q = em.createNamedQuery("Hint1000msec"); setTime = 1000; - // verify javax.persistence.query.timeout hint via annotation set + // verify jakarta.persistence.query.timeout hint via annotation set Map hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); Integer timeout = new Integer((String) hints.get( - "javax.persistence.query.timeout")); + "jakarta.persistence.query.timeout")); getLog().trace( - "testQueryTimeout32a() - Found javax.persistence.query.timeout=" + "testQueryTimeout32a() - Found jakarta.persistence.query.timeout=" + timeout); - assertTrue("Expected to find a javax.persistence.query.timeout=" + assertTrue("Expected to find a jakarta.persistence.query.timeout=" + setTime, (timeout.intValue() == setTime.intValue())); // verify internal config values were updated assertEquals("QueryHint provided query timeout", setTime.intValue(), @@ -575,18 +575,18 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(em); Query q = em.createNamedQuery("NoHintSingle"); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // update the timeout value and verify it was set getLog().trace("testQueryTimeout33b() - Setting hint " + - "javax.persistence.query.timeout=" + setTime); - q.setHint("javax.persistence.query.timeout", setTime); + "jakarta.persistence.query.timeout=" + setTime); + q.setHint("jakarta.persistence.query.timeout", setTime); hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); Integer timeout = (Integer) hints.get( - "javax.persistence.query.timeout"); + "jakarta.persistence.query.timeout"); assertEquals(timeout, setTime); try { @@ -657,18 +657,18 @@ public class TestQueryTimeout extends SQLListenerTestCase { // q.setParameter(2, new String("inserted")); OpenJPAQuery q = em.createNativeQuery(nativeUpdateStr); q.setParameter(1, new String("updated")); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // update the query timeout value and verify it was set setTime = 1000; getLog().trace("testQueryTimeout33c() - Setting hint " + - "javax.persistence.query.timeout=" + setTime); - q.setHint("javax.persistence.query.timeout", setTime); + "jakarta.persistence.query.timeout=" + setTime); + q.setHint("jakarta.persistence.query.timeout", setTime); hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); Integer timeout = (Integer) hints.get( - "javax.persistence.query.timeout"); + "jakarta.persistence.query.timeout"); assertEquals(timeout, setTime); // verify internal config values were updated assertEquals("PU provided query timeout", setTime.intValue(), @@ -730,21 +730,21 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(em); Query q = em.createNamedQuery("NoHintSingle"); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // update the timeout value to -1 and verify it was set getLog().trace("testQueryTimeout4() - Setting hint " + - "javax.persistence.query.timeout=" + "jakarta.persistence.query.timeout=" + setTime); - q.setHint("javax.persistence.query.timeout", setTime); + q.setHint("jakarta.persistence.query.timeout", setTime); hints = q.getHints(); - assertTrue(hints.containsKey("javax.persistence.query.timeout")); + assertTrue(hints.containsKey("jakarta.persistence.query.timeout")); Integer timeout = (Integer) hints.get( - "javax.persistence.query.timeout"); + "jakarta.persistence.query.timeout"); getLog().trace("testQueryTimeout4() - Retrieved hint " + - "javax.persistence.query.timeout=" + "jakarta.persistence.query.timeout=" + timeout); assertEquals(timeout, setTime); @@ -784,15 +784,15 @@ public class TestQueryTimeout extends SQLListenerTestCase { assertNotNull(em); Query q = em.createNamedQuery("NoHintSingle"); - // verify no default javax.persistence.query.timeout is supplied + // verify no default jakarta.persistence.query.timeout is supplied Map hints = q.getHints(); - assertFalse(hints.containsKey("javax.persistence.query.timeout")); + assertFalse(hints.containsKey("jakarta.persistence.query.timeout")); // update the timeout value to -2000 and verify it was set getLog().trace("testQueryTimeout5() - Setting hint " + - "javax.persistence.query.timeout=" + "jakarta.persistence.query.timeout=" + setTime); - q.setHint("javax.persistence.query.timeout", setTime); + q.setHint("jakarta.persistence.query.timeout", setTime); fail("Expected testQueryTimeout5() to throw a " + "IllegalArgumentException"); } catch (Exception e) { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java index 98c7d24d2..b91e57e8c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java index ada3505d3..376f487b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java index e157daacb..680acf983 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.query.common.apps.Entity1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java index 10ac3f6c6..fe86a3020 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.query; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java index 622338920..5fed6a2cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.sql.PostgresDictionary; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java index cbf276af3..54b77204d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java @@ -17,12 +17,12 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.LockTimeoutException; -import javax.persistence.PessimisticLockException; -import javax.persistence.Query; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.LockTimeoutException; +import jakarta.persistence.PessimisticLockException; +import jakarta.persistence.Query; +import jakarta.persistence.QueryTimeoutException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; @@ -81,7 +81,7 @@ public class TestTimeoutException extends SingleEMFTestCase { final Query query = em2.createQuery("select p from PObject p"); query.setLockMode(LockModeType.PESSIMISTIC_WRITE); long timeout = 1000; - query.setHint("javax.persistence.query.timeout", timeout); + query.setHint("jakarta.persistence.query.timeout", timeout); try { query.getResultList(); fail("Expected " + QueryTimeoutException.class.getName()); @@ -116,7 +116,7 @@ public class TestTimeoutException extends SingleEMFTestCase { final long timeout = 1000; try { Map hint = new HashMap<>(); - hint.put("javax.persistence.lock.timeout", timeout); + hint.put("jakarta.persistence.lock.timeout", timeout); em2.lock(entity2, LockModeType.PESSIMISTIC_WRITE, hint); fail("Expected " + PessimisticLockException.class.getName()); } catch (Throwable t) { @@ -148,8 +148,8 @@ public class TestTimeoutException extends SingleEMFTestCase { em2.getTransaction().begin(); try { Map hint = new HashMap<>(); - hint.put("javax.persistence.lock.timeout", timeout); - //em2.setProperty("javax.persistence.lock.timeout", timeout); + hint.put("jakarta.persistence.lock.timeout", timeout); + //em2.setProperty("jakarta.persistence.lock.timeout", timeout); em2.find(entityClass, oid, LockModeType.PESSIMISTIC_WRITE, hint); fail("Expected " + LockTimeoutException.class.getName()); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java index 5292c3e6f..e93c51e7b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java @@ -27,7 +27,7 @@ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.common.apps.RuntimeTest1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java index 79a4f3622..3c6623f51 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.query; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; -import javax.persistence.Tuple; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Tuple; import org.apache.openjpa.persistence.simple.NamedEntity; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC.java index 1426e9238..490941d28 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.query.common.apps; * @author Abe White */ -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class CircularFKPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC2.java index d1f386fe5..517630d7a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CircularFKPC2.java @@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.query.common.apps; * @author Abe White */ -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class CircularFKPC2 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java index d84bfab40..5acdf7098 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.Date; import java.util.LinkedList; -import javax.persistence.Entity; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexA { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java index fc5b22d35..6dc5e5a5c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java @@ -23,11 +23,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexB diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java index 6615b44d1..440fdbf65 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java @@ -23,11 +23,11 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexC diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java index f609a3a5d..1447bec35 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java @@ -23,11 +23,11 @@ import java.util.Date; import java.util.Set; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexD { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java index 1b801466e..c97bc27b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java @@ -23,11 +23,11 @@ import java.util.Collection; import java.util.Date; import java.util.LinkedList; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexE diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java index e7724dd94..a51593a46 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java @@ -23,11 +23,11 @@ import java.util.Collection; import java.util.Date; import java.util.HashSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexF diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java index 395a0babd..faea8b95c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.query.common.apps; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class ComplexG diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java index ee3454f0b..6d994e2fa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.query.common.apps; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** *

    Application identity type with a compound primary key.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java index a2828c696..4116c899f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java @@ -20,19 +20,19 @@ package org.apache.openjpa.persistence.query.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "qryentity_1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java index dbdf3c68f..f30155e42 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.query.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; //@Entity(name="entity2ExplicitName") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java index ff07711fa..d6aec4fe4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java @@ -23,16 +23,16 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java index 891e77553..bd269322f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java index 023d9bebd..5f11b269b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java @@ -3,10 +3,10 @@ package org.apache.openjpa.persistence.query.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java index 2db584f7e..be072d2d7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.query.common.apps; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class Projekt { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QTimeout.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QTimeout.java index 4e99faff7..754f2fe5b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QTimeout.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QTimeout.java @@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.query.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.QueryHint; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "qtimeout") @@ -39,11 +39,11 @@ import javax.persistence.Version; query = "select id from qtimeout where mod(DELAY(2,id),2)=1"), @NamedNativeQuery(name = "Hint0msec", query = "select id from qtimeout where mod(DELAY(2,id),2)=0", - hints = { @QueryHint(name = "javax.persistence.query.timeout", + hints = { @QueryHint(name = "jakarta.persistence.query.timeout", value = "0") }), @NamedNativeQuery(name = "Hint1000msec", query = "select id from qtimeout where mod(DELAY(2,id),2)=0", - hints = { @QueryHint(name = "javax.persistence.query.timeout", + hints = { @QueryHint(name = "jakarta.persistence.query.timeout", value = "1000") }) }) public class QTimeout implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java index 628d08030..f503edcb5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.query.common.apps; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; /** *

    Used in testing; should be enhanced.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java index b790e7e88..6854668cb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; import org.apache.openjpa.persistence.PersistentMap; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest3.java index 20fdc3c08..c58c21d93 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest3.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** *

    Used in testing; should be enhanced.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java index 9dee8b5c8..094e3829e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.query.common.apps; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; /** *

    Used in testing; should be enhanced.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java index e8b1bd4d8..f5bea9e1f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java @@ -26,10 +26,10 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java index f0cea3f03..f09e57525 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java index a20b29277..67ba1d447 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** *

    Persitent type used in testing.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java index 9781534ee..b6c2817a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.query.common.apps; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class RuntimeTest4 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest5.java index 56edc488f..93b0eb8f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest5.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest5.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class RuntimeTest5 { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/SimpleAppIdPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/SimpleAppIdPC.java index a237240f5..5a8b76873 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/SimpleAppIdPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/SimpleAppIdPC.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** *

    Single-field application identity class.

    diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/TransactionalClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/TransactionalClassPC.java index 5b7ae7fd7..81c7cb41c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/TransactionalClassPC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/TransactionalClassPC.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.query.common.apps; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class TransactionalClassPC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java index 70c0c0b1a..3f74eae05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java @@ -25,8 +25,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.criteria.Person; import org.apache.openjpa.persistence.criteria.results.Bar; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java index bf0a42b67..821f5afed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java @@ -22,9 +22,9 @@ package org.apache.openjpa.persistence.query.results; import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.criteria.results.ShipRate; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtOperacaoEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtOperacaoEntity.java index 6f7c30251..723fadd97 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtOperacaoEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtOperacaoEntity.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.query.sqlresultmapping; import java.io.Serializable; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; -@javax.persistence.Table(name = "CRT_OPERACAO") +@jakarta.persistence.Table(name = "CRT_OPERACAO") @Entity public class CrtOperacaoEntity implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java index 97cfd62be..4031fa26d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.query.sqlresultmapping; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.ManyToOne; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SqlResultSetMapping; -@javax.persistence.Table(name = "CRT_REQUISICAO_CHEQUE_PERS") +@jakarta.persistence.Table(name = "CRT_REQUISICAO_CHEQUE_PERS") @Entity @SqlResultSetMapping(name = "MyResultMapping", entities = { @EntityResult(entityClass = CrtRequisicaoChequePersEntity.class, fields = { @@ -35,7 +35,7 @@ import javax.persistence.SqlResultSetMapping; public class CrtRequisicaoChequePersEntity extends CrtRequisicaoEntity { @ManyToOne - @javax.persistence.JoinColumn(name = "OPERACAO_RECEPCAO_SERV_CENT", referencedColumnName = "ID") + @jakarta.persistence.JoinColumn(name = "OPERACAO_RECEPCAO_SERV_CENT", referencedColumnName = "ID") private CrtOperacaoEntity crtOperacaoByOperacaoRecepcaoServCent; public CrtOperacaoEntity getCrtOperacaoByOperacaoRecepcaoServCent() { @@ -49,7 +49,7 @@ public class CrtRequisicaoChequePersEntity extends CrtRequisicaoEntity { } @ManyToOne - @javax.persistence.JoinColumn(name = "OPERACAO_REQUISICAO", referencedColumnName = "ID", nullable = false) + @jakarta.persistence.JoinColumn(name = "OPERACAO_REQUISICAO", referencedColumnName = "ID", nullable = false) private CrtOperacaoEntity crtOperacaoByOperacaoRequisicao; public CrtOperacaoEntity getCrtOperacaoByOperacaoRequisicao() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java index 0c32f0ad6..641d759f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.query.sqlresultmapping; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; -@javax.persistence.Table(name = "CRT_REQUISICAO") +@jakarta.persistence.Table(name = "CRT_REQUISICAO") @Entity @Inheritance(strategy = InheritanceType.JOINED) public class CrtRequisicaoEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java index 397b3185f..2febcc537 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.query.sqlresultmapping; import java.sql.Timestamp; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntity.java index 9ae3954d8..f0e11d014 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.querycache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; @Entity @NamedQueries({ diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java index 77c34f481..21174d033 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.querycache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class QCEntityM2O { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java index 394c944cd..ebd4f5854 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.querycache; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.NamedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NamedQuery; import org.apache.openjpa.datacache.ConcurrentQueryCache; import org.apache.openjpa.persistence.querycache.common.apps.Entity1; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java index 3fc0d6cfd..720dfc67e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.querycache; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.FetchPlan; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java index ad02992ef..e7fa90128 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.querycache; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.EntityManagerImpl; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java index c0fde4969..c8b7baaad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java @@ -18,10 +18,10 @@ package org.apache.openjpa.persistence.querycache.common.apps; * specific language governing permissions and limitations * under the License. */ -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.datacache.TestDataCacheBehavesIdentical; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java index 759328e7b..9ea647ba0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.querycache.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; /** * A persistent entity that owns bidirectional single-valued relationship. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java index 7a083b807..5598be05f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java @@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.querycache.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="qcacheentity_1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java index 5173804be..cdbd39919 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.querycache.common.apps; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; //@Entity(name="entity2ExplicitName") @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java index a82bde152..ce69100a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.querycache.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.datacache.TestDataCacheBehavesIdentical; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java index e0c6f7e2a..d849a57c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java @@ -19,10 +19,10 @@ package org.apache.openjpa.persistence.querycache.common.apps; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.datacache.TestDataCacheBehavesIdentical; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java index 9d82db2f8..f412f99fc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.recursive; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @Entity public class Node { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java index c5d0a6875..e907e5c47 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.recursive; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ACase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ACase.java index b99d49de3..a6e4fed41 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ACase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ACase.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class ACase { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AEvident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AEvident.java index 7fb332cf6..080a8a24c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AEvident.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AEvident.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class AEvident { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java index d1da252c9..113cec082 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Entity public class AText { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BasicEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BasicEntity.java index 46948c0ef..25a3c863f 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BasicEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BasicEntity.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class BasicEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java index 168d6a6f2..37a6692b6 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity public class BidiChild implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java index 5881076ad..363d210e6 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java @@ -22,13 +22,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; @Entity public class BidiParent implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java index c01175d8d..29016086e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java index 4379c47d1..626f1c15a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyChild.java index fa03686ee..c4264ceba 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyChild.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java index 1abc4cabc..3b2426e90 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Version; @Entity public class CascadingOneManyParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java index 6bdb2eabb..282436a65 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; @Entity public class ChainEntityA { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java index 935f7a143..01464d80a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @Entity public class ChainEntityB { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityC.java index abb50f140..0a626ac07 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityC.java @@ -18,14 +18,14 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class ChainEntityC { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Child.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Child.java index 65fa3aa95..5be518046 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Child.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Child.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java index e08af2c8d..b895e608e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.relations; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java index fc4a13cc7..a2833141f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.relations; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityLeft.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityLeft.java index a6dce96dc..739fae383 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityLeft.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityLeft.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class ConcurrentEntityLeft { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java index 60fbed315..f954597da 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.relations; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class ConcurrentEntityRight { @@ -34,7 +34,7 @@ public class ConcurrentEntityRight { private String strData; @OneToMany(mappedBy="rightEntity", targetEntity=ConcurrentEntityLeft.class, - cascade={javax.persistence.CascadeType.ALL}) + cascade={jakarta.persistence.CascadeType.ALL}) @MapKey(name="strData") private Map leftEntityMap; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java index f9d9ef586..fdcde9aaa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java @@ -22,15 +22,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @Entity public class Customer { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/D.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/D.java index 5bc1ed1e1..d456c8936 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/D.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/D.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreBasicEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreBasicEntity.java index 218f8ce54..f877f6ef3 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreBasicEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreBasicEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.DataStoreId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreManyOneIdOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreManyOneIdOwner.java index 2a81426c6..471bd77b8 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreManyOneIdOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/DataStoreManyOneIdOwner.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class DataStoreManyOneIdOwner { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java index 5a29868a9..f02182ace 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="E4_REL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java index f6467f0df..3d00634d2 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class EmbeddableWithRelation { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java index 44e786a9f..8b7209c8b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.List; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; @Entity @DiscriminatorValue("A1") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java index 71e61c5d9..b8af6b2be 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.List; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; @Entity @DiscriminatorValue("A2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java index feb310f91..0e1bada35 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; @Entity @Inheritance(strategy=InheritanceType.SINGLE_TABLE) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityBInverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityBInverseEager.java index d4413a9e8..2df899aa4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityBInverseEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityBInverseEager.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class EntityBInverseEager { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityCInverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityCInverseEager.java index 8c923762d..16ca366bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityCInverseEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityCInverseEager.java @@ -17,11 +17,11 @@ * under the License. */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityDInverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityDInverseEager.java index 27b272ac6..f2a60ec9d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityDInverseEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityDInverseEager.java @@ -17,11 +17,11 @@ * under the License. */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChild.java index 9faf07bc3..c03a9f8ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChild.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java index 28c2a96bd..9efe1f9c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.relations; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java index ffda06f9e..d48ff0123 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.relations; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java index 6bff71f8f..e0c69cb66 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.relations; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentMap; import org.apache.openjpa.persistence.jdbc.ContainerTable; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java index e61515cd8..1d659bb86 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.relations; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentMap; import org.apache.openjpa.persistence.simple.AllFieldTypes; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyChild.java index 128435a5c..5e16f53c9 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyChild.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class IdOrderedOneManyChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java index dcadd1d87..4d1c752e8 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Version; @Entity public class IdOrderedOneManyParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java index be8d55129..970e5ff94 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java @@ -21,18 +21,18 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java index 5806d04b7..189709a77 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.FetchAttribute; import org.apache.openjpa.persistence.FetchGroup; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java index 1836b94d1..ae634d935 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; import org.apache.openjpa.persistence.LRS; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwner.java index a12a76717..7e6b03b92 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwner.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity @IdClass(ManyOneCompoundIdOwnerId.class) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneIdOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneIdOwner.java index fb1a46739..9b948e886 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneIdOwner.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneIdOwner.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class ManyOneIdOwner { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java index fe81d3ca2..72d7bc83a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class MapKeyChild implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java index be45fffe7..3bc776b0f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class MapKeyParent implements Serializable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java index 180bee218..edab67084 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.AssociationOverride; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Version; @Entity public class MultipleSameTypedEmbedded { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerChild.java index 52da93728..97fc4bc0b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerChild.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OneManyEagerChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java index 9f070fd16..dd6355d54 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Version; @Entity public class OneManyEagerParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyLazyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyLazyChild.java index 0a19b6a4d..711e02751 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyLazyChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyLazyChild.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OneManyLazyChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneChild.java index f300e00db..47b9a61cb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneChild.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OneOneChild { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneParent.java index 209a4bcfd..9557d7aaf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneOneParent.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OneOneParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java index db7afc60e..1352c6156 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="OrderTbl") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPerson.java index 3838c7295..7ea5cc5cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPerson.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPerson.java @@ -20,12 +20,12 @@ import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class PPerson { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPhone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPhone.java index ce6e8c0ca..a3d6d7f2c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPhone.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/PPhone.java @@ -20,12 +20,12 @@ import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class PPhone { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Parent.java index 0882701dc..7cf7be9b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Parent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Parent.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.relations; import java.io.Serializable; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "JPAORPHAN_PARENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java index ecdb21808..3bdba8f6c 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java @@ -23,10 +23,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java index 825a13301..b40512a95 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.relations; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentMap; import org.apache.openjpa.persistence.simple.AllFieldTypes; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java index cd9540f1f..177f7f7e3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.relations; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.PersistentMap; import org.apache.openjpa.persistence.simple.AllFieldTypes; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/SimpleEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/SimpleEmbeddable.java index d8f1d504f..9dc4e4c7d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/SimpleEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/SimpleEmbeddable.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SimpleEmbeddable { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java index ab5ca869d..dba219e1e 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class TargetedIFaceRelationParent diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java index 542cd2f8b..2bba38500 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblGrandChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblGrandChild.java index 1d5cad4ff..e339deab7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblGrandChild.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblGrandChild.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java index 720a87e53..bbf45b929 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java @@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.relations; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class TblParent { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java index d4ec898f6..7a705b273 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java index f81bc73a3..c21549397 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java index 124727fbb..ffb0782e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java index c5d2c3d64..ecc27172a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java index 67325bfec..214262fa0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.relations.entity.IncompleteRelationshipChildEntity; import org.apache.openjpa.persistence.relations.entity.IncompleteRelationshipParentEntity; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java index 20606cc05..2d3ce1c31 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java @@ -24,8 +24,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java index 8ec298d91..fed42c09d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.merge.model.Toy; import org.apache.openjpa.persistence.merge.model.ToyBox; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java index a738aa484..db3c5fb9d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java index 6e2b8d854..8b93116a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.DynamicPersistenceCapable; import org.apache.openjpa.enhance.PersistenceCapable; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java index 81f5e464d..69e6fb3d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.relations; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java index fae774b67..5577a955d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java index ce4bef0b9..dc85457ad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.relations; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java index 2af1e6b72..ae5565eb9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java index 43c6febdf..d4ac327cd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java index 73c958dc7..4a05e0239 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java index 42dd226e5..1cdc3909a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java index 5e8c4671e..1f0b3fbb0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.relations; import java.util.Arrays; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java index 4f9b3dde3..c4fe5c450 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java index 8a3d8364c..6fab0ba52 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class UnidirectionalManyToOne { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java index 18bbc0a76..e5c439869 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java @@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.relations; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; @Entity public class Util1xmLf { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmRt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmRt.java index 324213233..8cc570c43 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmRt.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmRt.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.relations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class Util1xmRt { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java index 8ae79a7f6..e219dbb5f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; import org.apache.openjpa.persistence.relations.VCS.VCSId; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java index 64651ec0e..70d9cbb33 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java index 0950b7fcf..51433fa39 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java @@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.relations.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * This is the child entity for the IncompleteRelationship test case. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipParentEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipParentEntity.java index d6f36d911..c2fdb8c26 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipParentEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipParentEntity.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.relations.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * This is the parent entity for the IncompleteRelationship test case. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipSubclass.java index a91a5b59c..519d51004 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipSubclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipSubclass.java @@ -19,7 +19,7 @@ package org.apache.openjpa.persistence.relations.entity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * This class simply extends IncompleteRelationshipParentEntity. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java index d94610880..f45a0173f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java @@ -22,16 +22,16 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.apache.openjpa.persistence.LRS; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityB.java index 43de47794..a766924f3 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityB.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityB.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.relations.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "LrsEntityB") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/ResultClsAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/ResultClsAnnotation.java index 64c950ba5..120b1b638 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/ResultClsAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/ResultClsAnnotation.java @@ -18,15 +18,15 @@ */ package org.apache.openjpa.persistence.results.cls; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; @NamedNativeQueries({ @NamedNativeQuery(name = "ResultClsQueryDoubleQuotes", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java index e4b48a69c..53b29b500 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.results.cls; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java index 228041e44..3c3892f31 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.results.cls; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityEmployee.java index 1324a25d8..72f77effb 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityEmployee.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.sequence; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; /** * @author Tim McConnell diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityPerson.java index 08255c164..e5ee493f2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityPerson.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/EntityPerson.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.sequence; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; /** * @author Tim McConnell diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/GeneratedIdObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/GeneratedIdObject.java index 6b90b13c1..fe82e04b4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/GeneratedIdObject.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/GeneratedIdObject.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.sequence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * An entity that uses generated value for its primary key. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/SequencedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/SequencedEntity.java index 6fb54c680..563359aee 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/SequencedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/SequencedEntity.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.sequence; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name="SEQENTITY_TBL") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java index 10cc7ded0..221abb72b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java @@ -27,7 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java index 4308d7456..e591f6108 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java @@ -26,7 +26,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee.java index ad32deabd..291c3557b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.sequence.hsql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity @SequenceGenerator(name = "HEmpSeq", sequenceName = "native(Sequence=HEMP_SEQ)", allocationSize = 1) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee2.java index 5fe05771d..ad37a9a4a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee2.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/HSQLEmployee2.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.sequence.hsql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity @SequenceGenerator(name = "HEmpSeq2", sequenceName = "native(Sequence=HEMP_SEQ)", allocationSize = 2) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java index 7c8a39410..49bd03130 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.sequence.hsql; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AbstractSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AbstractSuperclass.java index 9d25ca60e..a78727160 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AbstractSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AbstractSuperclass.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; @MappedSuperclass public abstract class AbstractSuperclass { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java index a97aa466f..36a2c64dc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java @@ -33,9 +33,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java index dd79fdadc..a30a3509f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.simple; import java.sql.Timestamp; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EntityWithTimestampPK { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Item.java index f2747863c..0087feaed 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Item.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Item.java @@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.simple; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "I_ITEM") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Java8TimeTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Java8TimeTypes.java index bfce8e38f..fbfb672bf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Java8TimeTypes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Java8TimeTypes.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/NamedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/NamedEntity.java index c2313c935..ea97a5ca6 100755 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/NamedEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/NamedEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity(name="named") public class NamedEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Person.java index 138c70904..22be3e317 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Person.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Person.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="PERSON_SIMPLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Place.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Place.java index 5394939bd..97471d0ac 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Place.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/Place.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Place { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java index 5933df48f..382671e86 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="PERSON_SIMPLE2") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java index b06a6b00a..419346d09 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java @@ -22,9 +22,9 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class TemporalFieldTypes { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java index bf0f76906..7e59267aa 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java @@ -24,7 +24,7 @@ import java.time.LocalTime; import java.util.Calendar; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java index 23fb51232..c369fd8c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java index aac7eebc5..526bb6fbe 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import junit.framework.TestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java index d71414f0b..1a4260855 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java index 8849c5940..ac05c7026 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; import org.apache.openjpa.persistence.test.SingleEMTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java index 3386332b7..6adb16a10 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java @@ -25,7 +25,7 @@ import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAPersistence; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java index 7ad8d4919..0b75bacdd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.simple; import org.apache.openjpa.persistence.test.SingleEMFTestCase; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.time.Instant; import java.time.LocalDate; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java index 93994f91c..555266e96 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java index a627d3301..a6d85916a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; import org.apache.openjpa.lib.conf.ProductDerivations; import org.apache.openjpa.lib.conf.Value; @@ -60,7 +60,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { /* no funky */ config.put("openjpa.DynamicEnhancementAgent", "false"); // following properties are not used becuase that makes the test dependent on database specifics -/* equiv key */ //config.put("javax.persistence.jdbc.url", "jdbc:derby:target/database/test;create=true"); +/* equiv key */ //config.put("jakarta.persistence.jdbc.url", "jdbc:derby:target/database/test;create=true"); /* prime use */ //config.put("openjpa.ConnectionUserName", "root"); emf = OpenJPAPersistence.cast(Persistence.createEntityManagerFactory(UNIT_NAME, config)); @@ -86,7 +86,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { public void testConfigurationPrefixes() { String[] prefixes = ProductDerivations.getConfigurationPrefixes(); assertEquals("openjpa", prefixes[0]); - assertTrue(Arrays.asList(prefixes).contains("javax.persistence")); + assertTrue(Arrays.asList(prefixes).contains("jakarta.persistence")); } public void testEMNumericPropertyValueForEnumTypeIsReturnedAsString() { @@ -143,13 +143,13 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { assertTrue(emSupportedProperties.contains("openjpa.AutoDetach")); // Make sure the all possible keys are returned - assertTrue(emSupportedProperties.contains("javax.persistence.lock.timeout")); + assertTrue(emSupportedProperties.contains("jakarta.persistence.lock.timeout")); assertTrue(emSupportedProperties.contains("openjpa.LockTimeout")); // Make sure the spec property for query timeout, that only has one // key, is returned. - assertTrue(emSupportedProperties.contains("javax.persistence.query.timeout")); - assertFalse(emSupportedProperties.contains("openjpa.javax.persistence.query.timeout")); + assertTrue(emSupportedProperties.contains("jakarta.persistence.query.timeout")); + assertFalse(emSupportedProperties.contains("openjpa.jakarta.persistence.query.timeout")); } /** @@ -181,7 +181,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { /** * Certain logical property such as ConnectionUserName can appear under different - * keys such as openjpa.ConnectionUserName or javax.persistence.jdbc.user. + * keys such as openjpa.ConnectionUserName or jakarta.persistence.jdbc.user. * The key under which the property value appears depends on the key under which * property value was loaded into the configuration. * @@ -192,7 +192,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { // This property was loaded with equivalent javax. key assertFalse(props.containsKey("openjpa.ConnectionURL")); - assertTrue(props.containsKey("javax.persistence.jdbc.url")); + assertTrue(props.containsKey("jakarta.persistence.jdbc.url")); } // Not run because that makes these tests database specific @@ -201,7 +201,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { // This property was loaded with primary openjpa. key assertTrue(props.containsKey("openjpa.ConnectionUserName")); - assertFalse(props.containsKey("javax.persistence.jdbc.user")); + assertFalse(props.containsKey("jakarta.persistence.jdbc.user")); } /** @@ -255,7 +255,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase { public void testEquivalentKeysArePresentInSupportedProperties() { Set keys = em.getSupportedProperties(); assertTrue(keys.contains("openjpa.ConnectionURL")); - assertTrue(keys.contains("javax.persistence.jdbc.url")); + assertTrue(keys.contains("jakarta.persistence.jdbc.url")); } public void testPasswordValuesAreInvisible() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java index cbe15edda..8b1893ba2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.simple; import java.util.HashMap; import java.util.Map; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.apache.openjpa.persistence.JPAProperties; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java index 961f332e6..9df23e78a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java @@ -24,8 +24,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java index 1b9aba81e..d1ea119f0 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.simple; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java index f0433cc08..9d4676ba5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.spring; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.models.library.Book; import org.apache.openjpa.persistence.models.library.Borrower; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java index 3d03c8209..91176ca25 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.spring; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.models.library.Book; import org.apache.openjpa.persistence.models.library.Borrower; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java index 85eebb674..4c500e13b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.spring; import java.util.EnumSet; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.AutoDetachType; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java index 02cb3e5c6..21bb5bfa6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.spring; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; public interface TransactionalEntityManagerFactory { EntityManager getTransactionalEntityManager(); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ImplicitValueStrategyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ImplicitValueStrategyEntity.java index c902332fb..66142a054 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ImplicitValueStrategyEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ImplicitValueStrategyEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.strategy.value; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java index 7c44ff338..c18b9e489 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.strategy.value; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java index f5769a2d8..351db61a5 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.strategy.value; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyEntity.java index 084c92c68..259c880fd 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.strategy.value; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.apache.openjpa.persistence.jdbc.Strategy; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java index 2a6b41fdf..65aaaffc9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java @@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.temporal; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity public class TemporalEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java index 2fb86fa4c..ff56c848f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java @@ -22,9 +22,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java index ad8024313..be7c623b6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.test; import java.util.LinkedHashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.kernel.AbstractBrokerFactory; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java index 06ae645d5..a11067b89 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java @@ -33,10 +33,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Cache; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.Cache; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ContainerEMFTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ContainerEMFTest.java index 7a1f6d5b7..fe69a16bf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ContainerEMFTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ContainerEMFTest.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitInfo; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java index 652c8dde9..5e99897bc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java @@ -32,9 +32,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -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 org.apache.openjpa.kernel.AbstractBrokerFactory; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java index 840392fc4..fa79d4d05 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.test; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java index e572f9dec..00a292c0e 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.test; import java.util.Collections; import java.util.List; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAQuery; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/TestPersistenceProviderFilteringTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/TestPersistenceProviderFilteringTestCase.java index 8de39b752..bb38cc09d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/TestPersistenceProviderFilteringTestCase.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/TestPersistenceProviderFilteringTestCase.java @@ -24,10 +24,10 @@ import org.apache.openjpa.persistence.entity.EntityB; import org.apache.openjpa.persistence.entity.EntityC; import org.apache.openjpa.util.UserException; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; import java.util.HashMap; import java.util.Map; @@ -53,21 +53,21 @@ public class TestPersistenceProviderFilteringTestCase extends SQLListenerTestCas public void testGenerateSchemaOpenJPAProvider() { final PersistenceProviderImpl ppi = new PersistenceProviderImpl(); final Map map = new HashMap<>(); - map.put("javax.persistence.provider", PersistenceProviderImpl.class.getName()); + map.put("jakarta.persistence.provider", PersistenceProviderImpl.class.getName()); assertTrue(ppi.generateSchema(persistenceUnitName, map)); } public void testGenerateSchemaEclipseProvider() { final PersistenceProviderImpl ppi = new PersistenceProviderImpl(); final Map map = new HashMap<>(); - map.put("javax.persistence.provider", "org.eclipse.persistence.jpa.PersistenceProvider"); + map.put("jakarta.persistence.provider", "org.eclipse.persistence.jpa.PersistenceProvider"); assertFalse(ppi.generateSchema(persistenceUnitName, map)); } public void testGenerateSchemaFakeProviderClass() { final PersistenceProviderImpl ppi = new PersistenceProviderImpl(); final Map map = new HashMap<>(); - map.put("javax.persistence.provider", FakeProvider.class); + map.put("jakarta.persistence.provider", FakeProvider.class); assertFalse(ppi.generateSchema(persistenceUnitName, map)); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbed.java index c2725a6fd..572d94a8d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbed.java @@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.util; import java.sql.Date; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Embeddable public class EagerEmbed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbedRel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbedRel.java index e12c8bdbf..f1426e583 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbedRel.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEmbedRel.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.util; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; @Embeddable public class EagerEmbedRel { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEntity.java index 9d6de5cd5..f1c940456 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/EagerEntity.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.util; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; @Entity public class EagerEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEmbed.java index 009e34fe9..120a2b4cf 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEmbed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEmbed.java @@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.util; import java.sql.Date; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Embeddable public class LazyEmbed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEntity.java index 62e75c3d2..4f97297ce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/LazyEntity.java @@ -20,16 +20,16 @@ package org.apache.openjpa.persistence.util; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; @Entity public class LazyEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapEntity.java index 4e794228a..58e2c6951 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapEntity.java @@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.util; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MAPENT") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapKeyEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapKeyEmbed.java index e52921b3f..0f6e03f13 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapKeyEmbed.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapKeyEmbed.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.util; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class MapKeyEmbed { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapValEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapValEntity.java index 1bde65c1b..1c769f783 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapValEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/MapValEntity.java @@ -18,13 +18,13 @@ */ package org.apache.openjpa.persistence.util; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="MVTABLE") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/OneToEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/OneToEntity.java index 25b4456f8..ab66f10a6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/OneToEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/OneToEntity.java @@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.util; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class OneToEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/RelEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/RelEntity.java index c4f6d8211..5a6c411e1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/RelEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/RelEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.util; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class RelEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java index d365237e9..65772b9ef 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java @@ -24,7 +24,7 @@ import java.sql.Date; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.kernel.StateManagerImpl; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java index d520aa908..e46afb5f9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceUnitUtil; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceUnitUtil; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java index 6dc394d16..3a5e051e6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java @@ -22,9 +22,9 @@ import java.sql.Date; import java.util.ArrayList; import java.util.Random; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; -import javax.persistence.PersistenceUtil; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceUtil; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java index 33c1efb3c..afb57064b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Random; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.spi.LoadState; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManager; +import jakarta.persistence.spi.LoadState; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.ProviderUtil; import org.apache.openjpa.persistence.PersistenceProviderImpl; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java index 7dab2adbe..f1dedfb16 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java @@ -19,9 +19,9 @@ package org.apache.openjpa.persistence.util; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ToManyEager { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyLazy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyLazy.java index cec721526..7da1c09c9 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyLazy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyLazy.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.util; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ToManyLazy { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java index c04eb380c..b79da3b80 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java @@ -16,7 +16,7 @@ package org.apache.openjpa.persistence.validation; import java.util.HashMap; import java.util.Map; -import javax.persistence.ValidationMode; +import jakarta.persistence.ValidationMode; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; @@ -76,7 +76,7 @@ public class TestValidationFactory extends SingleEMFTestCase { // create the Map to test overrides // Just use current class object, as we have no provider to test with Map props = new HashMap<>(); - props.put("javax.persistence.validation.factory", + props.put("jakarta.persistence.validation.factory", this.getClass()); // create our EMF @@ -106,7 +106,7 @@ public class TestValidationFactory extends SingleEMFTestCase { // create the Map to test overrides // Just use current class object, as we have no provider to test with Map props = new HashMap<>(); - props.put("javax.persistence.validation.factory", + props.put("jakarta.persistence.validation.factory", this.getClass()); // create our EMF @@ -136,9 +136,9 @@ public class TestValidationFactory extends SingleEMFTestCase { // create the Map to test overrides // Just use current class object, as we have no provider to test with Map props = new HashMap<>(); - props.put("javax.persistence.validation.factory", + props.put("jakarta.persistence.validation.factory", this.getClass()); - props.put("javax.persistence.validation.mode", + props.put("jakarta.persistence.validation.mode", String.valueOf(ValidationMode.CALLBACK)); try { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java index c22b2818c..ae845013a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java @@ -16,7 +16,7 @@ package org.apache.openjpa.persistence.validation; import java.util.HashMap; import java.util.Map; -import javax.persistence.ValidationMode; +import jakarta.persistence.ValidationMode; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.LifecycleEvent; @@ -163,7 +163,7 @@ public class TestValidationMode extends SingleEMFTestCase { // create the Map to test overrides Map props = new HashMap<>(); - props.put("javax.persistence.validation.mode", + props.put("jakarta.persistence.validation.mode", String.valueOf(ValidationMode.NONE)); // create our EMF @@ -195,7 +195,7 @@ public class TestValidationMode extends SingleEMFTestCase { // create the Map to test overrides Map props = new HashMap<>(); - props.put("javax.persistence.validation.mode", + props.put("jakarta.persistence.validation.mode", String.valueOf(ValidationMode.NONE)); // create our EMF @@ -227,7 +227,7 @@ public class TestValidationMode extends SingleEMFTestCase { // create the Map to test overrides Map props = new HashMap<>(); - props.put("javax.persistence.validation.mode", + props.put("jakarta.persistence.validation.mode", ValidationMode.NONE); // create our EMF diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java index eedfbc833..058faa805 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.xml; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.enhance.PCEnhancer; import org.apache.openjpa.persistence.OpenJPAPersistence; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestToOneLazyXmlOverride.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestToOneLazyXmlOverride.java index cf6457bf6..81145da7b 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestToOneLazyXmlOverride.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestToOneLazyXmlOverride.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.xml; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java index 9c29a77ca..ca29ab950 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.xml; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PCRegistry; import org.apache.openjpa.enhance.PersistenceCapable; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideEntity.java index 113be0ecf..e25a808d6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideEntity.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.xml; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; @Entity public class XmlOverrideEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideToOneEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideToOneEntity.java index 8532850bc..da9befc69 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideToOneEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/XmlOverrideToOneEntity.java @@ -19,14 +19,14 @@ */ package org.apache.openjpa.persistence.xml; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class XmlOverrideToOneEntity { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java index 7cbab9856..3ccc5b365 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java @@ -21,16 +21,16 @@ package org.apache.openjpa.persistence.xmlmapping.entities; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="TCUSTOMER") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java index ea9bfbe82..6096a94e2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java @@ -17,8 +17,8 @@ * under the License. */ package org.apache.openjpa.persistence.xmlmapping.entities; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /* * example of an JPA embeddable class. diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java index b06d71920..29c12ef92 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.xmlmapping.entities; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.apache.openjpa.persistence.Persistent; import org.apache.openjpa.persistence.jdbc.Strategy; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java index 38e2baf6b..099ff9cb7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.xmlmapping.query; import java.sql.Connection; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java index 42f796bd8..7e12703ce 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java @@ -22,14 +22,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @Entity @Table(name = "PM_ACCOUNTING_HIERARCHY_TEST") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRate.java index 0dd8d73f6..ad5d603c6 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRate.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRate.java @@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.xs; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "PM_ACCOUNTING_HIERARCHY_RATE_TEST") diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/TestMergeComplexKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/TestMergeComplexKey.java index 162e50ad7..71826f512 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/TestMergeComplexKey.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/TestMergeComplexKey.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.xs; import java.math.BigDecimal; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.test.SingleEMFTestCase; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/reservedwords/ReservedWordsIT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/reservedwords/ReservedWordsIT.java index 6effbdfac..c2d7ff6b1 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/reservedwords/ReservedWordsIT.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/reservedwords/ReservedWordsIT.java @@ -24,8 +24,8 @@ import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.io.*; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence3.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence3.xml index 4ac89397d..ea82206fd 100644 --- a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence3.xml +++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence3.xml @@ -29,22 +29,22 @@ org.apache.openjpa.persistence.query.common.apps.QTimeout - - + + org.apache.openjpa.persistence.query.common.apps.QTimeout - + org.apache.openjpa.persistence.query.common.apps.QTimeout - + diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/lib/conf/META-INF/persistence-config.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/lib/conf/META-INF/persistence-config.xml index d2b84d2ef..1e50e4cbd 100644 --- a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/lib/conf/META-INF/persistence-config.xml +++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/lib/conf/META-INF/persistence-config.xml @@ -37,21 +37,21 @@ - - + + - + - + diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/kernel/common/apps/META-INF/persistence.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/kernel/common/apps/META-INF/persistence.xml index b3c0533be..c391f39fe 100644 --- a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/kernel/common/apps/META-INF/persistence.xml +++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/kernel/common/apps/META-INF/persistence.xml @@ -113,11 +113,11 @@ org.apache.openjpa.persistence.kernel.common.apps.SingleIdString org.apache.openjpa.persistence.kernel.common.apps.SingleIdWrapper org.apache.openjpa.persistence.kernel.common.apps.ValueStrategyPC - org.apache.openjpa.persistence.kernel.TestEJBLobs$Inner - org.apache.openjpa.persistence.kernel.TestEJBLobs$Inner2 - org.apache.openjpa.persistence.kernel.TestStaticInnerClasses$Inner - org.apache.openjpa.persistence.kernel.TestEJBNoPersistentFields$Nholder - org.apache.openjpa.persistence.kernel.TestEJBNoPersistentFields$NoPersistentFieldsPC + org.apache.openjpa.persistence.kernel.TestEJBLobsInnerEntity + org.apache.openjpa.persistence.kernel.TestEJBLobsInner2Entity + org.apache.openjpa.persistence.kernel.StaticInnerClassesContainer.Inner + org.apache.openjpa.persistence.kernel.TestEJBNoPersistentFieldsNholderEntity + org.apache.openjpa.persistence.kernel.EJBNoPersistentFieldsNoPersistentFieldsPCEntity org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1 org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2 diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml index 515d08cd9..4678227b0 100644 --- a/openjpa-persistence-locking/pom.xml +++ b/openjpa-persistence-locking/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-persistence-locking diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java index baa9b8ddf..62d99e97a 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java @@ -23,14 +23,14 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -42,7 +42,7 @@ import javax.persistence.Version; name="findLSE1x1LfExtended" , query="SELECT c FROM LSE1x1Lf c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java index 57f0c67ff..ab2f2fc71 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java @@ -23,15 +23,15 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -43,7 +43,7 @@ import javax.persistence.Version; name="findLSE1x1LfJTExtended" , query="SELECT c FROM LSE1x1LfJT c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java index 29179427c..74c4873cb 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java @@ -23,16 +23,16 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -44,7 +44,7 @@ import javax.persistence.Version; name="findLSE1x1LfJTLzyExtended" , query="SELECT c FROM LSE1x1LfJTLzy c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java index 164cbf6db..1246a05a4 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java @@ -23,15 +23,15 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -43,7 +43,7 @@ import javax.persistence.Version; name="findLSE1x1LfLzyExtended" , query="SELECT c FROM LSE1x1LfLzy c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java index fc5f9af57..98a4fb325 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java @@ -23,9 +23,9 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class LSE1x1Rt implements Externalizable { diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java index d6e892286..f6fa61e87 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java @@ -25,14 +25,14 @@ import java.io.ObjectOutput; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -44,7 +44,7 @@ import javax.persistence.Version; name="findLSE1xmLfExtended" , query="SELECT c FROM LSE1xmLf c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java index ea77fc809..53e7f5bc1 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java @@ -25,15 +25,15 @@ import java.io.ObjectOutput; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -45,7 +45,7 @@ import javax.persistence.Version; name="findLSE1xmLfEgrExtended" , query="SELECT c FROM LSE1xmLfEgr c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java index 7bb120a4e..1edfa753b 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java @@ -25,15 +25,15 @@ import java.io.ObjectOutput; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -45,7 +45,7 @@ import javax.persistence.Version; name="findLSE1xmLfJTExtended" , query="SELECT c FROM LSE1xmLfJT c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java index d5d642dcf..5c6f4d5c9 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java @@ -25,15 +25,15 @@ import java.io.ObjectOutput; import java.util.Collection; import java.util.HashSet; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -45,7 +45,7 @@ import javax.persistence.Version; name="findLSE1xmLfJTEgrExtended" , query="SELECT c FROM LSE1xmLfJTEgr c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java index 7767ed448..e41cc8635 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java @@ -23,9 +23,9 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class LSE1xmRt implements Externalizable { diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java index 12e315493..434e395b6 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java @@ -23,13 +23,13 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -41,7 +41,7 @@ import javax.persistence.Version; name="findLSEBaseExtended" , query="SELECT c FROM LSEBase c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java index a8cb3e6a9..f6d588012 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java @@ -25,14 +25,14 @@ import java.io.ObjectOutput; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -44,7 +44,7 @@ import javax.persistence.Version; name="findLSEEleColExtended" , query="SELECT c FROM LSEEleCol c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java index 275873bf2..c0b890352 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java @@ -25,15 +25,15 @@ import java.io.ObjectOutput; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -45,7 +45,7 @@ import javax.persistence.Version; name="findLSEEleColEgrExtended" , query="SELECT c FROM LSEEleColEgr c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java index 47e03db2e..e43ff0fae 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java index fa68cbd8b..a240ae3b2 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; +import jakarta.persistence.Entity; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; @NamedQueries ( value={ @NamedQuery( @@ -39,7 +39,7 @@ import javax.persistence.QueryHint; name="findLSEJoinConExtended" , query="SELECT c FROM LSEJoinCon c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java index cf3dcf8f1..93ff633e9 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java @@ -23,15 +23,15 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SecondaryTable; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -43,7 +43,7 @@ import javax.persistence.Version; name="findLSESecTblExtended" , query="SELECT c FROM LSESecTbl c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java index 81b49d109..411038009 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java @@ -23,15 +23,15 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; @NamedQueries ( value={ @NamedQuery( @@ -43,7 +43,7 @@ import javax.persistence.Version; name="findLSESngTblAbsExtended" , query="SELECT c FROM LSESngTblAbs c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java index 7917a54de..557c94421 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; +import jakarta.persistence.Entity; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; @NamedQueries ( value={ @NamedQuery( @@ -39,7 +39,7 @@ import javax.persistence.QueryHint; name="findLSESngTblConExtended" , query="SELECT c FROM LSESngTblCon c WHERE c.firstName LIKE :firstName" , lockMode=LockModeType.PESSIMISTIC_WRITE - , hints={@QueryHint(name="javax.persistence.lock.scope",value="EXTENDED")} + , hints={@QueryHint(name="jakarta.persistence.lock.scope",value="EXTENDED")} ) } ) diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java index cb1755930..5edf057e8 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java @@ -25,10 +25,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl; @@ -55,7 +55,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase; * the foreign key) will not be locked by default. * * Element collections and relationships owned by the entity that are contained - * in join tables will be locked if the javax.persistence.lock.scope property is + * in join tables will be locked if the jakarta.persistence.lock.scope property is * specified with a value of PessimisticLockScope.EXTENDED. The state of * entities referenced by such relationships will not be locked (unless those * entities are explicitly locked). This property may be passed as an argument @@ -94,7 +94,7 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase { protected void commonSetUp(Class... eClasses ) { normalProps = new HashMap<>(); extendedProps = new HashMap<>(); - extendedProps.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED); + extendedProps.put("jakarta.persistence.lock.scope", PessimisticLockScope.EXTENDED); for( Class eClazz : eClasses) { empTableName.add(getMapping(eClazz).getTable().getFullName()); @@ -241,7 +241,7 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase { getLog().info(" *Query " + entityName + "(" + id0 + ") with PESSIMISTIC_READ lock"); Query q = em.createQuery(queryString); if (extended) { - q = q.setHint("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED); + q = q.setHint("jakarta.persistence.lock.scope", PessimisticLockScope.EXTENDED); } q = q.setLockMode(LockModeType.PESSIMISTIC_READ); q = q.setParameter("firstName", "firstName%" + id0); @@ -289,7 +289,7 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase { getLog().info(" *Query " + entityName + "(" + id0 + ") with PESSIMISTIC_WRITE lock"); Query q = em.createNamedQuery(namedQueryString); if (extended) { - q = q.setHint("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED); + q = q.setHint("jakarta.persistence.lock.scope", PessimisticLockScope.EXTENDED); } q = q.setParameter("firstName", "firstName%" + id0); List es = q.getResultList(); diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java index 07f185b8e..4c5206b77 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lock.extended; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * LockScopeTestCase subclass to test entity with: diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java index 447fc72ee..1d5c4290a 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lock.extended; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * LockScopeTestCase subclass to test entity with: diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java index 1dc594d72..cb314c75b 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lock.extended; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * LockScopeTestCase subclass to test entities: diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java index 57941263d..89f562ca2 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java @@ -24,10 +24,10 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Department implements Externalizable { diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java index 476e012b6..6edf75ecb 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java @@ -23,10 +23,10 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Employee implements Externalizable { diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java index f3e12a45a..e49174324 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java @@ -23,12 +23,12 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Version; @NamedQueries( { @NamedQuery(name = "findEmployeeById", diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java index 78b0c89a0..12476723c 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class LockEmployeeNonVersion implements Externalizable { diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java index 5bf2ea572..a720ea952 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 em.lock(LockMode) behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java index 0699260a9..2f98c722b 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java @@ -24,10 +24,10 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/PhoneNumber.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/PhoneNumber.java index 36c3366ef..41d11eee1 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/PhoneNumber.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/PhoneNumber.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.lockmgr; import java.io.Serializable; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class PhoneNumber implements Serializable { diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java index 4422abc41..8e0984b63 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java @@ -31,9 +31,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl; @@ -63,17 +63,17 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase { protected static final String Default_FirstName = "Def FirstName"; protected static final Class[] ExpectingOptimisticLockExClass = new Class[] - { javax.persistence.OptimisticLockException.class }; + { jakarta.persistence.OptimisticLockException.class }; protected static final Class[] ExpectingPessimisticLockExClass = new Class[] - { javax.persistence.PessimisticLockException.class }; + { jakarta.persistence.PessimisticLockException.class }; protected static final Class[] ExpectingLockTimeoutExClass = new Class[] - { javax.persistence.LockTimeoutException.class }; + { jakarta.persistence.LockTimeoutException.class }; protected static final Class[] ExpectingAnyLockExClass = new Class[] { - javax.persistence.PessimisticLockException.class, - javax.persistence.LockTimeoutException.class }; + jakarta.persistence.PessimisticLockException.class, + jakarta.persistence.LockTimeoutException.class }; protected static final int MinThreadWaitInMs = 10000; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java index f4ceab1b1..8c4b30828 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TransactionRequiredException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.kernel.JDBCFetchConfigurationImpl; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java index ac08a59b4..1833a0018 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java @@ -21,7 +21,7 @@ package org.apache.openjpa.persistence.lockmgr; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.jdbc.JDBCFetchPlan; @@ -47,7 +47,7 @@ public class TestEmLockTimeout extends SequencedActionsTest { public void testSetJavaxLockTimeoutAtProviderCreateEmf() { setUp(LockEmployee.class , "openjpa.LockManager", "mixed" - , "javax.persistence.lock.timeout", "13" + , "jakarta.persistence.lock.timeout", "13" ); EntityManager em = emf.createEntityManager(); @@ -71,7 +71,7 @@ public class TestEmLockTimeout extends SequencedActionsTest { setUp(LockEmployee.class , "openjpa.LockManager", "mixed" , "openjpa.LockTimeout", 122 - , "javax.persistence.lock.timeout", "133" + , "jakarta.persistence.lock.timeout", "133" ); EntityManager em = emf.createEntityManager(); @@ -92,13 +92,13 @@ public class TestEmLockTimeout extends SequencedActionsTest { public void testSetJavaxLockTimeoutAtFind() { setUp(LockEmployee.class , "openjpa.LockManager", "mixed" - , "javax.persistence.lock.timeout", "13" + , "jakarta.persistence.lock.timeout", "13" ); EntityManager em = emf.createEntityManager(); Map props2 = new HashMap<>(); - props2.put("javax.persistence.lock.timeout", 3333); + props2.put("jakarta.persistence.lock.timeout", 3333); em.find(LockEmployee.class, 1, props2); OpenJPAEntityManager oem = (OpenJPAEntityManager)em.getDelegate(); diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java index e8fef7548..3629dcbf6 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.lockmgr; import java.sql.Connection; import java.sql.ResultSet; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; @@ -50,8 +50,8 @@ import org.apache.openjpa.persistence.jdbc.ResultSetType; * JPA 2.0 em.find/refresh/lock(... Map) and query.X(... Map) methods. * * Supported hints: - * javax.persistence.lock.timeout - * javax.persistence.query.timeout + * jakarta.persistence.lock.timeout + * jakarta.persistence.query.timeout * openjpa.ExtendedPathLookup (?) * openjpa.FetchBatchSize * openjpa.FetchPlan.EagerFetchMode @@ -1185,10 +1185,10 @@ public class TestFetchHints extends SequencedActionsTest { } /* Good - * Test "javax.persistence.lock.timeout" hint + * Test "jakarta.persistence.lock.timeout" hint */ public void testJavaxLockTimeoutHint() { - String hintName = "javax.persistence.lock.timeout"; + String hintName = "jakarta.persistence.lock.timeout"; EntityManager em = emf.createEntityManager(); OpenJPAEntityManager oem = (OpenJPAEntityManager)em.getDelegate(); @@ -1337,10 +1337,10 @@ public class TestFetchHints extends SequencedActionsTest { } /* Good - * Test "javax.persistence.query.timeout" hint + * Test "jakarta.persistence.query.timeout" hint */ public void testJavaxQueryTimeoutHint() { - String hintName = "javax.persistence.query.timeout"; + String hintName = "jakarta.persistence.query.timeout"; EntityManager em = emf.createEntityManager(); OpenJPAEntityManager oem = (OpenJPAEntityManager)em.getDelegate(); @@ -2275,7 +2275,7 @@ public class TestFetchHints extends SequencedActionsTest { * Test precendence order of similiar/equivalent LockTimeout hints. */ public void testSimiliarLockTimeoutHints() { - String JavaxLockTimeout = "javax.persistence.lock.timeout"; + String JavaxLockTimeout = "jakarta.persistence.lock.timeout"; String OpenJPALockTimeout = "openjpa.LockTimeout"; String FetchPlanLockTimeout = "openjpa.FetchPlan.LockTimeout"; @@ -2339,7 +2339,7 @@ public class TestFetchHints extends SequencedActionsTest { * Test precendence order of similiar/equivalent QueryTimeout hints. */ public void testSimiliarQueryTimeoutHints() { - String JavaxQueryTimeout = "javax.persistence.query.timeout"; + String JavaxQueryTimeout = "jakarta.persistence.query.timeout"; String OpenJPAQueryTimeout = "openjpa.QueryTimeout"; String FetchPlanQueryTimeout = "openjpa.FetchPlan.QueryTimeout"; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java index de188c79d..e5835eccc 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI; import org.apache.openjpa.persistence.test.SQLListenerTestCase; @@ -47,7 +47,7 @@ public class TestLocking extends SQLListenerTestCase { public void testExtendedLockScope() throws Exception { Map props = new HashMap<>(); - props.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED); + props.put("jakarta.persistence.lock.scope", PessimisticLockScope.EXTENDED); OpenJPAEntityManagerSPI em1 = emf.createEntityManager(); OpenJPAEntityManagerSPI em2 = emf.createEntityManager(); @@ -61,7 +61,7 @@ public class TestLocking extends SQLListenerTestCase { // // pg 86 // Element collections and relationships owned by the entity that are contained in join tables will be - // locked if the javax.persistence.lock.scope property is specified with a value of + // locked if the jakarta.persistence.lock.scope property is specified with a value of // PessimisticLockScope.EXTENDED. The state of entities referenced by such relationships will // not be locked (unless those entities are explicitly locked). This property may be passed as an argument // to the methods of the EntityManager, Query, and TypedQuery interfaces that allow lock modes diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java index 9c117e1b3..e352742d3 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.lockmgr; import java.util.Arrays; import java.util.HashMap; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import org.apache.openjpa.jdbc.sql.DB2Dictionary; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java index 79d06244f..2fa0e2327 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 em.find(LockMode) behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java index c5e17ede9..d235957b6 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.EntityNotFoundException; -import javax.persistence.LockModeType; -import javax.persistence.OptimisticLockException; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.TransactionRequiredException; /** * Test JPA 2.0 em.find(LockMode) exception behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java index 28bce8c4f..211b42a69 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.lockmgr; import java.util.Arrays; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 LockMode type permutation behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java index c8447db23..6acd0c330 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 em.lock(LockMode) basic behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java index 6ccca21a8..ff99fdea1 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.LockModeType; -import javax.persistence.OptimisticLockException; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.TransactionRequiredException; /** * Test JPA 2.0 em.lock(LockMode) exception behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java index f834feb18..d3c8d0588 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.lockmgr; import java.util.Arrays; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 LockMode type permutation behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java index 4361a6868..ea02c84ec 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.lockmgr; import java.io.PrintWriter; import java.io.StringWriter; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.persistence.test.SQLListenerTestCase; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java index 86e26a777..75577830d 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 em.refresh(LockMode) basic behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java index 326d7467c..296670bc8 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.LockModeType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TransactionRequiredException; /** * Test JPA 2.0 em.refresh(LockMode) exception behaviors with "mixed" diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java index ab0c7bce2..496e88aa0 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.lockmgr; import java.util.Arrays; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Test JPA 2.0 LockMode type permutation behaviors with "mixed" lock manager. diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java index 8074649ae..1204369cb 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.apache.openjpa.jdbc.sql.DB2Dictionary; import org.apache.openjpa.persistence.FetchPlan; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java index ece105c48..defde82b3 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.FetchPlan; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java index 181fe6f7f..7913fd007 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java @@ -27,12 +27,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockException; -import javax.persistence.Query; -import javax.persistence.QueryTimeoutException; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockException; +import jakarta.persistence.Query; +import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DB2Dictionary; @@ -128,7 +128,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // Lock all selected Employees, skip the first one, i.e should lock // Employee(2) query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); List employees = query.getResultList(); assertEquals("Expected 1 element with emplyee id=2", employees.size(), 1); assertTrue("Test Employee first name = 'first.2'", employees.get(0).getFirstName().equals("first.1") @@ -136,7 +136,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { em2.getTransaction().begin(); Map hints = new HashMap<>(); - hints.put("javax.persistence.lock.timeout", lockWaitTime); + hints.put("jakarta.persistence.lock.timeout", lockWaitTime); // find Employee(2) with a lock, should block and expected a // PessimisticLockException try { @@ -157,7 +157,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // Lock all selected Departments, skip the first one, i.e should // lock Department(20) query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); List depts = query2.getResultList(); assertEquals("Expected 1 element with department id=20", depts.size(), 1); assertTrue("Test department name = 'D20'", depts.get(0).getName().equals("D10") @@ -165,7 +165,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { em2.getTransaction().begin(); Map map = new HashMap<>(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // find Employee(2) with a lock, no block since only department was // locked try { @@ -195,14 +195,14 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // Lock all selected Employees, skip the first one, i.e should lock // Employee(2) query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); List q = query.getResultList(); assertEquals("Expected 1 element with emplyee id=2", q.size(), 1); assertEquals("Test Employee first name = 'first.2'", q.get(0).getFirstName(), "first.2"); em2.getTransaction().begin(); Map map = new HashMap<>(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // find Employee(2) with a lock, should block and expected a // PessimisticLockException try { @@ -223,14 +223,14 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // Lock all selected Departments, skip the first one, i.e should // lock Department(20) query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); List result = query.getResultList(); assertEquals("Expected 1 element with department id=20", q.size(), 1); assertEquals("Test department name = 'D20'", result.get(0).getName(), "D20"); em2.getTransaction().begin(); map.clear(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // find Employee(2) with a lock, no block since only department was // locked try { @@ -261,14 +261,14 @@ public class TestPessimisticLocks extends SQLListenerTestCase { try { em2.getTransaction().begin(); Map map = new HashMap<>(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // Lock Emplyee(1), no department should be locked em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map); em1.getTransaction().begin(); Query query = em1.createQuery("select e.department from Employee e where e.id < 10").setFirstResult(1); query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); // Lock all selected Department but skip the first, i.e. lock // Department(20), should query successfully. List q = query.getResultList(); @@ -287,7 +287,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { em2.getTransaction().begin(); Map map = new HashMap<>(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // Lock Emplyee(2), no department should be locked em2.find(Employee.class, 2, LockModeType.PESSIMISTIC_READ, map); @@ -296,7 +296,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // Lock all selected Employees, skip the first one, i.e should lock // Employee(2) query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); try { List q = query.getResultList(); fail("Unexcpected find succeeded. Should throw a PessimisticLockException."); @@ -320,7 +320,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { EntityManager em2 = emf.createEntityManager(); em2.getTransaction().begin(); Map map = new HashMap<>(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // Lock Emplyee(1), no department should be locked em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map); @@ -328,7 +328,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { Query query = em1.createQuery("select e.department from Employee e where e.id < 10 order by e.department.id") .setFirstResult(1); query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); // Lock all selected Department but skip the first, i.e. lock // Department(20), should query successfully. try { @@ -347,7 +347,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { em2.getTransaction().begin(); map.clear(); - map.put("javax.persistence.lock.timeout", lockWaitTime); + map.put("jakarta.persistence.lock.timeout", lockWaitTime); // Lock Emplyee(2), no department should be locked em2.find(Employee.class, 2, LockModeType.PESSIMISTIC_READ, map); @@ -356,7 +356,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // Lock all selected Employees, skip the first one, i.e should lock // Employee(2) query.setLockMode(LockModeType.PESSIMISTIC_READ); - query.setHint("javax.persistence.query.timeout", lockWaitTime); + query.setHint("jakarta.persistence.query.timeout", lockWaitTime); try { List q = query.getResultList(); fail("Unexcpected find succeeded. Should throw a PessimisticLockException."); @@ -460,7 +460,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase { // lock timeout value specified in the config (pom.xml). On Informix, // the dictionary level timeout (set above) will be used. if (!(dict instanceof InformixDictionary)) { - props.put("javax.persistence.lock.timeout", 5000); + props.put("jakarta.persistence.lock.timeout", 5000); } em.getTransaction().begin(); getLog().trace("Main: refresh with force increment"); diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/VersionEntity.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/VersionEntity.java index 1e16be9bb..eeafe975c 100644 --- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/VersionEntity.java +++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/VersionEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.lockmgr; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="LK_VERSENT") diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml index aee94d860..253edf5a7 100644 --- a/openjpa-persistence/pom.xml +++ b/openjpa-persistence/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-persistence @@ -42,14 +42,19 @@ ${project.version} - org.apache.geronimo.specs - geronimo-jpa_2.2_spec + jakarta.persistence + jakarta.persistence-api + provided - org.apache.geronimo.specs - geronimo-validation_1.1_spec + jakarta.validation + jakarta.validation-api provided + + jakarta.annotation + jakarta.annotation-api + org.osgi @@ -57,10 +62,6 @@ 4.2.0 provided - - - javax.annotation - javax.annotation-api - + diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java index a89177ede..5e0e743f7 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java @@ -29,10 +29,10 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.ParameterExpression; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.ParameterExpression; import org.apache.openjpa.kernel.Filters; import org.apache.openjpa.kernel.QueryLanguages; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java index fd9a6847e..6d100993a 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence; -import static javax.persistence.GenerationType.AUTO; +import static jakarta.persistence.GenerationType.AUTO; import static org.apache.openjpa.persistence.MetaDataTag.ACCESS; import static org.apache.openjpa.persistence.MetaDataTag.CACHEABLE; import static org.apache.openjpa.persistence.MetaDataTag.DATASTORE_ID; @@ -91,55 +91,55 @@ import java.util.Set; import java.util.Stack; import java.util.TreeSet; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeDefaultListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.FetchType; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Lob; -import javax.persistence.LockModeType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyClass; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.ParameterMode; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Lob; +import jakarta.persistence.LockModeType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.Version; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.BeanLifecycleCallbacks; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java index 170cf2426..98479c6a1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java @@ -43,29 +43,29 @@ import java.util.Objects; import java.util.Properties; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.QueryLanguages; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java index e7aebc4d5..d1d1bf6eb 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.GenerationType; +import jakarta.persistence.GenerationType; /** * Describes how to generate a value for a field. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java index 857491a42..d1fc517ef 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java @@ -36,7 +36,7 @@ import org.apache.openjpa.util.StoreException; * @since 0.4.0 */ public class EntityExistsException - extends javax.persistence.EntityExistsException + extends jakarta.persistence.EntityExistsException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java index 9242ccdc1..0070d32b1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java @@ -25,13 +25,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.persistence.Cache; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.Query; -import javax.persistence.SynchronizationType; -import javax.persistence.spi.LoadState; +import jakarta.persistence.Cache; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.Query; +import jakarta.persistence.SynchronizationType; +import jakarta.persistence.spi.LoadState; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.AutoDetach; @@ -254,8 +254,8 @@ public class EntityManagerFactoryImpl } } - // javax.persistence.jtaDataSource and openjpa.ConnectionFactory name are equivalent. - // prefer javax.persistence for now. + // jakarta.persistence.jtaDataSource and openjpa.ConnectionFactory name are equivalent. + // prefer jakarta.persistence for now. String cfName = (String) Configurations.removeProperty("jtaDataSource", props); if(cfName == null) { cfName = (String) Configurations.removeProperty("ConnectionFactoryName", props); @@ -447,7 +447,7 @@ public class EntityManagerFactoryImpl if (cls.isInstance(this)) { return cls.cast(this); } - throw new javax.persistence.PersistenceException(this + " is not a " + cls); + throw new jakarta.persistence.PersistenceException(this + " is not a " + cls); } @Override diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java index 5a25faa90..6306a2c63 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.BrokerFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java index 59666387d..9ea1d7a51 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java @@ -40,22 +40,22 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; -import javax.persistence.Query; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; +import jakarta.persistence.Query; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.metamodel.Metamodel; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; @@ -2059,7 +2059,7 @@ public class EntityManagerImpl for (Map.Entry entry : properties.entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); - if (key.equals("javax.persistence.lock.scope")) { + if (key.equals("jakarta.persistence.lock.scope")) { fetch.setLockScope((PessimisticLockScope)value); } else fetch.setHint(key, value); diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java index 6822f95d5..acab2e37e 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java @@ -36,7 +36,7 @@ import org.apache.openjpa.util.StoreException; * @since 0.4.0 */ public class EntityNotFoundException - extends javax.persistence.EntityNotFoundException + extends jakarta.persistence.EntityNotFoundException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java index 03b8100b3..fa4669c33 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java @@ -21,8 +21,8 @@ package org.apache.openjpa.persistence; import java.util.Collection; import java.util.Map; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; import org.apache.openjpa.kernel.DataCacheRetrieveMode; import org.apache.openjpa.kernel.DataCacheStoreMode; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java index cb365ee26..957a8ee85 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; import org.apache.openjpa.kernel.DataCacheRetrieveMode; import org.apache.openjpa.kernel.DataCacheStoreMode; @@ -68,9 +68,9 @@ public class FetchPlanImpl registerHint(new String[]{"openjpa.MaxFetchDepth", "openjpa.FetchPlan.MaxFetchDepth"}, new HintValueConverter.StringToInteger()); registerHint(new String[]{"openjpa.LockTimeout", "openjpa.FetchPlan.LockTimeout", - "javax.persistence.lock.timeout"}, new HintValueConverter.StringToInteger()); + "jakarta.persistence.lock.timeout"}, new HintValueConverter.StringToInteger()); registerHint(new String[]{"openjpa.QueryTimeout", "openjpa.FetchPlan.QueryTimeout", - "javax.persistence.query.timeout"}, new HintValueConverter.StringToInteger()); + "jakarta.persistence.query.timeout"}, new HintValueConverter.StringToInteger()); registerHint(new String[]{"openjpa.FlushBeforeQueries", "openjpa.FetchPlan.FlushBeforeQueries"}, new HintValueConverter.StringToInteger( new String[] {"0", "1", "2"}, diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java index 425461840..9ce9c8164 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java @@ -58,7 +58,7 @@ import org.apache.openjpa.lib.util.StringDistance; * Their values are used to set the corresponding property of {@link * FetchPlan} via {@link #hintToSetter(FetchPlan, String, Object) reflection} * - * 3. Currently defined javax.persistence.* hint keys have + * 3. Currently defined jakarta.persistence.* hint keys have * a equivalent counterpart to one of these FetchPlan keys. * The JPA keys are mapped to equivalent FetchPlan hint keys. * diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java index 2ae417364..9d4b1c2ea 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java @@ -24,8 +24,8 @@ import java.math.BigInteger; import java.util.Arrays; import java.util.Collection; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.enhance.PCRegistry; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java index 162003c1a..0c88a93f4 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.apache.openjpa.kernel.DataCacheRetrieveMode; import org.apache.openjpa.kernel.DataCacheStoreMode; @@ -44,7 +44,7 @@ import org.apache.openjpa.lib.util.StringUtil; */ public class JPAProperties { private static final String REGEX_DOT = "\\."; - public static final String PREFIX = "javax.persistence."; + public static final String PREFIX = "jakarta.persistence."; public static final String PROVIDER = PREFIX + "provider"; public static final String TRANSACTION_TYPE = PREFIX + "transactionType"; @@ -72,7 +72,7 @@ public class JPAProperties { public static final String VALIDATE_PRE_PERSIST = PREFIX + "validation.group.pre-persist"; public static final String VALIDATE_PRE_REMOVE = PREFIX + "validation.group.pre-remove"; public static final String VALIDATE_PRE_UPDATE = PREFIX + "validation.group.pre-update"; - public static final String VALIDATE_GROUP_DEFAULT = "javax.validation.groups.Default"; + public static final String VALIDATE_GROUP_DEFAULT = "jakarta.validation.groups.Default"; private static Map _names = new HashMap<>(); @@ -95,7 +95,7 @@ public class JPAProperties { /** * Is the given key appears to be a valid JPA specification defined key? * - * @return true if the given string merely prefixed with javax.persistence.. + * @return true if the given string merely prefixed with jakarta.persistence.. * Does not really check all the keys defined in the specification. */ public static boolean isValidKey(String key) { @@ -105,9 +105,9 @@ public class JPAProperties { /** * Gets a bean-style property name from the given key. * - * @param key must begin with JPA property prefix javax.persistence + * @param key must begin with JPA property prefix jakarta.persistence * - * @return concatenates each part of the string leaving out javax.persistence. prefix. + * @return concatenates each part of the string leaving out jakarta.persistence. prefix. * Part of string is what appears between DOT character. */ public static String getBeanProperty(String key) { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockScopesHelper.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockScopesHelper.java index 0728a379f..1e05f6629 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockScopesHelper.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockScopesHelper.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.PessimisticLockScope; import org.apache.openjpa.kernel.LockScopes; @@ -30,7 +30,7 @@ import org.apache.openjpa.kernel.LockScopes; */ public class LockScopesHelper { /** - * Translates javax.persistence LockModeType to internal lock level. + * Translates jakarta.persistence LockModeType to internal lock level. */ public static int toLockScope(PessimisticLockScope scope) { if (scope == null || scope == PessimisticLockScope.NORMAL) @@ -39,7 +39,7 @@ public class LockScopesHelper { } /** - * Translates internal lock level to javax.persistence LockModeType. + * Translates internal lock level to jakarta.persistence LockModeType. */ public static PessimisticLockScope fromLockScope(int level) { if (level < LockScopes.LOCKSCOPE_EXTENDED) diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java index f132187af..1a83eb9d5 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java @@ -35,7 +35,7 @@ import org.apache.openjpa.util.StoreException; * @since 2.0.0 */ public class LockTimeoutException - extends javax.persistence.LockTimeoutException + extends jakarta.persistence.LockTimeoutException implements Serializable, ExceptionInfo { private static final long serialVersionUID = 1L; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java index 4278b79a7..7c905afc1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java @@ -29,9 +29,9 @@ import java.lang.annotation.Target; * New instances of this type can be created by invoking * {@link OpenJPAEntityManager#createInstance(Class)}. * Interfaces with this annotation should also be annotated with one of the JPA - * entity annotations ({@link javax.persistence.Entity @Entity}, - * {@link javax.persistence.MappedSuperclass @MappedSuperclass}, - * or {@link javax.persistence.Embeddable @Embeddable}). + * entity annotations ({@link jakarta.persistence.Entity @Entity}, + * {@link jakarta.persistence.MappedSuperclass @MappedSuperclass}, + * or {@link jakarta.persistence.Embeddable @Embeddable}). * * @since 1.1.0 * @published diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java index c3ac6a572..16147ae5c 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence; import java.util.Locale; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.apache.openjpa.kernel.FetchConfiguration; import org.apache.openjpa.kernel.LockLevels; @@ -35,7 +35,7 @@ import org.apache.openjpa.kernel.MixedLockLevels; */ public class MixedLockLevelsHelper implements HintValueConverter { /** - * Translates javax.persistence LockModeType to internal lock level. + * Translates jakarta.persistence LockModeType to internal lock level. */ public static int toLockLevel(LockModeType mode) { if (mode == null || mode == LockModeType.NONE) @@ -74,7 +74,7 @@ public class MixedLockLevelsHelper implements HintValueConverter { /** - * Translates internal lock level to javax.persistence LockModeType. + * Translates internal lock level to jakarta.persistence LockModeType. */ public static LockModeType fromLockLevel(int level) { if (level < LockLevels.LOCK_READ) diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java index 9caaeb8bf..7510ee7f3 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java @@ -36,7 +36,7 @@ import org.apache.openjpa.util.UserException; * @since 0.4.0 */ public class NoResultException - extends javax.persistence.NoResultException + extends jakarta.persistence.NoResultException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java index 3a829fef1..7c948cdc8 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java @@ -36,7 +36,7 @@ import org.apache.openjpa.util.UserException; * @since 0.4.0 */ public class NonUniqueResultException - extends javax.persistence.NonUniqueResultException + extends jakarta.persistence.NonUniqueResultException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java index 907df0774..cc67e041a 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.EnumSet; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.apache.openjpa.event.CallbackModes; import org.apache.openjpa.kernel.AutoClear; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java index a268a6ab6..4bd60dca2 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder; import org.apache.openjpa.persistence.query.QueryBuilder; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java index 4588cfa58..871d9c0e2 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; /** * Extension of the JPA {@link EntityTransaction} interface. @@ -35,8 +35,8 @@ public interface OpenJPAEntityTransaction * except that the entity manager's internal atomic lock is utilized, * so this method can be safely executed from multiple threads. * - * @see javax.persistence.EntityTransaction#commit() - * @see javax.persistence.EntityTransaction#begin() + * @see jakarta.persistence.EntityTransaction#commit() + * @see jakarta.persistence.EntityTransaction#begin() */ void commitAndResume(); @@ -46,8 +46,8 @@ public interface OpenJPAEntityTransaction * except that the entity manager's internal atomic lock is utilized, * so this method can be safely executed from multiple threads. * - * @see javax.persistence.EntityTransaction#rollback() - * @see javax.persistence.EntityTransaction#begin() + * @see jakarta.persistence.EntityTransaction#rollback() + * @see jakarta.persistence.EntityTransaction#begin() */ void rollbackAndResume(); diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java index b0a626dce..cc7059dcf 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java @@ -24,10 +24,9 @@ import java.util.Map; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Query; -import javax.rmi.PortableRemoteObject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Query; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.kernel.Bootstrap; @@ -146,8 +145,7 @@ public class OpenJPAPersistence { context = new InitialContext(); Object o = context.lookup(jndiLocation); - return (OpenJPAEntityManagerFactory) PortableRemoteObject.narrow(o, - OpenJPAEntityManagerFactory.class); + return (OpenJPAEntityManagerFactory) o; } catch (NamingException ne) { throw new ArgumentException(_loc.get("naming-exception", jndiLocation), new Throwable[]{ ne }, null, true); diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java index cb179f46f..8bd47d0aa 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; -import javax.persistence.spi.LoadState; +import jakarta.persistence.spi.LoadState; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.enhance.StateManager; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java index 9e5088743..89e08e003 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java @@ -24,10 +24,10 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.persistence.FlushModeType; -import javax.persistence.Query; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.kernel.Filters; import org.apache.openjpa.kernel.QueryFlushModes; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java index 7ace0e2a5..946e3c519 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java @@ -36,7 +36,7 @@ import org.apache.openjpa.util.StoreException; * @since 0.4.0 */ public class OptimisticLockException - extends javax.persistence.OptimisticLockException + extends jakarta.persistence.OptimisticLockException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java index 472bd4b80..658ad1d73 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; /** * A user-defined parameter of a query. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java index 9da3df565..27afb3279 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java @@ -35,7 +35,7 @@ import org.apache.openjpa.util.Exceptions; * @since 0.4.0 */ public class PersistenceException - extends javax.persistence.PersistenceException + extends jakarta.persistence.PersistenceException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java index adb4bc7b5..d511e8ef9 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence; -import static javax.persistence.AccessType.FIELD; -import static javax.persistence.AccessType.PROPERTY; +import static jakarta.persistence.AccessType.FIELD; +import static jakarta.persistence.AccessType.PROPERTY; import static org.apache.openjpa.persistence.PersistenceStrategy.BASIC; import static org.apache.openjpa.persistence.PersistenceStrategy.ELEM_COLL; import static org.apache.openjpa.persistence.PersistenceStrategy.EMBEDDED; @@ -50,25 +50,25 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.Reflection; @@ -907,7 +907,7 @@ public class PersistenceMetaDataDefaults } /** - * Selects all element annotated with javax.persistence.* or + * Selects all element annotated with jakarta.persistence.* or * org.apache.openjpa.* annotation except the annotations * marked to be ignored. */ @@ -918,7 +918,7 @@ public class PersistenceMetaDataDefaults .getAnnotationsAction(obj)); for (Annotation anno : annos) { String name = anno.annotationType().getName(); - if ((name.startsWith("javax.persistence.") + if ((name.startsWith("jakarta.persistence.") || name.startsWith("org.apache.openjpa.persistence.")) && !_ignoredAnnos.contains(name)) return true; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java index 740915de3..6f5591f2a 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java @@ -33,18 +33,18 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.metamodel.StaticMetamodel; import org.apache.openjpa.lib.conf.Configurable; import org.apache.openjpa.lib.conf.Configuration; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java index b328593de..13fe71ebe 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java @@ -37,10 +37,10 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.Set; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; @@ -97,7 +97,7 @@ public class PersistenceProductDerivation private HashMap _puNameCollisions = new HashMap<>(); - public static final String PREFIX = "javax.persistence"; + public static final String PREFIX = "jakarta.persistence"; // These are properties that are invalid to be configured at the provider level. private static final String[] _invalidPersistenceProperties = @@ -109,8 +109,8 @@ public class PersistenceProductDerivation protected String _providerImplName; static { - _hints.add("javax.persistence.lock.timeout"); - _hints.add("javax.persistence.query.timeout"); + _hints.add("jakarta.persistence.lock.timeout"); + _hints.add("jakarta.persistence.query.timeout"); _hints.add("openjpa.FetchPlan.ExtendedPathLookup"); _hints.add("openjpa.FetchBatchSize"); @@ -180,7 +180,7 @@ public class PersistenceProductDerivation throws Exception { // make sure JPA is available AccessController.doPrivileged(J2DoPrivHelper.getClassLoaderAction( - javax.persistence.EntityManagerFactory.class)); + jakarta.persistence.EntityManagerFactory.class)); } @Override diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java index 031c4bba5..0e0a5e472 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java @@ -40,12 +40,13 @@ import org.apache.openjpa.persistence.osgi.BundleUtils; import org.apache.openjpa.persistence.validation.ValidationUtils; import org.apache.openjpa.util.ClassResolver; -import javax.persistence.EntityManager; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.LoadState; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManager; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.LoadState; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; + import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; import java.lang.reflect.InvocationTargetException; @@ -59,7 +60,7 @@ import java.util.Map; * Bootstrapping class that allows the creation of a stand-alone * {@link EntityManager}. * - * @see javax.persistence.Persistence#createEntityManagerFactory(String,Map) + * @see jakarta.persistence.Persistence#createEntityManagerFactory(String,Map) * @published */ public class PersistenceProviderImpl @@ -232,7 +233,7 @@ public class PersistenceProviderImpl return; } - runMap.put("javax.persistence.schema-generation.database.action", "create"); + runMap.put("jakarta.persistence.schema-generation.database.action", "create"); final OpenJPAEntityManagerFactory factory = createContainerEntityManagerFactory(info, runMap); try { synchronizeMappings(factory); @@ -249,7 +250,7 @@ public class PersistenceProviderImpl return false; } - runMap.put("javax.persistence.schema-generation.database.action", "create"); + runMap.put("jakarta.persistence.schema-generation.database.action", "create"); final OpenJPAEntityManagerFactory factory = createEntityManagerFactory(persistenceUnitName, runMap); try { final Object obj = synchronizeMappings(factory); @@ -262,7 +263,7 @@ public class PersistenceProviderImpl // if persistence provider is specific, don't do anything // only allowed to process if persistence provider matches or if not provider is specified public boolean acceptProvider(final Map properties) { - Object provider = properties.get("javax.persistence.provider"); + Object provider = properties.get("jakarta.persistence.provider"); // provider is specified, so it has to match if (provider != null) { @@ -382,12 +383,16 @@ public class PersistenceProviderImpl } @Override - public byte[] transform(ClassLoader cl, String name, - Class previousVersion, ProtectionDomain pd, byte[] bytes) - throws IllegalClassFormatException { - return _trans.transform(cl, name, previousVersion, pd, bytes); + public byte[] transform(ClassLoader cl, String name, Class previousVersion, ProtectionDomain pd, byte[] bytes) + throws IllegalClassFormatException { + try { + return _trans.transform(cl, name, previousVersion, pd, bytes); + } + catch (IllegalClassFormatException e) { + throw e; + } } - } + } /** * This private worker method will attempt load the PCEnhancerAgent. @@ -406,7 +411,7 @@ public class PersistenceProviderImpl /** * This private worker method will attempt to setup the proper - * LifecycleEventManager type based on if the javax.validation APIs are + * LifecycleEventManager type based on if the jakarta.validation APIs are * available and a ValidatorImpl is required by the configuration. * @throws if validation setup failed and was required by the config */ diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java index 4f12be315..1b64c14c8 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java @@ -35,11 +35,11 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.apache.openjpa.lib.conf.Configuration; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java index b6a8e309d..b6ee16410 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java @@ -25,8 +25,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.FetchType; /** * Metadata annotation for a persistent field. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java index bde0b95c1..607bf0f67 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java @@ -25,8 +25,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.FetchType; /** * Metadata annotation for a persistent collection field. This should be diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java index 86f0e5cc9..114543e15 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java @@ -25,8 +25,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.FetchType; /** * Metadata annotation for a persistent map field. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java index dacb64f2d..7047bd4c3 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java @@ -36,7 +36,7 @@ import org.apache.openjpa.util.StoreException; * @since 2.0.0 */ public class PessimisticLockException - extends javax.persistence.PessimisticLockException + extends jakarta.persistence.PessimisticLockException implements Serializable, ExceptionInfo { private static final long serialVersionUID = 1L; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java index 44f0388db..e140ecbc1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java @@ -28,12 +28,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java index e2c39786c..f4a838fd4 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.datacache.QueryCache; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java index 115390304..7f2a39bb9 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence; import java.util.Collections; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.datacache.DelegatingQueryCache; import org.apache.openjpa.datacache.QueryCache; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java index 225906ed6..7f1b6bd6d 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java @@ -25,7 +25,7 @@ import java.io.PrintStream; import java.io.PrintWriter; import java.io.Serializable; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.apache.openjpa.util.ExceptionInfo; import org.apache.openjpa.util.Exceptions; @@ -37,7 +37,7 @@ import org.apache.openjpa.util.StoreException; * @since 2.0.0 */ public class QueryTimeoutException - extends javax.persistence.QueryTimeoutException + extends jakarta.persistence.QueryTimeoutException implements Serializable, ExceptionInfo { private static final long serialVersionUID = 1L; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java index c781f221d..2aaeeaec4 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java @@ -35,7 +35,7 @@ import org.apache.openjpa.util.Exceptions; * @since 0.4.0 */ public class RollbackException - extends javax.persistence.RollbackException + extends jakarta.persistence.RollbackException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java index e6673c2bb..11a8d049c 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence; import java.util.Collection; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.apache.openjpa.datacache.CacheStatistics; import org.apache.openjpa.datacache.DataCache; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java index a5d771449..44e62f0e0 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java @@ -149,7 +149,7 @@ public class StoreCacheImpl if (cls.isInstance(this)) { return cls.cast(this); } - throw new javax.persistence.PersistenceException(cls.getName() + " not supported"); + throw new jakarta.persistence.PersistenceException(cls.getName() + " not supported"); } @Override diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java index 403cb42fb..91a7e6623 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java @@ -24,14 +24,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.TemporalType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.TemporalType; import org.apache.openjpa.kernel.DelegatingResultList; import org.apache.openjpa.kernel.QueryResultCallback; @@ -143,7 +143,7 @@ public class StoredProcedureQueryImpl implements StoredProcedureQuery { .getRollbackTranslator(_delegate.getEntityManager()); return new DelegatingResultList((ResultList) list, trans); } catch (Exception ex) { - throw new javax.persistence.PersistenceException(ex); + throw new jakarta.persistence.PersistenceException(ex); } } @@ -162,7 +162,7 @@ public class StoredProcedureQueryImpl implements StoredProcedureQuery { .getRollbackTranslator(_delegate.getEntityManager()); return new DelegatingResultList(result, trans).iterator().next(); } catch (Exception ex) { - throw new javax.persistence.PersistenceException(ex); + throw new jakarta.persistence.PersistenceException(ex); } } @@ -261,7 +261,7 @@ public class StoredProcedureQueryImpl implements StoredProcedureQuery { } @Override - public javax.persistence.Query setMaxResults(int maxResult) { + public jakarta.persistence.Query setMaxResults(int maxResult) { // TODO JPA 2.1 Method return _delegate.setMaxResults(maxResult); } @@ -273,7 +273,7 @@ public class StoredProcedureQueryImpl implements StoredProcedureQuery { } @Override - public javax.persistence.Query setFirstResult(int startPosition) { + public jakarta.persistence.Query setFirstResult(int startPosition) { // TODO JPA 2.1 Method return _delegate.setFirstResult(startPosition); } @@ -327,7 +327,7 @@ public class StoredProcedureQueryImpl implements StoredProcedureQuery { } @Override - public javax.persistence.Query setLockMode(LockModeType lockMode) { + public jakarta.persistence.Query setLockMode(LockModeType lockMode) { // TODO JPA 2.1 Method return _delegate.setLockMode(lockMode); } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java index 4659b1579..7911392cd 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java @@ -37,7 +37,7 @@ import org.apache.openjpa.util.UserException; * @since 0.4.0 */ public class TransactionRequiredException - extends javax.persistence.TransactionRequiredException + extends jakarta.persistence.TransactionRequiredException implements Serializable, ExceptionInfo { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java index 9f2d4b85a..86bc57be1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java @@ -23,9 +23,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; -import javax.persistence.criteria.Selection; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; +import jakarta.persistence.criteria.Selection; import org.apache.openjpa.kernel.ObjectFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java index a9ea3b838..4032a0a24 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java @@ -22,8 +22,8 @@ package org.apache.openjpa.persistence; import java.lang.reflect.Method; import java.util.List; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; import org.apache.openjpa.kernel.Filters; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java index cc015759d..0c7b67a91 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.persistence; -import static javax.persistence.CascadeType.DETACH; -import static javax.persistence.CascadeType.MERGE; -import static javax.persistence.CascadeType.PERSIST; -import static javax.persistence.CascadeType.REFRESH; -import static javax.persistence.CascadeType.REMOVE; +import static jakarta.persistence.CascadeType.DETACH; +import static jakarta.persistence.CascadeType.MERGE; +import static jakarta.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.REFRESH; +import static jakarta.persistence.CascadeType.REMOVE; import static org.apache.openjpa.meta.MetaDataModes.MODE_MAPPING; import static org.apache.openjpa.meta.MetaDataModes.MODE_META; import static org.apache.openjpa.meta.MetaDataModes.MODE_NONE; @@ -96,9 +96,9 @@ import java.util.Objects; import java.util.Set; import java.util.Stack; -import javax.persistence.CascadeType; -import javax.persistence.GenerationType; -import javax.persistence.LockModeType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.GenerationType; +import jakarta.persistence.LockModeType; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.PersistenceCapable; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/AliasContext.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/AliasContext.java index a30af0365..f5b03db52 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/AliasContext.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/AliasContext.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.apache.openjpa.kernel.exps.Value; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java index d24083706..49c79f9c8 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java @@ -25,13 +25,13 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.enhance.Reflection; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java index 441f34c4e..2148b235e 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java @@ -23,9 +23,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.TupleElement; -import javax.persistence.criteria.CompoundSelection; -import javax.persistence.criteria.Selection; +import jakarta.persistence.TupleElement; +import jakarta.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.Selection; import org.apache.openjpa.kernel.FillStrategy; import org.apache.openjpa.lib.util.Localizer; @@ -180,13 +180,13 @@ class CompoundSelections { * A compound selection which is a Tuple composed of its component terms. * */ - static class Tuple extends CompoundSelectionImpl { + static class Tuple extends CompoundSelectionImpl { public Tuple(final Selection[] selections) { - super(javax.persistence.Tuple.class, selections); + super(jakarta.persistence.Tuple.class, selections); } @Override - public FillStrategy getFillStrategy() { + public FillStrategy getFillStrategy() { List> terms = getCompoundSelectionItems(); TupleFactory factory = new TupleFactory(terms.toArray(new TupleElement[terms.size()])); return new FillStrategy.Factory<>(factory, TupleImpl.PUT); @@ -208,7 +208,7 @@ class CompoundSelections { Class resultClass = getJavaType(); List> terms = getCompoundSelectionItems(); FillStrategy strategy = null; - if (javax.persistence.Tuple.class.isAssignableFrom(resultClass)) { + if (jakarta.persistence.Tuple.class.isAssignableFrom(resultClass)) { TupleFactory factory = new TupleFactory(terms.toArray(new TupleElement[terms.size()])); strategy = new FillStrategy.Factory<>(factory, TupleImpl.PUT); } else if (resultClass == Object.class) { diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java index 968b78dca..64ed29496 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java @@ -23,33 +23,36 @@ import java.math.BigInteger; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.Set; -import javax.persistence.Tuple; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CompoundSelection; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Predicate.BooleanOperator; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Predicate.BooleanOperator; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.Metamodel; import org.apache.openjpa.kernel.ExpressionStoreQuery; import org.apache.openjpa.kernel.exps.ExpressionFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java index c7f163d57..9dc4461cd 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java @@ -26,17 +26,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; -import javax.persistence.criteria.CompoundSelection; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.metamodel.Type.PersistenceType; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; +import jakarta.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.metamodel.Type.PersistenceType; import org.apache.openjpa.kernel.FillStrategy; import org.apache.openjpa.kernel.QueryOperations; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java index 7ece18978..977796ebb 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java @@ -29,19 +29,19 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import javax.persistence.criteria.AbstractQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.Subquery; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.AbstractQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.Subquery; +import jakarta.persistence.metamodel.EntityType; import org.apache.openjpa.kernel.exps.Context; import org.apache.openjpa.kernel.exps.ExpressionFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java index c11f7d7af..d13c7dd22 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java @@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.criteria; import java.util.Collection; -import javax.persistence.criteria.CriteriaBuilder.In; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.apache.openjpa.kernel.exps.ExpressionFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java index 544f1a85f..a180c605a 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java @@ -29,11 +29,11 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaBuilder.Trimspec; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder.Trimspec; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Subquery; import org.apache.openjpa.kernel.exps.ExpressionFactory; import org.apache.openjpa.kernel.exps.Literal; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java index 0fb90c762..ba88ebc63 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java @@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.criteria; import java.util.HashSet; import java.util.Set; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.FetchParent; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.FetchParent; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.persistence.meta.Members; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java index 8a763ea3e..61c13aa57 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java @@ -21,24 +21,24 @@ package org.apache.openjpa.persistence.criteria; import java.util.HashSet; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.SetJoin; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; -import javax.persistence.metamodel.Type.PersistenceType; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Type.PersistenceType; import org.apache.openjpa.persistence.meta.AbstractManagedType; import org.apache.openjpa.persistence.meta.Members; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java index 484cee87a..340f41f7c 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java @@ -20,24 +20,24 @@ package org.apache.openjpa.persistence.criteria; import java.util.ArrayList; -import javax.persistence.criteria.AbstractQuery; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.PluralJoin; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.SetJoin; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.criteria.AbstractQuery; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.PluralJoin; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.Type; import org.apache.openjpa.kernel.exps.AbstractExpressionBuilder; import org.apache.openjpa.kernel.exps.ExpressionFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java index 1e5cdac74..17474d5f2 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Predicate; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Metamodel; /** * OpenJPA-specific extension to JPA 2.0 Criteria Query Builder API. @@ -36,7 +36,7 @@ public interface OpenJPACriteriaBuilder extends CriteriaBuilder { /** * The mnemonic to identify the query language. */ - String LANG_CRITERIA = "javax.persistence.criteria"; + String LANG_CRITERIA = "jakarta.persistence.criteria"; /** * Create a predicate based upon the attribute values of a given diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java index 4327e55e3..25b538438 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaQuery; /** * OpenJPA-specific extension to JPA 2.0 Criteria Query API. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java index 2000501e5..ebcb8d403 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Order; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; /** * Ordering clause of a criteria query. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java index c748a0b7b..528079f8e 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java @@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.criteria; import java.util.Collection; -import javax.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.ParameterExpression; import org.apache.openjpa.kernel.exps.ExpressionFactory; import org.apache.openjpa.kernel.exps.Value; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java index b6861ae14..d2c93b2ee 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java @@ -19,17 +19,17 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Path; -import javax.persistence.metamodel.Bindable; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; -import javax.persistence.metamodel.Type.PersistenceType; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Type.PersistenceType; import org.apache.openjpa.kernel.exps.ExpressionFactory; import org.apache.openjpa.kernel.exps.Value; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java index f59618883..6acb771a1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.apache.openjpa.kernel.exps.ExpressionFactory; import org.apache.openjpa.kernel.exps.Literal; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java index debfcce67..b60446e06 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java @@ -19,8 +19,8 @@ package org.apache.openjpa.persistence.criteria; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; import org.apache.openjpa.kernel.exps.AbstractExpressionBuilder; import org.apache.openjpa.kernel.exps.Context; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java index 28d8b078a..5b8d12dec 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java @@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.criteria; import java.util.List; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Selection; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Selection; import org.apache.openjpa.persistence.util.ReservedWords; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java index 0b6c9e4bc..663e9f8e7 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java @@ -25,18 +25,18 @@ import java.util.Set; import java.util.Stack; import java.util.concurrent.CopyOnWriteArraySet; -import javax.persistence.criteria.AbstractQuery; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CommonAbstractCriteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.AbstractQuery; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CommonAbstractCriteria; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; +import jakarta.persistence.metamodel.EntityType; import org.apache.openjpa.kernel.exps.Context; import org.apache.openjpa.kernel.exps.ExpressionFactory; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java index 5afb15bb6..f64fd8f71 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java @@ -34,15 +34,15 @@ import java.util.HashSet; import java.util.Locale; import java.util.TreeSet; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.PluralAttribute.CollectionType; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.PluralAttribute.CollectionType; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.kernel.Filters; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java index 10874449c..d86061cc7 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Scanner; import java.util.Set; -import javax.annotation.Generated; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; @@ -42,7 +41,7 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; -import javax.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.StaticMetamodel; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; @@ -92,9 +91,9 @@ import org.apache.openjpa.persistence.util.SourceCode; * */ @SupportedAnnotationTypes({ - "javax.persistence.Entity", - "javax.persistence.Embeddable", - "javax.persistence.MappedSuperclass" }) + "jakarta.persistence.Entity", + "jakarta.persistence.Embeddable", + "jakarta.persistence.MappedSuperclass" }) @SupportedOptions({ "openjpa.log", "openjpa.source", "openjpa.naming", @@ -121,11 +120,11 @@ public class AnnotationProcessor6 extends AbstractProcessor { * */ private static enum TypeCategory { - ATTRIBUTE("javax.persistence.metamodel.SingularAttribute"), - COLLECTION("javax.persistence.metamodel.CollectionAttribute"), - SET("javax.persistence.metamodel.SetAttribute"), - LIST("javax.persistence.metamodel.ListAttribute"), - MAP("javax.persistence.metamodel.MapAttribute"); + ATTRIBUTE("jakarta.persistence.metamodel.SingularAttribute"), + COLLECTION("jakarta.persistence.metamodel.CollectionAttribute"), + SET("jakarta.persistence.metamodel.SetAttribute"), + LIST("jakarta.persistence.metamodel.ListAttribute"), + MAP("jakarta.persistence.metamodel.MapAttribute"); private String type; @@ -323,7 +322,7 @@ public class AnnotationProcessor6 extends AbstractProcessor { return; case "force": - cls.addAnnotation(javax.annotation.Generated.class.getName()) + cls.addAnnotation(jakarta.annotation.Generated.class.getName()) .addArgument("value", this.getClass().getName()) .addArgument("date", this.generationDate.toString()); break; @@ -411,7 +410,7 @@ public class AnnotationProcessor6 extends AbstractProcessor { // only add the annotation if it is on the classpath for Java 6+. try { - this.generatedAnnotation = Class.forName("javax.annotation.Generated", false, null); + this.generatedAnnotation = Class.forName("jakarta.annotation.Generated", false, null); } catch (ClassNotFoundException generatedNotFoundEx) { logger.trace(_loc.get("mmg-annotation-not-found")); } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java index c55d8a3ab..994394aea 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java @@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.meta; import java.util.Collection; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; import org.apache.openjpa.meta.FieldMetaData; import org.apache.openjpa.meta.JavaTypes; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java index 5586d2a8f..48ab39340 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.persistence.meta; -import static javax.persistence.metamodel.Type.PersistenceType.BASIC; -import static javax.persistence.metamodel.Type.PersistenceType.EMBEDDABLE; -import static javax.persistence.metamodel.Type.PersistenceType.ENTITY; -import static javax.persistence.metamodel.Type.PersistenceType.MAPPED_SUPERCLASS; +import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC; +import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE; +import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY; +import static jakarta.persistence.metamodel.Type.PersistenceType.MAPPED_SUPERCLASS; import java.lang.reflect.Field; import java.lang.reflect.GenericArrayType; @@ -34,16 +34,16 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MappedSuperclassType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.PluralAttribute.CollectionType; -import javax.persistence.metamodel.StaticMetamodel; -import javax.persistence.metamodel.Type; -import javax.persistence.metamodel.Type.PersistenceType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MappedSuperclassType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.PluralAttribute.CollectionType; +import jakarta.persistence.metamodel.StaticMetamodel; +import jakarta.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Type.PersistenceType; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.QueryContext; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java index f66a7d543..e4e4ddaaf 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.persistence.meta; -import static javax.persistence.AccessType.FIELD; -import static javax.persistence.AccessType.PROPERTY; +import static jakarta.persistence.AccessType.FIELD; +import static jakarta.persistence.AccessType.PROPERTY; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -45,16 +45,16 @@ import javax.lang.model.type.PrimitiveType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Types; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.meta.AccessCode; @@ -489,7 +489,7 @@ public class SourceAnnotationHandler /** * Affirms if the given element is annotated with any - * javax.persistence.* or org.apache.openjpa.* + * jakarta.persistence.* or org.apache.openjpa.* * annotation. */ public static boolean isAnnotated(Element e) { @@ -518,7 +518,7 @@ public class SourceAnnotationHandler * annotations. * * @param annos null checks for any annotation that starts with - * 'javax.persistence.' or 'openjpa.*'. + * 'jakarta.persistence.' or 'openjpa.*'. * */ public static boolean isAnnotatedWith(Element e, Set annos) { @@ -528,7 +528,7 @@ public class SourceAnnotationHandler if (annos == null) { for (AnnotationMirror mirror : mirrors) { String name = mirror.getAnnotationType().toString(); - if (startsWith(name, "javax.persistence.") + if (startsWith(name, "jakarta.persistence.") || startsWith(name, "org.apache.openjpa.")) return true; } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java index 3589313d6..b188d8bc0 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java @@ -19,11 +19,11 @@ package org.apache.openjpa.persistence.meta; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.MappedSuperclassType; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.MappedSuperclassType; +import jakarta.persistence.metamodel.Type; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.meta.ClassMetaData; @@ -252,7 +252,7 @@ public class Types { } @Override - public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() { + public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() { return PersistenceType.ENTITY; } } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java index 260c7cc7a..bcb8a16e1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java @@ -18,7 +18,7 @@ package org.apache.openjpa.persistence.osgi; import java.util.Hashtable; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProvider; import org.apache.openjpa.ee.OSGiManagedRuntime; import org.apache.openjpa.persistence.PersistenceProviderImpl; @@ -35,7 +35,7 @@ import org.osgi.framework.ServiceRegistration; */ public class PersistenceActivator implements BundleActivator { // following is so Aries can find and extend us for OSGi RFC 143 - public static final String PERSISTENCE_PROVIDER_ARIES = "javax.persistence.provider"; + public static final String PERSISTENCE_PROVIDER_ARIES = "jakarta.persistence.provider"; // following would be set by Aries to expose their OSGi enabled provider public static final String PERSISTENCE_PROVIDER = PersistenceProvider.class.getName(); public static final String OSGI_PERSISTENCE_PROVIDER = PersistenceProviderImpl.class.getName(); @@ -50,10 +50,10 @@ public class PersistenceActivator implements BundleActivator { PersistenceActivator.ctx = ctx; PersistenceProvider provider = new PersistenceProviderImpl(); Hashtable props = new Hashtable<>(); - // Aries queries for service providers by property "javax.persistence.provider" + // Aries queries for service providers by property "jakarta.persistence.provider" props.put(PERSISTENCE_PROVIDER_ARIES, OSGI_PERSISTENCE_PROVIDER); // The persistence service tracker in the geronimo spec api bundle examines - // the property named "javax.persistence.PersistenceProvider" rather than + // the property named "jakarta.persistence.PersistenceProvider" rather than // the the property provided for Aries. In order to properly track the OpenJPA // provider, this property must be set upon service registration. props.put(PERSISTENCE_PROVIDER, OSGI_PERSISTENCE_PROVIDER); diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java index c4f1b13a4..679ab1611 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java @@ -18,18 +18,18 @@ package org.apache.openjpa.persistence.validation; import java.lang.annotation.ElementType; -import javax.persistence.spi.LoadState; -import javax.validation.Path; -import javax.validation.Path.Node; -import javax.validation.TraversableResolver; +import jakarta.persistence.spi.LoadState; +import jakarta.validation.Path; +import jakarta.validation.Path.Node; +import jakarta.validation.TraversableResolver; import org.apache.openjpa.persistence.OpenJPAPersistenceUtil; /** * OpenJPA optimized TraversableResolver Default implementation/behavior asks all discovered providers - - * javax.persistence.Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty.getName()); + * jakarta.persistence.Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty.getName()); * - * @see javax.validation.TraversableResolver + * @see jakarta.validation.TraversableResolver */ public class TraversableResolverImpl implements TraversableResolver { @@ -39,8 +39,8 @@ public class TraversableResolverImpl implements TraversableResolver { /* (non-Javadoc) isReachable() is called by the Validator before accessing * a property for validation or for cascading. * - * @see javax.validation.TraversableResolver#isReachable(java.lang.Object, - * javax.validation.Path.Node, java.lang.Class, javax.validation.Path, + * @see jakarta.validation.TraversableResolver#isReachable(java.lang.Object, + * jakarta.validation.Path.Node, java.lang.Class, jakarta.validation.Path, * java.lang.annotation.ElementType) */ @Override @@ -64,8 +64,8 @@ public class TraversableResolverImpl implements TraversableResolver { * isReachable() returns true and before a property marked with @Valid * is cascaded. * - * @see javax.validation.TraversableResolver#isCascadable(java.lang.Object, - * javax.validation.Path.Node, java.lang.Class, javax.validation.Path, + * @see jakarta.validation.TraversableResolver#isCascadable(java.lang.Object, + * jakarta.validation.Path.Node, java.lang.Class, jakarta.validation.Path, * java.lang.annotation.ElementType) */ @Override diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java index 40e6e7ab8..ba50f3a63 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.persistence.validation; -import javax.persistence.ValidationMode; +import jakarta.persistence.ValidationMode; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.log.Log; @@ -31,7 +31,7 @@ import org.apache.openjpa.validation.ValidationUnavailableException; * Validation helper routines and wrappers to remove runtime dependencies * on the Bean Valdiation APIs or a implementation. * - * Note: This class should have no direct dependency on the javax.validation + * Note: This class should have no direct dependency on the jakarta.validation * packages, which should only occur in the ValidatorImpl class. * * @version $Rev$ $Date$ @@ -42,7 +42,7 @@ public class ValidationUtils { ValidationUtils.class); /** - * Setup Validation support by determining if the javax.validation APIs + * Setup Validation support by determining if the jakarta.validation APIs * are available and then create a Validator if required by the * provided configuration. * @param conf @@ -66,15 +66,15 @@ public class ValidationUtils { boolean bValRequired = String.valueOf(ValidationMode.CALLBACK) .equalsIgnoreCase(conf.getValidationMode()); try { - // see if the javax.validation spec api is available + // see if the jakarta.validation spec api is available if (log.isTraceEnabled()) { - log.trace("Trying to load javax.validation APIs " + + log.trace("Trying to load jakarta.validation APIs " + "based on the ValidationMode=" + conf.getValidationMode()); } @SuppressWarnings("unused") Class c = Class.forName( - "javax.validation.ValidationException"); + "jakarta.validation.ValidationException"); } catch (ClassNotFoundException e) { if (bValRequired) { // fatal error - ValidationMode requires a validator @@ -88,12 +88,12 @@ public class ValidationUtils { // no optional validation provider, so just trace output if (log.isTraceEnabled()) { log.trace(_loc.get("vlem-creation-warn", - "No available javax.validation APIs")); + "No available jakarta.validation APIs")); } return brc; } } - // we have the javax.validation APIs + // we have the jakarta.validation APIs try { // try loading a validation provider ValidatorImpl validator = new ValidatorImpl(conf); @@ -142,7 +142,7 @@ public class ValidationUtils { return false; if (e.getClass().getName().equals( - "javax.validation.ConstraintViolationException")) + "jakarta.validation.ConstraintViolationException")) return true; return false; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java index 254ba9533..84925dd01 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java @@ -23,12 +23,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.persistence.ValidationMode; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.metadata.BeanDescriptor; +import jakarta.persistence.ValidationMode; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.metadata.BeanDescriptor; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.LifecycleEvent; @@ -377,7 +377,7 @@ public class ValidatorImpl extends AbstractValidator { ValidatorFactory factory = null; try { factory = AccessController.doPrivileged(J2DoPrivHelper.buildDefaultValidatorFactoryAction()); - } catch (javax.validation.ValidationException e) { + } catch (jakarta.validation.ValidationException e) { if (_log != null && _log.isTraceEnabled()) _log.trace(_loc.get("factory-create-failed"), e); } @@ -388,7 +388,7 @@ public class ValidatorImpl extends AbstractValidator { // the default validation group and pre-remove will not validate (no // validation group) private void addDefaultValidationGroups() { - addValidationGroup(JPAProperties.VALIDATE_PRE_PERSIST, javax.validation.groups.Default.class); - addValidationGroup(JPAProperties.VALIDATE_PRE_UPDATE, javax.validation.groups.Default.class); + addValidationGroup(JPAProperties.VALIDATE_PRE_PERSIST, jakarta.validation.groups.Default.class); + addValidationGroup(JPAProperties.VALIDATE_PRE_UPDATE, jakarta.validation.groups.Default.class); } } diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties index 40610bd3f..5ebaa4394 100644 --- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties @@ -255,6 +255,6 @@ connection will not be released until the EntityManager is closed. If the applic EntityManagers this property should not be used because these EntityManagers may remain open for extended periods of \ time. shared-cache-mode-take-precedence: The DataCache is set to {0} while the shared-cache-mode Element or \ -javax.persistence.sharedCache.mode property is set to NONE. The shared-cache-mode takes precedence and caching is disabled. +jakarta.persistence.sharedCache.mode property is set to NONE. The shared-cache-mode takes precedence and caching is disabled. id-class-not-serializable: The composite identity class "{0}" for entity "{1}" is not serializable. diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties index 9a597c3af..ab8cfc029 100644 --- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties @@ -36,7 +36,7 @@ field-key-type-mismatch: Actual key type of map field "{0}" "{1}" does not \ field-unrecognized: Field "{0}" is not recognized by its type code "{1}" to \ be included in the meta model. getter-unmatched: Getter method "{0}" in "{1}" has no matching setter method. -mmg-annotation-not-found: Annotation javax.annotation.Generated not found in \ +mmg-annotation-not-found: Annotation jakarta.annotation.Generated not found in \ the classpath. It will not be added to generated static metamodels. mmg-tool-banner: Starting OpenJPA Annotation Processor for Metamodel Generation mmg-process: Generating canonical metamodel source code "{0}" diff --git a/openjpa-project/CHANGES.txt b/openjpa-project/CHANGES.txt index c7e6f67a9..6d9fffc8c 100644 --- a/openjpa-project/CHANGES.txt +++ b/openjpa-project/CHANGES.txt @@ -133,7 +133,7 @@ Bug [OPENJPA-2821] - Subclassing enhancer must use AsmAdapter [OPENJPA-2828] - org.apache.openjpa.kernel.conf.Specification.equals() : returns true even if different [OPENJPA-2829] - javax script execution does not ignore empty lines - [OPENJPA-2830] - javax.persistence.sql-load-script-source does not support ";" in strings + [OPENJPA-2830] - jakarta.persistence.sql-load-script-source does not support ";" in strings [OPENJPA-2832] - DROP COLUMN does not use delimiters and always add double quotes [OPENJPA-2834] - Performance issue while deploying in Wildfly EAP with OpenJPA-3.1.1 [OPENJPA-2842] - openjpa.Log=log4j vs log4j2 - reintroduce log4j support and add explicit log4j2 support diff --git a/openjpa-project/RELEASE-NOTES.html b/openjpa-project/RELEASE-NOTES.html index f1332bd0d..cc162256d 100644 --- a/openjpa-project/RELEASE-NOTES.html +++ b/openjpa-project/RELEASE-NOTES.html @@ -164,7 +164,7 @@ in each release of OpenJPA.

  11. [OPENJPA-2829] - javax script execution does not ignore empty lines
    12. -
  12. [OPENJPA-2830] - javax.persistence.sql-load-script-source does not support ";" in strings +
  13. [OPENJPA-2830] - jakarta.persistencesql-load-script-source does not support ";" in strings
  14. [OPENJPA-2832] - DROP COLUMN does not use delimiters and always add double quotes
    15. diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml index 055cf06f0..f6963cad6 100644 --- a/openjpa-project/pom.xml +++ b/openjpa-project/pom.xml @@ -39,7 +39,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT apache-openjpa @@ -393,6 +393,10 @@ org.apache.derby derby + + org.apache.derby + derbytools + commons-logging commons-logging @@ -404,8 +408,8 @@ - org.apache.geronimo.specs - geronimo-validation_1.1_spec + jakarta.validation + jakarta.validation-api org.apache.bval diff --git a/openjpa-project/src/doc/manual/jpa_overview_arch.xml b/openjpa-project/src/doc/manual/jpa_overview_arch.xml index e55c80eba..38b6ef3f3 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_arch.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_arch.xml @@ -66,7 +66,7 @@ goes unused. Persistence: The -javax.persistence.Persistence class contains static helper methods +jakarta.persistence.Persistence class contains static helper methods to obtain EntityManagerFactory instances in a vendor-neutral fashion. @@ -80,7 +80,7 @@ vendor-neutral fashion. EntityManagerFactory: The -javax.persistence.EntityManagerFactory class is a factory for +jakarta.persistence.EntityManagerFactory class is a factory for EntityManager s. @@ -92,7 +92,7 @@ javax.persistence.EntityManagerFactory class is a factory for EntityManager -: The javax.persistence.EntityManager +: The jakarta.persistence.EntityManager is the primary JPA interface used by applications. Each EntityManager manages a set of persistent objects, and has APIs to insert new objects and delete existing ones. When used outside the @@ -124,7 +124,7 @@ datastore records. EntityTransaction: Each EntityManager has a one-to-one relation with a single -javax.persistence.EntityTransaction. +jakarta.persistence.EntityTransaction. EntityTransactions allow operations on persistent data to be grouped into units of work that either completely succeed or completely fail, leaving the datastore in its original state. These all-or-nothing operations @@ -176,7 +176,7 @@ are important for maintaining data integrity. Query -: The javax.persistence.Query +: The jakarta.persistence.Query interface is implemented by each JPA vendor to find persistent objects that meet certain criteria. JPA standardizes support for queries using both the Java Persistence Query Language (JPQL) and the Structured Query @@ -297,7 +297,7 @@ The diagram above depicts the JPA exception architecture. All exceptions are unchecked. JPA uses standard exceptions where appropriate, most notably IllegalArgumentExceptions and IllegalStateExceptions. The specification also provides -a few JPA-specific exceptions in the javax.persistence +a few JPA-specific exceptions in the jakarta.persistence package. These exceptions should be self-explanatory. See the Javadoc for additional details on JPA exceptions. diff --git a/openjpa-project/src/doc/manual/jpa_overview_criteria.xml b/openjpa-project/src/doc/manual/jpa_overview_criteria.xml index d15a863d8..f8c58fd66 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_criteria.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_criteria.xml @@ -40,7 +40,7 @@ JPA 2.0 specification introduces a new API to define queries dynamically via construction of an object-based - javax.persistence.CriteriaQuery instance, rather + jakarta.persistence.CriteriaQuery instance, rather than string-based approach used in JPQL (Java Persistence Query Language). This dynamic query definition capability, referred as Criteria API, is based on the abstract persistent schema of the entities, their embedded @@ -205,8 +205,8 @@ the name of a meta-class given the name of the original persistent Java entity c -Aopenjpa.addGeneratedAnnotation=auto|force|false : Configure whether the annotation - javax.annotation.Generated should be added to the generated metamodel classes. - This annotation is not available on Java 9 upwards unless the javax.annotation-api + jakarta.annotation.Generated should be added to the generated metamodel classes. + This annotation is not available on Java 9 upwards unless the jakarta.annotation-api is in the classpath. The default is auto. Set to force to add the annotation even if it is not in the classpath or to false to never add it to the generated class. diff --git a/openjpa-project/src/doc/manual/jpa_overview_em.xml b/openjpa-project/src/doc/manual/jpa_overview_em.xml index 5cbbdf0af..039d2c190 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_em.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_em.xml @@ -875,7 +875,7 @@ controls whether to flush transactional changes before executing queries. This allows the query results to take into account changes you have made during the current transaction. Available -javax.persistence.FlushModeType constants are: +jakarta.persistence.FlushModeType constants are: @@ -1021,7 +1021,7 @@ public void lock(Object entity, LockModeType mode); This method locks the given entity using the named mode. The -javax.persistence.LockModeType enum defines eight +jakarta.persistence.LockModeType enum defines eight modes: diff --git a/openjpa-project/src/doc/manual/jpa_overview_meta.xml b/openjpa-project/src/doc/manual/jpa_overview_meta.xml index 26d1132a3..d91347109 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_meta.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_meta.xml @@ -66,7 +66,7 @@ simply reflecting on the persistent class. Persistence metadata is specified using either the Java annotations defined in -the javax.persistence package, XML mapping files, or a +the jakarta.persistence package, XML mapping files, or a mixture of both. In the latter case, XML declarations override conflicting annotations. If you choose to use XML metadata, the XML files must be available at development and runtime, and must be discoverable via either of two diff --git a/openjpa-project/src/doc/manual/jpa_overview_query.xml b/openjpa-project/src/doc/manual/jpa_overview_query.xml index 2e11c5129..c338634b6 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_query.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_query.xml @@ -45,7 +45,7 @@ -The javax.persistence.Query interface is the mechanism +The jakarta.persistence.Query interface is the mechanism for issuing queries in JPA. The primary query language used is the Java Persistence Query Language, or JPQL. JPQL is syntactically very similar to SQL, but is object-oriented rather than table-oriented. @@ -846,7 +846,7 @@ force update version field at the end of transaction To specify a lock timeout hint in milliseconds to those databases that support it, specify a hint name of "openjpa.LockTimeout" or -"javax.persistence.lock.timeout" with an integer value greater than +"jakarta.persistence.lock.timeout" with an integer value greater than zero, or zero for no timeout which is the default behavior. @@ -856,7 +856,7 @@ zero, or zero for no timeout which is the default behavior. To specify a query timeout hint in milliseconds to those database drivers that -support it, specify a hint name of "javax.persistence.query.timeout" +support it, specify a hint name of "jakarta.persistence.query.timeout" with an integer value greater than zero, or zero for no timeout which is the default behavior. @@ -931,7 +931,7 @@ When similar hints in different prefix scopes are specified in a query, the following prefix precedence order is used to select the effective hint: -javax.persistence.* +jakarta.persistence.* openjpa.FetchPlan.* @@ -951,7 +951,7 @@ openjpa.* ... Query q = em.createQuery(.....); q.setHint("openjpa.FetchPlan.LockTimeout", 1000); -q.setHint("javax.persistence.lock.timeout", 2000); +q.setHint("jakarta.persistence.lock.timeout", 2000); q.setHint("openjpa.LockTimeout", 3000); // Lock time out of 2000 ms is in effect for query q ... diff --git a/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml b/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml index 1dfd110d5..86c4ed6e6 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml @@ -78,7 +78,7 @@ Statement, and executing that Statement to obtain a ResultSet. And of course, you are free to continue using this low-level approach to SQL execution in your JPA applications. However, JPA also supports executing SQL queries through the -javax.persistence.Query interface introduced in +jakarta.persistence.Query interface introduced in . Using a JPA SQL query, you can retrieve either persistent objects or projections of column values. The following sections detail each use. diff --git a/openjpa-project/src/doc/manual/jpa_resources.xml b/openjpa-project/src/doc/manual/jpa_resources.xml index 158ca047e..02869e6d2 100644 --- a/openjpa-project/src/doc/manual/jpa_resources.xml +++ b/openjpa-project/src/doc/manual/jpa_resources.xml @@ -36,7 +36,7 @@ Java Persistence 2.0 page -javax.persistence Javadoc +jakarta.persistence Javadoc diff --git a/openjpa-project/src/doc/manual/jpa_tutorials.xml b/openjpa-project/src/doc/manual/jpa_tutorials.xml index 7c5a83fbd..70f386416 100644 --- a/openjpa-project/src/doc/manual/jpa_tutorials.xml +++ b/openjpa-project/src/doc/manual/jpa_tutorials.xml @@ -636,7 +636,7 @@ container managed, and thus injected or looked up via JNDI. Application managed EntityManagers can be used in both managed and unmanaged environments, and are created by an EntityManagerFactory . An EntityManagerFactory can be obtained from the -javax.persistence.Persistence class. This class provides +jakarta.persistence.Persistence class. This class provides some convenience methods for obtaining an EntityManagerFactory . @@ -1530,7 +1530,7 @@ common method. In EJBs using bean managed transactions, you can control transactions through the javax.transaction.UserTransaction interface. Furthermore, outside of session beans you can control the JPA layer's transaction via the -javax.persistence.EntityTransaction interface. +jakarta.persistence.EntityTransaction interface. diff --git a/openjpa-project/src/doc/manual/migration_considerations.xml b/openjpa-project/src/doc/manual/migration_considerations.xml index 2b207ad10..83bc010ab 100644 --- a/openjpa-project/src/doc/manual/migration_considerations.xml +++ b/openjpa-project/src/doc/manual/migration_considerations.xml @@ -530,12 +530,12 @@ In previous releases, the MappingTool mapped java.math.BigDecimal fields to the database type DOUBLE, and as such, ignored column and precision values that might have been specified via the - javax.persistence.Column annotation. + jakarta.persistence.Column annotation. From the 2.3.0 release, java.math.BigDecimal fields are now mapped to the database type DECIMAL and it is very likely that you will need to specify column and precision via - the javax.persistence.Column annotation. + the jakarta.persistence.Column annotation.
    diff --git a/openjpa-project/src/doc/manual/properties_info.xml b/openjpa-project/src/doc/manual/properties_info.xml index f07929548..0d45972fb 100644 --- a/openjpa-project/src/doc/manual/properties_info.xml +++ b/openjpa-project/src/doc/manual/properties_info.xml @@ -22,7 +22,7 @@ There are two sets of properties that may be specified: those that are specific to OpenJPA and those that have been defined by the JPA specification. In some cases, two properties may be equivalent, but have different keys. For example, openjpa.LockTimeout - and javax.persistence.lock.timeout + and jakarta.persistence.lock.timeout are two different keys for the same property. diff --git a/openjpa-project/src/doc/manual/ref_guide_caching.xml b/openjpa-project/src/doc/manual/ref_guide_caching.xml index 237011150..dda43d974 100644 --- a/openjpa-project/src/doc/manual/ref_guide_caching.xml +++ b/openjpa-project/src/doc/manual/ref_guide_caching.xml @@ -137,7 +137,7 @@ a distributed environment, as caches in different JVMs or created from different There are two ways to enable the basic single-factory cache. One is using openjpa.DataCache property, the other is using JPA standard shared-cache-mode element or the -javax.persistence.sharedCache.mode property. +jakarta.persistence.sharedCache.mode property.
    @@ -369,7 +369,7 @@ an UPDATE or DELETE statement. The default for the value is <literal>true</liter Integration with JPA standard shared cache mode - JPA 2.0 specification introduced the standard data cache configuration through the shared-cache-mode element or javax.persistence. + JPA 2.0 specification introduced the standard data cache configuration through the shared-cache-mode element or jakarta.persistence. sharedCache.mode property. @@ -383,14 +383,14 @@ sharedCache.mode property. If the shared cache mode is to turn on the caching, the cache setting configured through openjpa.DataCache , like cacheSize and SoftReferenceSize, will be used to initialize or manage the cache. The Types and ExcludeTypes - property in openjpa.DataCache will be ingnored since the shared cache mode in conjunction with the javax.persistence.Cacheable + property in openjpa.DataCache will be ingnored since the shared cache mode in conjunction with the jakarta.persistence.Cacheable annotation already defines what will be cached. <property name="openjpa.DataCache" value="true"/> -<property name="javax.persistence.sharedCache.mode" value="NONE"/> +<property name="jakarta.persistence.sharedCache.mode" value="NONE"/> @@ -402,7 +402,7 @@ sharedCache.mode property. <property name="openjpa.DataCache" value="true(ExcludedTypes=foo.bar.Person;foo.bar.Employee)"/> -<property name="javax.persistence.sharedCache.mode" value="ALL"/> +<property name="jakarta.persistence.sharedCache.mode" value="ALL"/> @@ -414,7 +414,7 @@ sharedCache.mode property. <property name="openjpa.DataCache" value="true(ExcludedTypes=foo.bar.Person;foo.bar.Employee)"/> -<property name="javax.persistence.sharedCache.mode" value="ENABLE_SELECTIVE"/> +<property name="jakarta.persistence.sharedCache.mode" value="ENABLE_SELECTIVE"/> @@ -480,7 +480,7 @@ tips on how to use this package to extend OpenJPA's caching service yourself. Rather than use the low-level org.apache.openjpa.datacache package APIs, JPA users should typically access the data cache through the JPA -standard javax.persistence.Cache interface, or OpenJPA's +standard jakarta.persistence.Cache interface, or OpenJPA's high-level org.apache.openjpa.persistence.StoreCache facade. @@ -493,16 +493,16 @@ number of read or write requests and hit ratio of the cache.
    Using the JPA standard Cache interface - You may obtain the javax.persistence.Cache through + You may obtain the jakarta.persistence.Cache through the EntityManagerFactory.getCache() method. Accessing the Cache -import javax.persistence.Cache; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.Cache; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; . . . EntityManagerFactory emf = Persistence.createEntityManagerFactory("myPersistenceUnit"); @@ -512,7 +512,7 @@ Cache cache = emf.getCache(); - Using the javax.persistence.Cache interface + Using the jakarta.persistence.Cache interface // Check whether the cache contains an entity with a provided ID Cache cache = emf.getCache(); @@ -1394,7 +1394,7 @@ for a JPQL query. ignore any cached SQL query, by setting QueryHints.HINT_IGNORE_PREPARED_QUERY or "openjpa.hint.IgnorePreparedQuery" to true - via standard javax.persistence.Query.setHint(String, Object) method. If a + via standard jakarta.persistence.Query.setHint(String, Object) method. If a SQL query has been cached corresponding to the JPQL query prior to this execution, then the cached SQL remains in the cache and will be reused for any subsequent execution of the same JPQL query. diff --git a/openjpa-project/src/doc/manual/ref_guide_conf.xml b/openjpa-project/src/doc/manual/ref_guide_conf.xml index e8358ad20..b3259d0f8 100644 --- a/openjpa-project/src/doc/manual/ref_guide_conf.xml +++ b/openjpa-project/src/doc/manual/ref_guide_conf.xml @@ -418,19 +418,19 @@ and their OpenJPA equivalent. - javax.persistence.jdbc.driver + jakarta.persistence.jdbc.driver openjpa.ConnectionDriverName - javax.persistence.jdbc.url + jakarta.persistence.jdbc.url openjpa.ConnectionURL - javax.persistence.jdbc.user + jakarta.persistence.jdbc.user openjpa.ConnectionUserName - javax.persistence.jdbc.password + jakarta.persistence.jdbc.password openjpa.ConnectionPassword diff --git a/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml b/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml index 7024116d0..f22d175a5 100644 --- a/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml +++ b/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml @@ -478,7 +478,7 @@ properties are outlined in . As mentioned above, the JTA and Non-JTA DataSources may be passed in as configuration properties at EntityManagerFactory creation. Either the JPA standard properties ( -javax.persistence.jtaDataSource, java.persistence.nonJtaDataSource) +jakarta.persistence.jtaDataSource, java.persistence.nonJtaDataSource) or their OpenJPA specific equivalents (openjpa.ConnectionFactoryName, openjpa.ConnectionFactory2Name) may be used. One use case for this function is to store production connection information in configuration files but override the value when testing. @@ -489,8 +489,8 @@ store production connection information in configuration files but override the Setting DataSource at Runtime Map<Object,Object> props = new HashMap<Object,Object>(); -props.put("javax.persistence.jtaDataSource", "jdbc/myDataSource"); -props.put("javax.persistence.nonJtaDataSource", "jdbc/myNonJTADataSource"); +props.put("jakarta.persistence.jtaDataSource", "jdbc/myDataSource"); +props.put("jakarta.persistence.nonJtaDataSource", "jdbc/myNonJTADataSource"); emf = Persistence.createEntityManagerFactory("example", props); @@ -623,8 +623,8 @@ connection is not released if a datastore transaction is in progress. import java.sql.Connection; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; ... @@ -3135,7 +3135,7 @@ calls to java.sql.Statement.setQueryTimeout. AllowQueryTimeoutOnFindUpdate: The JPA Specification defines the -javax.persistence.query.timeout, in milliseconds, as a hint to the provider. The hint +jakarta.persistence.query.timeout, in milliseconds, as a hint to the provider. The hint is used for Query operations. This property, when set to true, will allow the query timeout hint to apply to EntityManager operations. For example, when a 'find' is executed and the resultant entity updated, the query timeout will apply to the SQL update operation. This property defaults diff --git a/openjpa-project/src/doc/manual/ref_guide_deploy.xml b/openjpa-project/src/doc/manual/ref_guide_deploy.xml index 5c11fa282..c7c62d7e9 100644 --- a/openjpa-project/src/doc/manual/ref_guide_deploy.xml +++ b/openjpa-project/src/doc/manual/ref_guide_deploy.xml @@ -51,7 +51,7 @@ deployment options. -The JPA Overview describes the javax.persistence.Persistence +The JPA Overview describes the jakarta.persistence.Persistence class. You can use Persistence to obtain EntityManagerFactory instances, as demonstrated in . OpenJPA also extends diff --git a/openjpa-project/src/doc/manual/ref_guide_logging.xml b/openjpa-project/src/doc/manual/ref_guide_logging.xml index 7832f8272..e35ab5cdf 100644 --- a/openjpa-project/src/doc/manual/ref_guide_logging.xml +++ b/openjpa-project/src/doc/manual/ref_guide_logging.xml @@ -618,7 +618,7 @@ com.xyz.CustomLogFactory(Prefix="LOG MSG") org.apache.openjpa.audit.Auditable. - @javax.persistence.Entity + @jakarta.persistence.Entity @org.apache.openjpa.audit.Auditable public class MyDomainObject { ...} diff --git a/openjpa-project/src/doc/manual/ref_guide_mapping.xml b/openjpa-project/src/doc/manual/ref_guide_mapping.xml index 047ab0134..34f108b86 100644 --- a/openjpa-project/src/doc/manual/ref_guide_mapping.xml +++ b/openjpa-project/src/doc/manual/ref_guide_mapping.xml @@ -2129,7 +2129,7 @@ same order they were in when last stored, you must declare an order column. An order column can be declared using OpenJPA's org.apache.openjpa.persistence.jdbc.OrderColumn -annotation or the JPA 2.0 javax.persistence.OrderColumn +annotation or the JPA 2.0 jakarta.persistence.OrderColumn annotation or order-column orm element as defined in . OpenJPA's diff --git a/openjpa-project/src/doc/manual/ref_guide_pc.xml b/openjpa-project/src/doc/manual/ref_guide_pc.xml index 38468ec55..56dcfabbc 100644 --- a/openjpa-project/src/doc/manual/ref_guide_pc.xml +++ b/openjpa-project/src/doc/manual/ref_guide_pc.xml @@ -633,7 +633,7 @@ OpenJPA's org.apache.openjpa.persistence.DataStoreId class annotation. This annotation has strategy and generator properties that mirror the same-named properties on the -standard javax.persistence.GeneratedValue annotation +standard jakarta.persistence.GeneratedValue annotation described in of the JPA Overview. diff --git a/openjpa-project/src/doc/manual/ref_guide_remote.xml b/openjpa-project/src/doc/manual/ref_guide_remote.xml index 6b84fbcb0..310484287 100644 --- a/openjpa-project/src/doc/manual/ref_guide_remote.xml +++ b/openjpa-project/src/doc/manual/ref_guide_remote.xml @@ -102,7 +102,7 @@ version. See the migration section In JPA, objects detach automatically when they are serialized or when a persistence context ends. The specification also allows objects to be explicitly detached using -the following javax.persistence.EntityManager method: +the following jakarta.persistence.EntityManager method: public void detach(Object) @@ -577,13 +577,13 @@ JVMs. Defaults to topic/OpenJPACommitProviderTopic TopicConnectionFactory: The JNDI name of a -javax.jms.TopicConnectionFactory factory to use for finding topics. +jakarta.jms.TopicConnectionFactory factory to use for finding topics. Defaults to java:/ConnectionFactory. This setting may vary depending on the application server in use; consult the application server's documentation for details of the default JNDI name for the -javax.jms.TopicConnectionFactory instance. For example, under +jakarta.jms.TopicConnectionFactory instance. For example, under Weblogic, the JNDI name for the TopicConnectionFactory is -javax.jms.TopicConnectionFactory. +jakarta.jms.TopicConnectionFactory. diff --git a/openjpa-project/src/doc/manual/ref_guide_runtime.xml b/openjpa-project/src/doc/manual/ref_guide_runtime.xml index b256cfccf..94a066319 100644 --- a/openjpa-project/src/doc/manual/ref_guide_runtime.xml +++ b/openjpa-project/src/doc/manual/ref_guide_runtime.xml @@ -51,19 +51,19 @@ OpenJPA component: -javax.persistence.EntityManagerFactory: +jakarta.persistence.EntityManagerFactory: org.apache.openjpa.kernel.BrokerFactory -javax.persistence.EntityManager: +jakarta.persistence.EntityManager: org.apache.openjpa.kernel.Broker -javax.persistence.Query: +jakarta.persistence.Query: org.apache.openjpa.kernel.Query @@ -240,7 +240,7 @@ below. The org.apache.openjpa.persistence.OpenJPAEntityManagerFactory interface extends the basic -javax.persistence.EntityManagerFactory with OpenJPA-specific +jakarta.persistence.EntityManagerFactory with OpenJPA-specific features. The OpenJPAEntityManagerFactory offers APIs to access the OpenJPA data and query caches and to perform other OpenJPA-specific operations. See the @@ -273,7 +273,7 @@ All OpenJPA EntityManagers implement the org.apache.openjpa.persistence.OpenJPAEntityManager interface. This interface extends the standard -javax.persistence.EntityManager. Just as the standard +jakarta.persistence.EntityManager. Just as the standard EntityManager is the primary window into JPA services, the OpenJPAEntityManager is the primary window from JPA into OpenJPA-specific functionality. We strongly encourage you to investigate the API @@ -363,7 +363,7 @@ for (Magazine m : mags) In addition to the EntityManager object cache the JPA specification provides access to a second level cache via the -javax.persistence.Cache interface. OpenJPA provides further extensions via +jakarta.persistence.Cache interface. OpenJPA provides further extensions via the org.apache.openjpa.persistence.StoreCache interface documented at org.apache.openjpa.persistence.StoreCache. @@ -454,7 +454,7 @@ FetchPlans. org.apache.openjpa.persistence.OpenJPAEntityTransaction -extends javax.persistence.EntityTransaction to provide +extends jakarta.persistence.EntityTransaction to provide additional transaction-debugging capabilities and some concurrency-related commit and rollback features. @@ -472,7 +472,7 @@ commit and rollback features. org.apache.openjpa.persistence.OpenJPAPersistence is a static helper class that adds OpenJPA-specific utility methods to -javax.persistence.Persistence. +jakarta.persistence.Persistence.
    diff --git a/openjpa-project/src/doc/manual/ref_guide_slice.xml b/openjpa-project/src/doc/manual/ref_guide_slice.xml index ef06dc8c8..e27bdda6b 100644 --- a/openjpa-project/src/doc/manual/ref_guide_slice.xml +++ b/openjpa-project/src/doc/manual/ref_guide_slice.xml @@ -111,7 +111,7 @@ By default, any query is executed against all available slices. However, the application can target the query only to a subset of - slices by setting hint on javax.persistence.Query. + slices by setting hint on jakarta.persistence.Query. The hint key is openjpa.hint.slice.Target and hint value is an array of slice identifiers. The following example shows how to target a query only to a pair of slices @@ -189,7 +189,7 @@ Slice runtime invokes this user-supplied method for the newly persistent instance that is explicit argument of the - javax.persistence.EntityManager.persist(Object pc) + jakarta.persistence.EntityManager.persist(Object pc) method. The user application must return a valid slice name from this method to designate the target slice for the given instance. The data distribution policy may be based on the attribute diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml index 19e03c185..ca0d895f7 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-slice @@ -47,9 +47,9 @@ ${project.version} - org.apache.geronimo.specs - geronimo-jpa_2.2_spec - test + jakarta.persistence + jakarta.persistence-api + provided org.apache.openjpa diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java index 6a31f3774..0060a5ec9 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.slice; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class Address { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java index 97771bb34..2aa0e6d0a 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java @@ -18,11 +18,11 @@ */ package org.apache.openjpa.slice; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Car { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Country.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Country.java index 957c88020..d4249cda6 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Country.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Country.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.slice; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * A persistence entity to be replicated across multiple databases. A diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Manufacturer.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Manufacturer.java index f14be2ba4..0f315ded1 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Manufacturer.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Manufacturer.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.slice; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Manufacturer { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/PObject.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/PObject.java index 86d974a23..ffe4c27f7 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/PObject.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/PObject.java @@ -20,8 +20,8 @@ package org.apache.openjpa.slice; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class PObject { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java index f4710a381..52e278555 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java @@ -25,9 +25,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -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 org.apache.openjpa.kernel.AbstractBrokerFactory; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java index 98b25d34d..665c24379 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java @@ -18,12 +18,12 @@ */ package org.apache.openjpa.slice; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class Person { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedChild.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedChild.java index 3fad0a942..bd86e19f0 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedChild.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedChild.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.slice; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class ReplicatedChild { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java index 47365505e..1083781c7 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java @@ -21,10 +21,10 @@ package org.apache.openjpa.slice; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class ReplicatedParent { diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java index d778eea3d..64d321776 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.slice; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.slice.jdbc.DistributedJDBCConfiguration; diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java index 432341a0f..274c5d7f6 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.openjpa.persistence.OpenJPAEntityManager; diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java index 9ba45bed0..871472bb5 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java @@ -20,7 +20,7 @@ package org.apache.openjpa.slice; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.slice.policy.UniformDistributionPolicy; diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java index 02f5abe80..04c9946c9 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java @@ -21,8 +21,8 @@ package org.apache.openjpa.slice; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; /** * Tests query ordering. diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java index 412cf5333..87d8c5cf6 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java @@ -32,9 +32,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; /** * Tests when multiple user threads enter the same EntityManager and executes diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java index 3049868d1..fbacdd9cd 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java @@ -20,8 +20,8 @@ package org.apache.openjpa.slice; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; /** * Tests query ordering. diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java index 0e253cf7f..3063760ff 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java @@ -20,7 +20,7 @@ package org.apache.openjpa.slice; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Tests that parent-child relation both replicated are stored in all replicated diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java index 8a203723d..dc5341827 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java @@ -21,8 +21,8 @@ package org.apache.openjpa.slice; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.RollbackException; import org.junit.Ignore; diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java index 33da463d1..c1e951de8 100644 --- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java +++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.slice; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; public class TestXA extends SliceTestCase { @Override diff --git a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml index a96069791..73d0b5bcb 100644 --- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml +++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml @@ -17,7 +17,7 @@ org.apache.openjpa openjpa-tools - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-fetch-statistics-was diff --git a/openjpa-tools/openjpa-fetch-statistics/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml index 437a79bdd..39c03d9b0 100644 --- a/openjpa-tools/openjpa-fetch-statistics/pom.xml +++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml @@ -17,7 +17,7 @@ org.apache.openjpa openjpa-tools - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-fetch-statistics @@ -33,12 +33,13 @@ - org.apache.geronimo.specs - geronimo-jpa_2.2_spec + jakarta.persistence + jakarta.persistence-api + provided - org.apache.geronimo.specs - geronimo-jta_1.1_spec + jakarta.transaction + jakarta.transaction-api org.apache.openjpa diff --git a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/AEntity.java b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/AEntity.java index d1f3cd35c..a9d059838 100644 --- a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/AEntity.java +++ b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/AEntity.java @@ -18,9 +18,9 @@ */ package org.apache.openjpa.enhance.stats; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class AEntity { diff --git a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/BEntity.java b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/BEntity.java index 3ee3204d4..951ea01b1 100644 --- a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/BEntity.java +++ b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/BEntity.java @@ -19,13 +19,13 @@ package org.apache.openjpa.enhance.stats; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy=InheritanceType.JOINED) diff --git a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/ChildEntity.java b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/ChildEntity.java index e384cbcc7..1c0f618ec 100644 --- a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/ChildEntity.java +++ b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/ChildEntity.java @@ -19,8 +19,8 @@ package org.apache.openjpa.enhance.stats; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity @PrimaryKeyJoinColumn(name = "CHILDID", referencedColumnName = "ID") diff --git a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/EEntity.java b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/EEntity.java index 4258160a3..a2cbd2c41 100644 --- a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/EEntity.java +++ b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/EEntity.java @@ -19,7 +19,7 @@ package org.apache.openjpa.enhance.stats; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable diff --git a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java index 2df0d2eb1..870b4e463 100644 --- a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java +++ b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java @@ -21,8 +21,8 @@ package org.apache.openjpa.enhance.stats; import java.util.Set; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import junit.framework.Test; import junit.framework.TestCase; diff --git a/openjpa-tools/openjpa-maven-plugin/pom.xml b/openjpa-tools/openjpa-maven-plugin/pom.xml index ff6da4c94..037729db3 100644 --- a/openjpa-tools/openjpa-maven-plugin/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-tools - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml @@ -117,12 +117,13 @@ - org.apache.geronimo.specs - geronimo-jpa_2.2_spec + jakarta.persistence + jakarta.persistence-api + provided - org.apache.geronimo.specs - geronimo-validation_1.1_spec + jakarta.validation + jakarta.validation-api org.apache.bval diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java index 6d3d91487..38fa80815 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.tools.maven.testentity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Enumerated; -import javax.persistence.EnumType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Enumerated; +import jakarta.persistence.EnumType; @Entity diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/test/java/org/apache/openjpa/tools/maven/test/ItDefaultSettingsTest.java b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/test/java/org/apache/openjpa/tools/maven/test/ItDefaultSettingsTest.java index c0ddfd2ba..766ba8d23 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/test/java/org/apache/openjpa/tools/maven/test/ItDefaultSettingsTest.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/src/test/java/org/apache/openjpa/tools/maven/test/ItDefaultSettingsTest.java @@ -24,9 +24,9 @@ import java.io.FileReader; import java.io.InputStream; import java.io.InputStreamReader; -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 org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.tools.maven.testentity.TestEntity; diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/src/main/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/src/main/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java index a4548b299..08cecb1e8 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/src/main/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/src/main/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java @@ -19,9 +19,9 @@ package org.apache.openjpa.tools.maven.test.it.dependingartifact.entities; */ -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.tools.maven.test.it.dependingartifact.MyEntityInterface; diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/exclude/TestEntityA.java b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/exclude/TestEntityA.java index 528e1ac66..8185c31e0 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/exclude/TestEntityA.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/exclude/TestEntityA.java @@ -18,8 +18,8 @@ */ package enhance.exclude; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TestEntityA { diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/include/TestEntityB.java b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/include/TestEntityB.java index 72cdfadd0..fbef22fe6 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/include/TestEntityB.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/enhance/include/TestEntityB.java @@ -18,8 +18,8 @@ */ package enhance.include; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TestEntityB { diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/foo/TestEntityC.java b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/foo/TestEntityC.java index c025de195..57fadc165 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/foo/TestEntityC.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/src/main/java/foo/TestEntityC.java @@ -18,8 +18,8 @@ */ package foo; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TestEntityC { diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java index 2bc7ee6b9..c376b1f7e 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.tools.maven.testentity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/test/java/org/apache/openjpa/tools/maven/test/ItNonDefaultXmlTest.java b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/test/java/org/apache/openjpa/tools/maven/test/ItNonDefaultXmlTest.java index 40a80752a..7d21123c5 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/test/java/org/apache/openjpa/tools/maven/test/ItNonDefaultXmlTest.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/src/test/java/org/apache/openjpa/tools/maven/test/ItNonDefaultXmlTest.java @@ -25,7 +25,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.openjpa.enhance.PersistenceCapable; diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/main/java/org/apache/openjpa/tools/maven/testentity/DropSchemaTestEntity.java b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/main/java/org/apache/openjpa/tools/maven/testentity/DropSchemaTestEntity.java index 952860739..a534d679f 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/main/java/org/apache/openjpa/tools/maven/testentity/DropSchemaTestEntity.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/src/main/java/org/apache/openjpa/tools/maven/testentity/DropSchemaTestEntity.java @@ -18,10 +18,10 @@ */ package org.apache.openjpa.tools.maven.testentity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Enumerated; -import javax.persistence.EnumType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Enumerated; +import jakarta.persistence.EnumType; @Entity diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionRefresh/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionRefresh/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java index 285324b00..3f7be287a 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionRefresh/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionRefresh/src/main/java/org/apache/openjpa/tools/maven/testentity/TestEntity.java @@ -19,10 +19,10 @@ package org.apache.openjpa.tools.maven.testentity; * under the License. */ -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/src/test/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/src/test/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java index 1546ec1e0..2cde77e02 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/src/test/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java +++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/src/test/java/org/apache/openjpa/tools/maven/test/it/dependingartifact/entities/MyEntityImpl.java @@ -20,9 +20,9 @@ package org.apache.openjpa.tools.maven.test.it.dependingartifact.entities; */ -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.apache.openjpa.tools.maven.test.it.dependingartifact.MyEntityInterface; diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java index a4f944c8d..320a68d17 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java +++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java @@ -25,7 +25,7 @@ import java.sql.SQLException; import java.util.Iterator; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; diff --git a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/Person.java b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/Person.java index 9d028ff48..f730dd181 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/Person.java +++ b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/Person.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.tools.maven.testentity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Person { diff --git a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java index 8133cf244..f1d5ef540 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java +++ b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java @@ -18,8 +18,8 @@ */ package org.apache.openjpa.tools.maven.testentity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SampleEntity diff --git a/openjpa-tools/pom.xml b/openjpa-tools/pom.xml index fbc18db5a..44768d729 100644 --- a/openjpa-tools/pom.xml +++ b/openjpa-tools/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml index f9351f5d5..cba5357c7 100644 --- a/openjpa-xmlstore/pom.xml +++ b/openjpa-xmlstore/pom.xml @@ -27,7 +27,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa-xmlstore diff --git a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java index ed3b919fe..a7e4432af 100644 --- a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java +++ b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java @@ -28,9 +28,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.apache.openjpa.persistence.PersistentCollection; diff --git a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/Place.java b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/Place.java index ca568e8e7..fc6a8919e 100644 --- a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/Place.java +++ b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/Place.java @@ -20,8 +20,8 @@ package org.apache.openjpa.xmlstore.simple; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Place implements Serializable { diff --git a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/TestPersistence.java b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/TestPersistence.java index d1a5f98ae..04a245f8e 100644 --- a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/TestPersistence.java +++ b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/TestPersistence.java @@ -23,8 +23,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.apache.openjpa.persistence.OpenJPAEntityManager; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa/pom.xml b/openjpa/pom.xml index 338e0874a..57ec31f9b 100644 --- a/openjpa/pom.xml +++ b/openjpa/pom.xml @@ -28,7 +28,7 @@ org.apache.openjpa openjpa-parent - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT openjpa @@ -89,7 +89,7 @@ @@ -129,18 +129,18 @@ - javax.annotation + jakarta.annotation jakarta.annotation javax.annotation.processing.** - javax.jms + jakarta.jms jakarta.jms - javax.persistence + jakarta.persistence jakarta.persistence @@ -201,14 +201,14 @@ org.slf4j.*;resolution:=optional, org.apache.commons.logging.*;resolution:=optional, javax.activation.xa*;resolution:=optional, - javax.jms.*;version="[1.1.0,1.2)";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, serp.*;resolution:=optional, org.apache.commons.dbcp2.*;resolution:=optional, org.apache.commons.pool2.*;resolution:=optional, - javax.persistence.*;version="[1.1.0,2.2)", + jakarta.persistence.*;version="[1.1.0,2.2)", * diff --git a/pom.xml b/pom.xml index 27df59a03..777f47e7a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,20 +26,20 @@ org.apache apache - 23 + 29 org.apache.openjpa openjpa-parent pom OpenJPA Parent POM - Apache OpenJPA implementation of JSR-338 JPA 2.2 + Apache OpenJPA implementation of Jakarta JPA 3.1 - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT - 1.8 - 1.8 + 11 + 11 none @@ -50,7 +50,6 @@ scp://people.apache.org/home/${site.deploy.user.name}/public_html/openjpa/${project.version}/staging-site - 512m 1024m -Xmx${test.jvm.maxheapsize} -XX:+HeapDumpOnOutOfMemoryError ${test.jvm.arguments} @@ -77,7 +76,7 @@ none false - 10.14.2.0 + 10.15.2.0 2.5.1 5.1.49 2.7.2 @@ -98,13 +97,20 @@ 3.0.0-M7 4.20 - 1.1.2 + 3.0.0-SNAPSHOT 2.19.0 1.10.12 2.9.0 2.8.0 - 2.9.0 + 2.9.0 + + 2.1.1 + 3.0.0 + 2.0.1 + 3.0.2 + 3.1.0 + @@ -229,7 +235,7 @@ 0 - **/javax.persistence.spi.PersistenceProvider + **/jakarta.persistencespi.PersistenceProvider **/javax.annotation.processing.Processor **/*.rsrc @@ -425,6 +431,11 @@ derby test + + org.apache.derby + derbytools + test + org.apache.derby.jdbc.EmbeddedDriver @@ -511,6 +522,12 @@ ${derby.version} test + + org.apache.derby + derbytools + ${derby.version} + test + org.apache.derby.jdbc.EmbeddedDriver @@ -1752,7 +1769,7 @@ org.apache.commons commons-pool2 - ${pool2.version} + ${pool2.version} commons-logging @@ -1770,26 +1787,33 @@ + - org.apache.geronimo.specs - geronimo-jpa_2.2_spec - 1.1 + jakarta.persistence + jakarta.persistence-api + ${jakarta.persistence-api.version} - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1.1 + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api.version} - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 + jakarta.validation + jakarta.validation-api + ${jakarta.validation-api.version} - org.apache.geronimo.specs - geronimo-validation_1.1_spec - 1.0 + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + jakarta.jms + jakarta.jms-api + ${jakarta.jms-api.version} + + org.apache.bval org.apache.bval.bundle @@ -1800,6 +1824,11 @@ derby ${derby.version} + + org.apache.derby + derbytools + ${derby.version} + org.apache.derby derbyclient @@ -1820,12 +1849,6 @@ jaxb-api 2.2.1 - - javax.annotation - javax.annotation-api - 1.3.2 - provided - com.sun.xml.bind jaxb-impl