Fix up the build for maven 3.8.2 (#1272)

avoid cleaning up the target build by subsequent builds. Follow one pom per dir rule to avoid it Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Sep 3, 2021 · 6d3b8a1 · 6d3b8a1
1 parent f514879
commit 6d3b8a1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/jpa/eclipselink.jaxrs.test/pom.xml b/jpa/eclipselink.jaxrs.test/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.test.server.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../../pom_test_server.xml</relativePath>
+        <relativePath>../../testing/server/pom.xml</relativePath>
     </parent>
 
     <properties>

diff --git a/jpa/eclipselink.jpa.nosql.test/pom.xml b/jpa/eclipselink.jpa.nosql.test/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.test.server.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../../pom_test_server.xml</relativePath>
+        <relativePath>../../testing/server/pom.xml</relativePath>
     </parent>
 
     <properties>

diff --git a/jpa/eclipselink.jpa.test/pom.xml b/jpa/eclipselink.jpa.test/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.test.server.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../../pom_test_server.xml</relativePath>
+        <relativePath>../../testing/server/pom.xml</relativePath>
     </parent>
 
     <properties>

diff --git a/...st/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFind.java b/...st/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFind.java
@@ -92,7 +92,7 @@ public void testPositivNonTx() {
     public void testNegativ() {
         final EntityManager em = getEnvironment().getEntityManager();
         try {
-            Object result = em.find(Employee.class, Integer.valueOf(17 + 4));
+            Object result = em.find(Employee.class, Integer.valueOf(17 + 12345));
             verify(result == null, "found something");
         } finally {
             closeEntityManager(em);

diff --git a/jpa/eclipselink.jpars.test/pom.xml b/jpa/eclipselink.jpars.test/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.test.server.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../../pom_test_server.xml</relativePath>
+        <relativePath>../../testing/server/pom.xml</relativePath>
     </parent>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -273,6 +273,11 @@
     <dependencyManagement>
         <dependencies>
             <!-- our artifacts TODO: this belongs to BOM pom-->
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>org.eclipse.persistence.parent</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.persistence</groupId>
                 <artifactId>org.eclipse.persistence.asm</artifactId>
@@ -1811,8 +1816,8 @@
             </activation>
             <modules>
                 <!--Helper parent pom for server side test modules-->
-                <module>pom_test_server.xml</module>
-                <module>pom_oracle_test_server.xml</module>
+                <module>testing/server</module>
+                <module>testing/server-oracle</module>
                 <module>foundation/org.eclipse.persistence.core.test.framework</module>
                 <module>foundation/eclipselink.core.test</module>
                 <module>jpa/org.eclipse.persistence.jpa.test.framework</module>

diff --git a/sdo/eclipselink.sdo.test.server/pom.xml b/sdo/eclipselink.sdo.test.server/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.test.server.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../../pom_test_server.xml</relativePath>
+        <relativePath>../../testing/server/pom.xml</relativePath>
     </parent>
 
     <properties>

diff --git a/pom_oracle_test_server.xml → testing/server-oracle/pom.xml b/pom_oracle_test_server.xml → testing/server-oracle/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <build>

diff --git a/pom_test_server.xml → testing/server/pom.xml b/pom_test_server.xml → testing/server/pom.xml
@@ -27,7 +27,7 @@
         <artifactId>org.eclipse.persistence.parent</artifactId>
         <groupId>org.eclipse.persistence</groupId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <build>

diff --git a/utils/eclipselink.dbws.builder.test.oracle.server/pom.xml b/utils/eclipselink.dbws.builder.test.oracle.server/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.oracle.test.server.parent</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../../pom_oracle_test_server.xml</relativePath>
+        <relativePath>../../testing/server-oracle/pom.xml</relativePath>
     </parent>
 
     <properties>