Merge pull request #4775 from Doha2012/master

move jmapper to libraries-data
2018-07-21 16:54:03 +03:00 · 2018-07-21 16:54:03 +03:00 · 9ea86dd191
commit 9ea86dd191
parent ac801b4319 ca170308ee
13 changed files with 8 additions and 7 deletions
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@ -141,6 +141,13 @@
            <artifactId>hazelcast</artifactId>
            <version>${hazelcast.version}</version>
        </dependency>
+        
+        <dependency>
+            <groupId>com.googlecode.jmapper-framework</groupId>
+            <artifactId>jmapper-core</artifactId>
+            <version>${jmapper.version}</version>
+        </dependency>
+                
    </dependencies>

    <build>
@ -275,6 +282,7 @@
        <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
        <datanucleus-xml.version>5.0.0-release</datanucleus-xml.version>
        <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
+        <jmapper.version>1.6.0.1</jmapper.version>        
    </properties>

 </project>
--- a/libraries-data/src/main/java/com/baeldung/jmapper/User.java
+++ b/libraries-data/src/main/java/com/baeldung/jmapper/User.java
--- a/libraries-data/src/main/java/com/baeldung/jmapper/UserDto.java
+++ b/libraries-data/src/main/java/com/baeldung/jmapper/UserDto.java
--- a/libraries-data/src/main/java/com/baeldung/jmapper/UserDto1.java
+++ b/libraries-data/src/main/java/com/baeldung/jmapper/UserDto1.java
--- a/libraries-data/src/main/java/com/baeldung/jmapper/relational/User.java
+++ b/libraries-data/src/main/java/com/baeldung/jmapper/relational/User.java
--- a/libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto1.java
+++ b/libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto1.java
--- a/libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto2.java
+++ b/libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto2.java
--- a/libraries-data/src/main/resources/user_jmapper.xml
+++ b/libraries-data/src/main/resources/user_jmapper.xml
--- a/libraries-data/src/main/resources/user_jmapper1.xml
+++ b/libraries-data/src/main/resources/user_jmapper1.xml
--- a/libraries-data/src/main/resources/user_jmapper2.xml
+++ b/libraries-data/src/main/resources/user_jmapper2.xml
--- a/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
+++ b/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
--- a/libraries-data/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
+++ b/libraries-data/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@ -772,12 +772,6 @@
            <scope>test</scope>
        </dependency>

-        <dependency>
-            <groupId>com.googlecode.jmapper-framework</groupId>
-            <artifactId>jmapper-core</artifactId>
-            <version>${jmapper.version}</version>
-        </dependency>
-
    </dependencies>

    <repositories>
@ -1021,7 +1015,6 @@
        <jersey.version>1.19.4</jersey.version>
        <javalin.version>1.6.0</javalin.version>
        <fugue.version>4.5.1</fugue.version>
-        <jmapper.version>1.6.0.1</jmapper.version>
        <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
    </properties>