From a2b327cc9d6de0640e5147e9bde3648fabf550c1 Mon Sep 17 00:00:00 2001
From: Jesus Boadas <jboadas@gmail.com>
Date: Sun, 30 Apr 2017 13:26:23 -0400
Subject: [PATCH] Move JDO from core-java to libraries (#1758)

---
 core-java/pom.xml                             | 54 -------------------
 {core-java => libraries}/log4j.properties     |  0
 libraries/pom.xml                             | 53 +++++++++++++++++-
 .../java/com/baeldung/jdo/GuideToJDO.java     |  0
 .../main/java/com/baeldung/jdo/Product.java   |  0
 .../jdo/GuideToJDOIntegrationTest.java        |  0
 6 files changed, 52 insertions(+), 55 deletions(-)
 rename {core-java => libraries}/log4j.properties (100%)
 rename {core-java => libraries}/src/main/java/com/baeldung/jdo/GuideToJDO.java (100%)
 rename {core-java => libraries}/src/main/java/com/baeldung/jdo/Product.java (100%)
 rename {core-java => libraries}/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java (100%)

diff --git a/core-java/pom.xml b/core-java/pom.xml
index 4ee3efb297..67126d3dbf 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -177,37 +177,6 @@
 				</exclusion>
 			</exclusions>        
 		</dependency>               
-		<!-- JDO -->
-		<dependency>
-		    <groupId>org.datanucleus</groupId>
-		    <artifactId>javax.jdo</artifactId>
-		    <version>3.2.0-m6</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.datanucleus</groupId>
-		    <artifactId>datanucleus-core</artifactId>
-		    <version>5.1.0-m1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.datanucleus</groupId>
-		    <artifactId>datanucleus-api-jdo</artifactId>
-		    <version>5.1.0-m1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.datanucleus</groupId>
-		    <artifactId>datanucleus-rdbms</artifactId>
-		    <version>5.1.0-m1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.datanucleus</groupId>
-		    <artifactId>datanucleus-maven-plugin</artifactId>
-		    <version>5.0.2</version>
-		</dependency>		
-		<dependency>
-		    <groupId>com.h2database</groupId>
-		    <artifactId>h2</artifactId>
-		    <version>1.4.194</version>
-		</dependency>
 
 		<dependency>
 		    <groupId>org.owasp.esapi</groupId>
@@ -358,29 +327,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!-- JDO Plugin -->
-
-			<plugin>
-                <groupId>org.datanucleus</groupId>
-    			<artifactId>datanucleus-maven-plugin</artifactId>
-    			<version>5.0.2</version>
-                <configuration>
-                    <api>JDO</api>
-                    <props>${basedir}/datanucleus.properties</props>
-                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                    <verbose>true</verbose>
-                </configuration>
-				<executions>
-                	<execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
 
     </build>
diff --git a/core-java/log4j.properties b/libraries/log4j.properties
similarity index 100%
rename from core-java/log4j.properties
rename to libraries/log4j.properties
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 021e081eb5..e329eac44d 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -59,6 +59,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- JDO Plugin -->
+			<plugin>
+                <groupId>org.datanucleus</groupId>
+    			<artifactId>datanucleus-maven-plugin</artifactId>
+    			<version>5.0.2</version>
+                <configuration>
+                    <api>JDO</api>
+                    <props>${basedir}/datanucleus.properties</props>
+                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                    <verbose>true</verbose>
+                </configuration>
+				<executions>
+                	<execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -200,6 +220,37 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+		<!-- JDO -->
+		<dependency>
+		    <groupId>org.datanucleus</groupId>
+		    <artifactId>javax.jdo</artifactId>
+		    <version>3.2.0-m6</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.datanucleus</groupId>
+		    <artifactId>datanucleus-core</artifactId>
+		    <version>5.1.0-m1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.datanucleus</groupId>
+		    <artifactId>datanucleus-api-jdo</artifactId>
+		    <version>5.1.0-m1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.datanucleus</groupId>
+		    <artifactId>datanucleus-rdbms</artifactId>
+		    <version>5.1.0-m1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.datanucleus</groupId>
+		    <artifactId>datanucleus-maven-plugin</artifactId>
+		    <version>5.0.2</version>
+		</dependency>		
+		<dependency>
+		    <groupId>com.h2database</groupId>
+		    <artifactId>h2</artifactId>
+		    <version>1.4.194</version>
+		</dependency>
     </dependencies>
 
     <properties>
@@ -227,4 +278,4 @@
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/core-java/src/main/java/com/baeldung/jdo/GuideToJDO.java b/libraries/src/main/java/com/baeldung/jdo/GuideToJDO.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdo/GuideToJDO.java
rename to libraries/src/main/java/com/baeldung/jdo/GuideToJDO.java
diff --git a/core-java/src/main/java/com/baeldung/jdo/Product.java b/libraries/src/main/java/com/baeldung/jdo/Product.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdo/Product.java
rename to libraries/src/main/java/com/baeldung/jdo/Product.java
diff --git a/core-java/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java b/libraries/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java
rename to libraries/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java