diff --git a/pom.xml b/pom.xml
index b1d77baee..5d84d548d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
7.0.0-SNAPSHOT
2.7.4
2.3.232
- 3.1.0
+ 3.2.0
5.2
9.2.0
42.7.5
@@ -111,6 +111,44 @@
+
+ all-dbs
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ mysql-test
+ test
+
+ test
+
+
+
+ **/MySql*IntegrationTests.java
+
+
+
+
+ postgres-test
+ test
+
+ test
+
+
+
+ **/Postgres*IntegrationTests.java
+
+
+
+
+
+
+
+
+
eclipselink-next
@@ -151,6 +189,84 @@
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ org.springframework
+ spring-instrument
+ ${spring}
+ runtime
+
+
+
+
+
+ default-test
+
+
+ **/*
+
+
+
+
+ unit-test
+
+ test
+
+ test
+
+
+ **/*UnitTests.java
+
+
+
+
+ integration-test
+
+ test
+
+ test
+
+
+ **/*IntegrationTests.java
+ **/*Tests.java
+
+
+ **/*UnitTests.java
+ **/EclipseLink*
+ **/MySql*
+ **/Postgres*
+
+
+ -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
+
+
+
+
+ eclipselink-test
+
+ test
+
+ test
+
+
+ **/EclipseLink*Tests.java
+
+
+ -javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
+ -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
+
+
+
+
+
+
+
+
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/util/TestMetaModel.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/util/TestMetaModel.java
index a755ba222..822365b65 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/util/TestMetaModel.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/util/TestMetaModel.java
@@ -43,13 +43,13 @@ public class TestMetaModel implements Metamodel {
private final Set> managedTypes;
private final Lazy entityManagerFactory = Lazy.of(this::init);
private final Lazy metamodel = Lazy.of(() -> entityManagerFactory.get().getMetamodel());
- private Lazy enityManager = Lazy.of(() -> entityManagerFactory.get().createEntityManager());
+ private final Lazy entityManager = Lazy.of(() -> entityManagerFactory.get().createEntityManager());
- TestMetaModel(Set> managedTypes) {
+ private TestMetaModel(Set> managedTypes) {
this("dynamic-tests", managedTypes);
}
- TestMetaModel(String persistenceUnit, Set> managedTypes) {
+ private TestMetaModel(String persistenceUnit, Set> managedTypes) {
this.persistenceUnit = persistenceUnit;
this.managedTypes = managedTypes;
}
@@ -66,6 +66,11 @@ public class TestMetaModel implements Metamodel {
return metamodel.get().entity(cls);
}
+ @Override
+ public EntityType entity(String s) {
+ return metamodel.get().entity(s);
+ }
+
public ManagedType managedType(Class cls) {
return metamodel.get().managedType(cls);
}
@@ -87,7 +92,7 @@ public class TestMetaModel implements Metamodel {
}
public EntityManager entityManager() {
- return enityManager.get();
+ return entityManager.get();
}
EntityManagerFactory init() {