diff --git a/jpa/docs/TCK-Exclude-List.txt b/jpa/docs/TCK-Exclude-List.txt
index 3eba138cc0..1f5709f8b8 100644
--- a/jpa/docs/TCK-Exclude-List.txt
+++ b/jpa/docs/TCK-Exclude-List.txt
@@ -14,10 +14,22 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-# This file lists the excluded tests from Jakarta EL TCK.
+# This file lists the excluded tests from Jakarta Persistence TCK.
# This is intended only for documentation purpose and is not used to exclude any tests.
# The tests are excluded from the test source using @Disabled tag in JUnit framework.
+#
+
+#
+ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes
+
+#
+#
+ee/jakarta/tck/persistence/core/entityManagerFactory/Client2.java#createEntityManagerFactoryStringTest
+
#
ee/jakarta/tck/persistence/se/schemaGeneration/annotations/tableGenerator/Client.java#tableGeneratorTest
+
+#
ee/jakarta/tck/persistence/core/query/language/Client6.java#resultContainsFetchReference
-ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes
\ No newline at end of file
+
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
index 8dbff0eb41..06da3f66db 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.AttributeNode;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.metamodel.Attribute;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
index fce05b7c6d..9674a19950 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.AfterEach;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.StoredProcedureQuery;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
index 69fe30a512..4a0d781382 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.PersistenceException;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/A.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/A.java
index 2e9298a2c3..b2ec47369a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/A.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/A.java
@@ -21,7 +21,6 @@
import java.util.Set;
import ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor;
-
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
index 5965e09333..f8c879e127 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
index 1b0580a5d5..e940be89b9 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
index 2d739046ee..cc6e41bdfb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java
index 1a4a1a01e2..17ba629a54 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java
@@ -34,6 +34,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.PMClientBase;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java
index 80d474d3b7..f3a8fd09fa 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java
@@ -31,6 +31,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.PMClientBase;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java
index 721c4d31f6..9faef16192 100755
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java
index bac9c7fc22..c4b7496bdb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java
@@ -33,6 +33,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.PMClientBase;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java
index 5d2b8c8ae6..23b29ce5b1 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java
index 135f75a6a4..b31919d932 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java
@@ -30,7 +30,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.TransactionRequiredException;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java
index 8439a54291..dce636c384 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java
index 0b0fcb1833..0f0adb63ee 100755
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java
index bcea07957f..307e6883e2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java
index 3c459a884a..559b77ecb6 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java
index d9fa0b3816..e227c78b90 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java
@@ -27,7 +27,6 @@
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java
index 0a8bcb9974..919b4c305e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java
@@ -28,11 +28,11 @@
import com.sun.ts.lib.harness.SetupMethod;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.schema30.Address;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Spouse;
import ee.jakarta.tck.persistence.common.schema30.UtilCustAliasProductData;
-
import jakarta.persistence.Query;
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java
index 589fc228b4..dfee4ef72a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java
@@ -28,10 +28,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Alias;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilAliasData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TupleElement;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java
index e9be85b0fd..7a6a2833a9 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java
@@ -24,9 +24,9 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Alias;
import ee.jakarta.tck.persistence.common.schema30.UtilAliasOnlyData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java
index e90844d555..b70dd77382 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java
@@ -30,13 +30,13 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.HardwareProduct;
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.ShelfLife;
import ee.jakarta.tck.persistence.common.schema30.SoftwareProduct;
import ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java
index b6c4b2c1dd..2707d413dc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java
@@ -24,13 +24,13 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.LineItem;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.Order_;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CollectionJoin;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java
index 7ddcbe00ea..2506934663 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.UtilCustAliasProductData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TupleElement;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java
index 439f8bd195..9cdb950a4e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java
@@ -22,9 +22,9 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Trim;
import ee.jakarta.tck.persistence.common.schema30.UtilTrimData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaBuilder.Trimspec;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java
index 05accf8b8d..62ddd5b048 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java
@@ -27,7 +27,6 @@
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.SoftwareProduct;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.Query;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java
index eccd0eef01..ebf321cec0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java
@@ -26,13 +26,13 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Address_;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.Order_;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2.java
index e187799903..36be14f55a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2.java
@@ -24,9 +24,9 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilAliasData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.criteria.CompoundSelection;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3.java
index e5edb277d5..2c4377c938 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3.java
@@ -34,10 +34,10 @@
import com.sun.ts.lib.harness.SetupMethod;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.schema30.Country;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.Query;
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4.java
index 0cecdb8db6..7c12150091 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4.java
@@ -24,7 +24,6 @@
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Path;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java
index 53dbe7a7a3..6d78c373bd 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java
@@ -29,8 +29,8 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
-import ee.jakarta.tck.persistence.common.schema30.Util;
+import ee.jakarta.tck.persistence.common.schema30.Util;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.ParameterExpression;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6.java
index eb44973b02..d2d16844b0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6.java
@@ -25,10 +25,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.HardwareProduct;
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.Query;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7.java
index c4ac522756..7183904e0a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7.java
@@ -24,10 +24,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Department;
import ee.jakarta.tck.persistence.common.schema30.Department_;
import ee.jakarta.tck.persistence.common.schema30.UtilDepartmentEmployeeData;
-
import jakarta.persistence.Query;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/Client.java
index 610682bd06..881f9c8114 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/Client.java
@@ -26,7 +26,6 @@
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.SoftwareProduct;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.Query;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaUpdate;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1.java
index b215fc0678..cce22e75a1 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1.java
@@ -23,7 +23,6 @@
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.From;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2.java
index a99ed8b020..a72e69ef94 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2.java
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Address;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3.java
index c66964f03f..54a0ee0e81 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3.java
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CollectionJoin;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4.java
index 316edf121a..e1fc77d7b1 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4.java
@@ -24,16 +24,15 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Department;
import ee.jakarta.tck.persistence.common.schema30.Department_;
import ee.jakarta.tck.persistence.common.schema30.Employee;
import ee.jakarta.tck.persistence.common.schema30.UtilDepartmentEmployeeData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.From;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.MapJoin;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1.java
index 983338e847..bf30dc7449 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1.java
@@ -28,7 +28,6 @@
import ee.jakarta.tck.persistence.common.schema30.Employee_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Join;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2.java
index 5e1f0ad9c6..c5fe02df0e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2.java
@@ -25,6 +25,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.CreditCard;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
@@ -32,7 +33,6 @@
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.Order_;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CollectionJoin;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3.java
index 174f61341a..dbba18c78a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3.java
@@ -24,12 +24,12 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Department;
import ee.jakarta.tck.persistence.common.schema30.Department_;
import ee.jakarta.tck.persistence.common.schema30.Employee;
import ee.jakarta.tck.persistence.common.schema30.Employee_;
import ee.jakarta.tck.persistence.common.schema30.UtilDepartmentEmployeeData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1.java
index 9620738ab1..8809cc3948 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1.java
@@ -23,7 +23,6 @@
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2.java
index 4b1e85667e..b4aad19a32 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2.java
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Address;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3.java
index 2c9a025930..7501d564cf 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3.java
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CollectionJoin;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4.java
index 407d4b908e..af0e237245 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4.java
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Department;
import ee.jakarta.tck.persistence.common.schema30.Department_;
import ee.jakarta.tck.persistence.common.schema30.Employee;
import ee.jakarta.tck.persistence.common.schema30.UtilDepartmentEmployeeData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1.java
index f718faab1d..acd9ab786d 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1.java
@@ -26,6 +26,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Address;
import ee.jakarta.tck.persistence.common.schema30.Address_;
import ee.jakarta.tck.persistence.common.schema30.Country_;
@@ -34,7 +35,6 @@
import ee.jakarta.tck.persistence.common.schema30.Spouse;
import ee.jakarta.tck.persistence.common.schema30.Spouse_;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.NoResultException;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2.java
index c9fdeb10dc..213e555a35 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2.java
@@ -28,6 +28,7 @@
import com.sun.ts.lib.harness.SetupMethod;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.schema30.Address_;
import ee.jakarta.tck.persistence.common.schema30.CreditCard;
import ee.jakarta.tck.persistence.common.schema30.CreditCard_;
@@ -39,7 +40,6 @@
import ee.jakarta.tck.persistence.common.schema30.Order_;
import ee.jakarta.tck.persistence.common.schema30.Product_;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.AbstractQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3.java
index 8ac3e1254a..44c8ce80e0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3.java
@@ -25,12 +25,12 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Alias;
import ee.jakarta.tck.persistence.common.schema30.Alias_;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.UtilAliasData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4.java
index 50bbebea62..aa191f7f7b 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4.java
@@ -26,11 +26,11 @@
import com.sun.ts.lib.harness.SetupMethod;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.Product_;
import ee.jakarta.tck.persistence.common.schema30.ShelfLife_;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5.java
index 9f477ce0e9..f0e8394d2e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5.java
@@ -24,10 +24,10 @@
import com.sun.ts.lib.harness.SetupMethod;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.schema30.Alias;
import ee.jakarta.tck.persistence.common.schema30.Alias_;
import ee.jakarta.tck.persistence.common.schema30.UtilAliasOnlyData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6.java
index cee2336dc6..b47f4f8fe8 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6.java
@@ -23,6 +23,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Address;
import ee.jakarta.tck.persistence.common.schema30.Address_;
import ee.jakarta.tck.persistence.common.schema30.Customer;
@@ -30,7 +31,6 @@
import ee.jakarta.tck.persistence.common.schema30.Phone;
import ee.jakarta.tck.persistence.common.schema30.Phone_;
import ee.jakarta.tck.persistence.common.schema30.UtilPhoneData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7.java
index 2c033118d9..fb50a9bd3e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7.java
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.util.TestUtil;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Join;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1.java
index 7443a5d710..d68827a967 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1.java
@@ -27,7 +27,6 @@
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2.java
index 4d3e9fca17..2053073b07 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2.java
@@ -26,10 +26,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3.java
index d23b7e215c..7a331ee2b3 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3.java
@@ -25,11 +25,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Customer_;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CompoundSelection;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1.java
index 61dbd22c14..7b783d8e43 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1.java
@@ -23,7 +23,6 @@
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilSetup;
-
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.From;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2.java
index 68cac18c70..6961152844 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2.java
@@ -25,12 +25,12 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.CreditCard;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.LineItem;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3.java
index 0e8eb402db..81450cdc09 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3.java
@@ -25,11 +25,11 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Address;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.Spouse;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.NoResultException;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4.java
index 1e9e808704..04ab0c8590 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4.java
@@ -24,9 +24,9 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5.java
index 5f08c53392..9ac68443d4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5.java
@@ -26,10 +26,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Alias;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilAliasData;
-
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java
index ae29bc4099..90c6e2dc0f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java
index e17d8705d4..3618901908 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java
@@ -31,8 +31,8 @@
import com.sun.ts.lib.harness.CleanupMethod;
import com.sun.ts.lib.harness.SetupMethod;
-import ee.jakarta.tck.persistence.common.PMClientBase;
+import ee.jakarta.tck.persistence.common.PMClientBase;
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityNotFoundException;
import jakarta.persistence.LockModeType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java
index 5bcf44adcc..4abb14cce4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java
@@ -30,7 +30,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.ParameterMode;
import jakarta.persistence.StoredProcedureQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java
index 2152d45337..2f15f02f6a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.LockModeType;
import jakarta.persistence.Query;
import jakarta.persistence.StoredProcedureQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java
index 06bd163ac4..cc37bae81c 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.LockModeType;
import jakarta.persistence.TransactionRequiredException;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1.java
index c1ac1e3e92..585c9bfb15 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.FlushModeType;
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2.java
index 2b84268934..20ea0b91a5 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.PersistenceUnitUtil;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3.java
index 2beefb765b..a8f36dc34e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.LockModeType;
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/Client.java
index d4149a29dd..241eb3d5fa 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/Client.java
@@ -27,8 +27,8 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.CleanupMethod;
-import ee.jakarta.tck.persistence.common.PMClientBase;
+import ee.jakarta.tck.persistence.common.PMClientBase;
import jakarta.persistence.EntityManagerFactory;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/Client.java
index f162f56f5d..a3ac51f942 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/Client.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityTransaction;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/Client.java
index 8ecf42c087..db7fb4e6bf 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityExistsException;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/Client.java
index 12d6494308..35b67891a2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/Client.java
@@ -31,7 +31,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityExistsException;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/Client.java
index 50771cf6f3..a5263c293f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityExistsException;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/Client.java
index d737c486d1..50dd2c5e96 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/Client.java
@@ -30,7 +30,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.AccessType;
import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.CacheStoreMode;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/Client.java
index 122c441a9d..5d37901e53 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityNotFoundException;
import jakarta.persistence.LockTimeoutException;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/Client.java
index d90e97c9da..4105d97200 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/Client.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.LockModeType;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/Client.java
index b598f99c55..b8b3018393 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/Client.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.LockModeType;
import jakarta.persistence.Query;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/Client.java
index c75e4db7ce..aee5157fce 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/Client.java
index 5dd757914a..f0ba568054 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.ManagedType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/Client.java
index ad125bbad4..4b55b650d2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/Client.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Bindable;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/Client.java
index 0ee73b4dd9..2d5cbe64b4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.CollectionAttribute;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/Client.java
index 38a7409089..b1ee7016a0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/Client.java
@@ -30,7 +30,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.CollectionAttribute;
import jakarta.persistence.metamodel.EmbeddableType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/Client.java
index 3bc0ab06d3..9603774962 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Bindable;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.IdentifiableType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/Client.java
index 485ca6c91d..dd6a96293d 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/Client.java
@@ -31,7 +31,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.CollectionAttribute;
import jakarta.persistence.metamodel.EntityType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/Client.java
index f4313bc6ec..f07363ca30 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.ListAttribute;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/Client.java
index 149b5ed0f3..1f6906fb41 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.CollectionAttribute;
import jakarta.persistence.metamodel.ListAttribute;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/Client.java
index 264b908f94..d14c4880eb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.MapAttribute;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/Client.java
index d029e1d2f4..0710dab0c7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/Client.java
@@ -30,7 +30,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.IdentifiableType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/Client.java
index 620a3dd3a3..9c26523801 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EmbeddableType;
import jakarta.persistence.metamodel.EntityType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/Client.java
index b8def985db..64aad7a1c0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Bindable;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/Client.java
index cb2a34fa45..3d102cf5d3 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.SetAttribute;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/Client.java
index 70b5e6c8be..9ab9aac594 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.Bindable;
import jakarta.persistence.metamodel.ManagedType;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/Client.java
index 48b0f4de11..633d824bc1 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.metamodel.EmbeddableType;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/Client.java
index 5e96b22215..0252cb5812 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import ee.jakarta.tck.persistence.core.override.util.CallBackCounts;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/Client.java
index b64152e094..c6b4e4d459 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import ee.jakarta.tck.persistence.core.override.util.CallBackCounts;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/Client.java
index 79b8f85bd0..b30d83c621 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/Client.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Query;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/Client.java
index 354ffe3ab7..6f70724b36 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/Client.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import ee.jakarta.tck.persistence.core.override.util.CallBackCounts;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/Client.java
index 5786988ff2..e18261de28 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Persistence;
import jakarta.persistence.PersistenceUtil;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtilUtil/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtilUtil/Client.java
index 2ec5ef2937..ed71eadd8b 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtilUtil/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtilUtil/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.PersistenceUnitUtil;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1.java
index 87d9abf81b..c75d181816 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1.java
@@ -32,8 +32,8 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.util.TestUtil;
-import ee.jakarta.tck.persistence.common.PMClientBase;
+import ee.jakarta.tck.persistence.common.PMClientBase;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.NoResultException;
@@ -3972,7 +3972,7 @@ public void queryAPITest27() throws Exception {
try {
logger.log(Logger.Level.TRACE, "Invoking query");
getEntityTransaction().begin();
- q = getEntityManager().createQuery("select e.hireDate from Employee e where e.hireDate = '2000-02-14'");
+ q = getEntityManager().createQuery("select e.hireDate from Employee e where e.hireDate = {d '2000-02-14'}");
result = q.getResultList();
result_size = result.size();
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2.java
index 3734b3b104..0419442999 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3.java
index 4eb807681b..3965ccd177 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Query;
public class Client3 extends PMClientBase {
@@ -234,7 +233,7 @@ public void queryAPITest29() throws Exception {
// && (dataTypes2.getTimeData().equals(timeValue))
q = getEntityManager()
- .createQuery("select d.tsData from DataTypes2 d where d.tsData = '2006-11-11 10:10:10'");
+ .createQuery("select d.tsData from DataTypes2 d where d.tsData = {ts '2006-11-11 10:10:10'}");
result = q.getResultList();
result_size = result.size();
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1.java
index cd54587922..266549d339 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1.java
@@ -28,7 +28,6 @@
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.Query;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2.java
index 69a687ed72..489fe7c1af 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2.java
@@ -32,7 +32,6 @@
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.Spouse;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.FlushModeType;
public class Client2 extends UtilOrderData {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1.java
index c4fc1a0882..8d70c0eb2f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1.java
@@ -28,10 +28,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.LineItem;
import ee.jakarta.tck.persistence.common.schema30.Order;
import ee.jakarta.tck.persistence.common.schema30.UtilOrderData;
-
import jakarta.persistence.Query;
public class Client1 extends UtilOrderData {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2.java
index 2a5943809f..63db62af8b 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2.java
@@ -25,10 +25,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Country;
import ee.jakarta.tck.persistence.common.schema30.Customer;
import ee.jakarta.tck.persistence.common.schema30.UtilCustomerData;
-
import jakarta.persistence.NoResultException;
import jakarta.persistence.Query;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3.java
index a540d0e3c6..c4b5e9c74d 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3.java
@@ -20,13 +20,13 @@
import java.util.Arrays;
import java.util.List;
-import ee.jakarta.tck.persistence.common.schema30.Customer;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
-import ee.jakarta.tck.persistence.common.schema30.UtilAliasData;
+import ee.jakarta.tck.persistence.common.schema30.Customer;
+import ee.jakarta.tck.persistence.common.schema30.UtilAliasData;
import jakarta.persistence.Query;
public class Client3 extends UtilAliasData {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4.java
index fb19293057..8d27cf38d0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4.java
@@ -26,10 +26,10 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Product;
import ee.jakarta.tck.persistence.common.schema30.SoftwareProduct;
import ee.jakarta.tck.persistence.common.schema30.UtilProductData;
-
import jakarta.persistence.Query;
public class Client4 extends UtilProductData {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5.java
index 1f3cfbd045..da664619e2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5.java
@@ -23,6 +23,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.UtilPhoneData;
public class Client5 extends UtilPhoneData {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6.java
index d0f50800b0..233fcef1b9 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6.java
@@ -25,6 +25,7 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.harness.SetupMethod;
+
import ee.jakarta.tck.persistence.common.schema30.Department;
import ee.jakarta.tck.persistence.common.schema30.UtilDepartmentEmployeeData;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1.java
index 065061180e..879a62e944 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1.java
@@ -27,8 +27,8 @@
import org.junit.jupiter.api.Test;
import com.sun.ts.lib.util.TestUtil;
-import ee.jakarta.tck.persistence.common.PMClientBase;
+import ee.jakarta.tck.persistence.common.PMClientBase;
import jakarta.persistence.Parameter;
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2.java
index 1fd4e92278..82dae4afb7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2.java
@@ -25,7 +25,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Query;
public class Client2 extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/datetime/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/datetime/Client.java
index c0c4362902..a0ccb565b3 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/datetime/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/datetime/Client.java
@@ -35,7 +35,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityTransaction;
import jakarta.persistence.Persistence;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/Client.java
index bebbe0e2f5..6741b43d30 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import ee.jakarta.tck.persistence.core.types.common.Grade;
import jakarta.persistence.Query;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1.java
index 5c1e86a55e..e0dbbd33d9 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import ee.jakarta.tck.persistence.core.types.common.Grade;
public class Client1 extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2.java
index c3b37caae0..27c187ce14 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import ee.jakarta.tck.persistence.core.types.common.Grade;
public class Client2 extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/Client.java
index 02475ca9d2..32f5e6c464 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/Client.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/Client.java
index 3d47ab6fd0..b7fc945065 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/Client.java
@@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java
index 1f1da676b0..fd69cb7998 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityGraph;
public class Client extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java
index 0c2e11e777..cb3bd803eb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java
@@ -30,7 +30,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.ParameterMode;
import jakarta.persistence.StoredProcedureQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java
index e50f0a7032..0e5aa7fe17 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/generators/sequencegenerators/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/repeatable/secondarytable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/repeatable/secondarytable/Client.java
index f6caccabf5..0745b8fb80 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/repeatable/secondarytable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/se/repeatable/secondarytable/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/inherit/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/inherit/Client.java
index d737f0aa84..5ca7051239 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/inherit/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/inherit/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/all/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/all/Client.java
index 24d18f2c37..7579a4dd78 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/all/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/all/Client.java
@@ -30,7 +30,6 @@
import ee.jakarta.tck.persistence.common.DriverManagerConnection;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.CacheStoreMode;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/disableselective/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/disableselective/Client.java
index e143f3e899..04fa6ee08e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/disableselective/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/disableselective/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/enableselective/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/enableselective/Client.java
index 79afe519b3..fbb0dd72f3 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/enableselective/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/enableselective/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/none/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/none/Client.java
index 53f395e5e5..b1da8c80e5 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/none/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/cache/xml/none/Client.java
@@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.Cache;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManager/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManager/Client.java
index e562f9f70a..7382387360 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManager/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManager/Client.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.Parameter;
@@ -3691,7 +3690,7 @@ public void typedQueryMethodsAfterClose16Test() throws Exception {
CriteriaQuery cquery = cbuilder.createQuery(A.class);
Root a = cquery.from(A.class);
cquery.select(a);
- ParameterExpression param1 = cbuilder.parameter(Integer.class, "idParam");
+ ParameterExpression param1 = cbuilder.parameter(String.class, "idParam");
cquery.where(cbuilder.equal(a.get("id"), param1));
TypedQuery tquery = getEntityManager().createQuery(cquery);
getEntityManager().close();
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client1.java
index efc804a195..46811d570e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client1.java
@@ -25,11 +25,7 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
-import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Persistence;
-import jakarta.persistence.PersistenceException;
public class Client1 extends PMClientBase {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client2.java
index e5a682d38a..f8fd6ba4bc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/entityManagerFactory/Client2.java
@@ -22,10 +22,10 @@
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
@@ -106,6 +106,7 @@ public void createEntityManagerFactoryNoBeanValidatorTest() throws Exception {
*
* @test_Strategy: Create an EntityManagerFactory via String,Map
*/
+ @Disabled
@Test
public void createEntityManagerFactoryStringMapTest() throws Exception {
boolean pass = false;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/Client.java
index 7e78f54930..c57e555b2a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/Client.java
@@ -39,7 +39,6 @@
import ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl;
import ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor;
import ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.SharedCacheMode;
import jakarta.persistence.ValidationMode;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client1.java
index af2bb498b9..fc26ff3749 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client1.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.EntityTransaction;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client2.java
index 467391ae1e..26f83290ff 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/resource_local/Client2.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.EntityTransaction;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/discriminatorColumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/discriminatorColumn/Client.java
index 52259ce935..b4eeea9d44 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/discriminatorColumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/discriminatorColumn/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/enumerated/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/enumerated/Client.java
index 534d357817..89a3645cdc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/enumerated/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/enumerated/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/id/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/id/Client.java
index 5740d5d588..3d5f804769 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/id/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/id/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/index/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/index/Client.java
index 84a23130f1..5204ae0233 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/index/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/index/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/joinTable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/joinTable/Client.java
index 8420c538db..90565f0d36 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/joinTable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/joinTable/Client.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/orderColumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/orderColumn/Client.java
index d86b7eb593..65801e3868 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/orderColumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/orderColumn/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.TypedQuery;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/secondaryTable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/secondaryTable/Client.java
index 5db399ff96..d7f04eb46f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/secondaryTable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/secondaryTable/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java
index 1921954466..76938de1f2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/sequenceGenerator/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/table/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/table/Client.java
index b60cf43293..bf35eaf8ca 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/table/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/table/Client.java
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/tableGenerator/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/tableGenerator/Client.java
index bbf809b3de..1b92a4b5e7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/tableGenerator/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/tableGenerator/Client.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/temporal/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/temporal/Client.java
index 302300b993..b5bd9dfbfa 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/temporal/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/temporal/Client.java
@@ -29,7 +29,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/uniqueConstraint/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/uniqueConstraint/Client.java
index 2fd9d2f555..90c9431040 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/uniqueConstraint/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/uniqueConstraint/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/version/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/version/Client.java
index 83ef79f019..993ded6714 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/version/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/annotations/version/Client.java
@@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/scripts/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/scripts/Client.java
index 78726ae0f7..39f557797a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/scripts/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/se/schemaGeneration/scripts/Client.java
@@ -37,7 +37,6 @@
import org.junit.jupiter.api.Test;
import ee.jakarta.tck.persistence.common.PMClientBase;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;