maven work

nyko03 · Mar 6, 2016 · a2989da · a2989da
1 parent 0708c51
commit a2989da
Show file tree

Hide file tree

Showing 48 changed files with 170 additions and 167 deletions.
diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml
@@ -143,8 +143,8 @@
 
 	<properties>
 		<!-- persistence -->
-		<hibernate.version>4.3.8.Final</hibernate.version>
-		<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
+		<hibernate.version>4.3.11.Final</hibernate.version>
+		<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
 		<!-- marshalling -->
 		<jackson.version>2.7.2</jackson.version>
@@ -157,7 +157,7 @@
 		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 
 		<!-- util -->
-		<guava.version>17.0</guava.version> <!-- upgrade to 18.0 -->
+		<guava.version>19.0</guava.version>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
 
 		<!-- testing -->
@@ -168,14 +168,14 @@
 		<httpcore.version>4.4</httpcore.version>
 		<httpclient.version>4.4</httpclient.version>
 
-		<rest-assured.version>2.4.0</rest-assured.version>
+		<rest-assured.version>2.9.0</rest-assured.version>
 
 		<!-- maven plugins -->
-		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 		<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-		<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
+		<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
 	</properties>
 

diff --git a/core-java-8/pom.xml b/core-java-8/pom.xml
@@ -114,7 +114,7 @@
         <mockito.version>1.10.19</mockito.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>

diff --git a/core-java/pom.xml b/core-java/pom.xml
@@ -144,8 +144,8 @@
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
         <!-- marshalling -->
         <jackson.version>2.7.2</jackson.version>
@@ -169,14 +169,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/gson/pom.xml b/gson/pom.xml
@@ -113,8 +113,8 @@
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
         <!-- marshalling -->
         <gson.version>2.3</gson.version>
@@ -138,14 +138,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/guava/pom.xml b/guava/pom.xml
@@ -94,8 +94,8 @@
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.13</org.slf4j.version>
@@ -116,14 +116,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/handling-spring-static-resources/pom.xml b/handling-spring-static-resources/pom.xml
@@ -184,7 +184,7 @@
 
         <!-- persistence -->
         <hibernate.version>4.3.11.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.37</mysql-connector-java.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
         <spring-data-jpa.version>1.9.2.RELEASE</spring-data-jpa.version>
 
         <!-- marshalling -->
@@ -210,13 +210,13 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- Maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
     </properties>
 
 </project>
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
@@ -149,8 +149,8 @@
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.13</org.slf4j.version>
@@ -171,14 +171,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version> <!-- 4.3.6 --> <!-- 4.4-beta1 -->
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/jackson/pom.xml b/jackson/pom.xml
@@ -132,8 +132,8 @@
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
         <!-- marshalling -->
         <jackson.version>2.7.2</jackson.version>
@@ -157,14 +157,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/persistence-jpa/.classpath → jpa-storedprocedure/.classpath b/persistence-jpa/.classpath → jpa-storedprocedure/.classpath
diff --git a/persistence-jpa/.project → jpa-storedprocedure/.project b/persistence-jpa/.project → jpa-storedprocedure/.project
diff --git a/persistence-jpa/pom.xml → jpa-storedprocedure/pom.xml b/persistence-jpa/pom.xml → jpa-storedprocedure/pom.xml
@@ -7,35 +7,6 @@
     <version>1.0</version>
     <packaging>jar</packaging>
 
-    <properties>
-        <jee.version>7.0</jee.version>
-        <oracle.version>11.2.0.4</oracle.version>
-        <hibernate.version>5.1.0.Final</hibernate.version>
-    </properties>
-
-    <build>
-        <finalName>JpaStoredProcedure</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <!--archive> <manifest> <mainClass>fully.qualified.MainClass</mainClass> </manifest> </archive -->
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
 
         <!-- core library -->
@@ -91,4 +62,34 @@
 
     </dependencies>
 
+    <build>
+        <finalName>jpa-storedprocedure</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <!--archive> <manifest> <mainClass>fully.qualified.MainClass</mainClass> </manifest> </archive -->
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <jee.version>7.0</jee.version>
+        <oracle.version>11.2.0.4</oracle.version>
+        <hibernate.version>5.1.0.Final</hibernate.version>
+    </properties>
+
+
 </project>
diff --git a/...main/java/com/baeldung/jpa/model/Car.java → ...main/java/com/baeldung/jpa/model/Car.java b/...main/java/com/baeldung/jpa/model/Car.java → ...main/java/com/baeldung/jpa/model/Car.java
diff --git a/...om/baeldung/jpa/model/QueryParameter.java → ...om/baeldung/jpa/model/QueryParameter.java b/...om/baeldung/jpa/model/QueryParameter.java → ...om/baeldung/jpa/model/QueryParameter.java
diff --git a/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml b/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml
diff --git a/.../database/FindCarByYearProcedureMySQL.sql → .../database/FindCarByYearProcedureMySQL.sql b/.../database/FindCarByYearProcedureMySQL.sql → .../database/FindCarByYearProcedureMySQL.sql
diff --git a/...database/FindCarByYearProcedureOracle.sql → ...database/FindCarByYearProcedureOracle.sql b/...database/FindCarByYearProcedureOracle.sql → ...database/FindCarByYearProcedureOracle.sql
diff --git a/...urces/config/database/create_database.sql → ...urces/config/database/create_database.sql b/...urces/config/database/create_database.sql → ...urces/config/database/create_database.sql
diff --git a/...es/config/database/create_table_mysql.sql → ...es/config/database/create_table_mysql.sql b/...es/config/database/create_table_mysql.sql → ...es/config/database/create_table_mysql.sql
diff --git a/...resources/config/database/insert_cars.sql → ...resources/config/database/insert_cars.sql b/...resources/config/database/insert_cars.sql → ...resources/config/database/insert_cars.sql
diff --git a/.../storedprocedure/StoredProcedureTest.java → .../storedprocedure/StoredProcedureTest.java b/.../storedprocedure/StoredProcedureTest.java → .../storedprocedure/StoredProcedureTest.java
diff --git a/...ce-jpa/src/test/resources/persistence.xml → ...cedure/src/test/resources/persistence.xml b/...ce-jpa/src/test/resources/persistence.xml → ...cedure/src/test/resources/persistence.xml
diff --git a/mockito/pom.xml b/mockito/pom.xml
@@ -88,8 +88,8 @@
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.13</org.slf4j.version>
@@ -110,14 +110,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <module>javaxval</module>
         <module>json-path</module>
         <module>mockito</module>
-        <!-- <module>persistence-jpa</module> -->
+        <!-- <module>jpa-storedprocedure</module> -->
         <module>querydsl</module>
         <!-- <module>raml</module> -->
         <module>rest-testing</module>
@@ -49,7 +49,7 @@
         <module>spring-openid</module>
         <module>spring-quartz</module>
         <module>spring-rest</module>
-        
+
         <module>spring-security-basic-auth</module>
         <module>spring-security-mvc-custom</module>
         <module>spring-security-mvc-digest-auth</module>
@@ -64,7 +64,7 @@
         <module>spring-security-rest-full</module>
         <module>spring-thymeleaf</module>
         <module>spring-zuul</module>
-        
+
     </modules>
 
 </project>
diff --git a/querydsl/pom.xml b/querydsl/pom.xml
@@ -17,7 +17,7 @@
         <java.version>1.6</java.version>
         <junit.version>4.10</junit.version>
         <spring.version>3.1.0.RELEASE</spring.version>
-        <hibernate.version>4.1.1.Final</hibernate.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
         <querydsl.version>2.5.0</querydsl.version>
         <slf4j.version>1.5.10</slf4j.version>
     </properties>
@@ -184,4 +184,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml
@@ -159,14 +159,14 @@
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.1</rest-assured.version>
+        <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
     </properties>