upgrade and eclipse work

nyko03 · Jun 20, 2015 · 9e5faf2 · 9e5faf2
1 parent 350330b
commit 9e5faf2
Show file tree

Hide file tree

Showing 99 changed files with 703 additions and 702 deletions.
diff --git a/core-java-8/pom.xml b/core-java-8/pom.xml
@@ -93,23 +93,23 @@
 
 	<properties>
 		<!-- logging -->
-		<org.slf4j.version>1.7.5</org.slf4j.version>
-		<logback.version>1.0.11</logback.version>
+		<org.slf4j.version>1.7.12</org.slf4j.version>
+		<logback.version>1.0.13</logback.version>
 
 		<!-- various -->
 		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 
 		<!-- util -->
 		<guava.version>18.0</guava.version>
-		<commons-lang3.version>3.3.2</commons-lang3.version>
+		<commons-lang3.version>3.4</commons-lang3.version>
 
 		<!-- testing -->
 		<org.hamcrest.version>1.3</org.hamcrest.version>
 		<junit.version>4.12</junit.version>
 		<mockito.version>1.10.19</mockito.version>
 
 		<!-- maven plugins -->
-		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
 		<maven-resources-plugin.version>2.7</maven-resources-plugin.version>

diff --git a/core-java/.classpath b/core-java/.classpath
@@ -21,14 +21,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

diff --git a/core-java/.settings/org.eclipse.jdt.core.prefs b/core-java/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/core-java/pom.xml b/core-java/pom.xml
@@ -123,8 +123,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 
@@ -149,39 +149,39 @@
 		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.3.8.Final</hibernate.version>
-		<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
+		<hibernate.version>4.3.10.Final</hibernate.version>
+		<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
 
 		<!-- marshalling -->
 		<jackson.version>2.4.4</jackson.version>
 
 		<!-- logging -->
-		<org.slf4j.version>1.7.9</org.slf4j.version>
-		<logback.version>1.1.2</logback.version>
+		<org.slf4j.version>1.7.12</org.slf4j.version>
+		<logback.version>1.1.3</logback.version>
 
 		<!-- various -->
 		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 
 		<!-- util -->
-		<guava.version>17.0</guava.version> <!-- upgrade to 18.0 -->
-		<commons-lang3.version>3.3.2</commons-lang3.version>
+		<guava.version>18.0</guava.version>
+		<commons-lang3.version>3.4</commons-lang3.version>
 
 		<!-- testing -->
 		<org.hamcrest.version>1.3</org.hamcrest.version>
 		<junit.version>4.11</junit.version>
 		<mockito.version>1.10.19</mockito.version>
 
-		<httpcore.version>4.4</httpcore.version>
-		<httpclient.version>4.4</httpclient.version>
+		<httpcore.version>4.4.1</httpcore.version>
+		<httpclient.version>4.5</httpclient.version>
 
-		<rest-assured.version>2.4.0</rest-assured.version>
+		<rest-assured.version>2.4.1</rest-assured.version>
 
 		<!-- maven plugins -->
-		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.18.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.14</cargo-maven2-plugin.version>
 
 	</properties>
 

diff --git a/gson/.classpath b/gson/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/gson/pom.xml b/gson/pom.xml
@@ -97,8 +97,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 
@@ -118,39 +118,39 @@
 		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.3.8.Final</hibernate.version>
-		<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
+		<hibernate.version>4.3.10.Final</hibernate.version>
+		<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
 
 		<!-- marshalling -->
 		<gson.version>2.3</gson.version>
 
 		<!-- logging -->
-		<org.slf4j.version>1.7.9</org.slf4j.version>
-		<logback.version>1.1.2</logback.version>
+		<org.slf4j.version>1.7.12</org.slf4j.version>
+		<logback.version>1.1.3</logback.version>
 
 		<!-- various -->
 		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 
 		<!-- util -->
 		<guava.version>18.0</guava.version>
-		<commons-lang3.version>3.3.2</commons-lang3.version>
+		<commons-lang3.version>3.4</commons-lang3.version>
 
 		<!-- testing -->
 		<org.hamcrest.version>1.3</org.hamcrest.version>
 		<junit.version>4.11</junit.version>
 		<mockito.version>1.10.19</mockito.version>
 
-		<httpcore.version>4.4</httpcore.version>
-		<httpclient.version>4.4</httpclient.version>
+		<httpcore.version>4.4.1</httpcore.version>
+		<httpclient.version>4.5</httpclient.version>
 
-		<rest-assured.version>2.4.0</rest-assured.version>
+		<rest-assured.version>2.4.1</rest-assured.version>
 
 		<!-- maven plugins -->
-		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.18.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.14</cargo-maven2-plugin.version>
 
 	</properties>
 

diff --git a/guava/.classpath b/guava/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/guava/.settings/org.eclipse.jdt.core.prefs b/guava/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/guava/pom.xml b/guava/pom.xml
@@ -77,8 +77,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
 
@@ -98,36 +98,36 @@
         <org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.3.8.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.34</mysql-connector-java.version>
+        <hibernate.version>4.3.10.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
 
         <!-- logging -->
-        <org.slf4j.version>1.7.9</org.slf4j.version>
-        <logback.version>1.1.2</logback.version>
+        <org.slf4j.version>1.7.12</org.slf4j.version>
+        <logback.version>1.1.3</logback.version>
 
         <!-- various -->
         <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>18.0</guava.version>
-        <commons-lang3.version>3.3.2</commons-lang3.version>
+        <commons-lang3.version>3.4</commons-lang3.version>
 
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.11</junit.version>
         <mockito.version>1.10.19</mockito.version>
 
-        <httpcore.version>4.4</httpcore.version>
-        <httpclient.version>4.4</httpclient.version>
+        <httpcore.version>4.4.1</httpcore.version>
+        <httpclient.version>4.5</httpclient.version>
 
-        <rest-assured.version>2.4.0</rest-assured.version>
+        <rest-assured.version>2.4.1</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.18.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.14</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/handling-spring-static-resources/pom.xml b/handling-spring-static-resources/pom.xml
@@ -184,40 +184,40 @@
 		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.3.8.Final</hibernate.version>
-		<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
-		<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
+		<hibernate.version>4.3.10.Final</hibernate.version>
+		<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+		<spring-data-jpa.version>1.7.2.RELEASE</spring-data-jpa.version>
 
 		<!-- marshalling -->
 
 		<jackson.version>2.4.4</jackson.version>
 
 		<!-- logging -->
-		<org.slf4j.version>1.7.9</org.slf4j.version>
-		<logback.version>1.1.2</logback.version>
+		<org.slf4j.version>1.7.12</org.slf4j.version>
+		<logback.version>1.1.3</logback.version>
 
 		<!-- various -->
 		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 
 		<!-- util -->
 		<guava.version>18.0</guava.version>
-		<commons-lang3.version>3.3.2</commons-lang3.version>
+		<commons-lang3.version>3.4</commons-lang3.version>
 
 		<!-- testing -->
 		<org.hamcrest.version>1.3</org.hamcrest.version>
 		<junit.version>4.11</junit.version>
 		<mockito.version>1.10.19</mockito.version>
 
-		<httpcore.version>4.4</httpcore.version>
-		<httpclient.version>4.4</httpclient.version>
+		<httpcore.version>4.4.1</httpcore.version>
+		<httpclient.version>4.5</httpclient.version>
 
-		<rest-assured.version>2.4.0</rest-assured.version>
+		<rest-assured.version>2.4.1</rest-assured.version>
 
 		<!-- Maven plugins -->
-		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
-		<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
+		<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
 	</properties>
 
 </project>
diff --git a/httpclient/.classpath b/httpclient/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/httpclient/.settings/org.eclipse.jdt.core.prefs b/httpclient/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8