cleanup work and maven upgrades

eugenp · Jan 2, 2014 · db00726 · db00726
1 parent a18ed4b
commit db00726
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 56 deletions.
diff --git a/common-client/pom.xml b/common-client/pom.xml
@@ -230,18 +230,13 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>${groovy.version}</version>
-		</dependency>
 
 		<!-- aws -->
 
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk</artifactId>
-			<version>1.4.0</version>
+			<version>1.6.10</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>commons-logging</artifactId>

diff --git a/common/eclipse/CURRENT.launch b/common/eclipse/CURRENT.launch
@@ -6,9 +6,10 @@
 <booleanAttribute key="M2_OFFLINE" value="false"/>
 <stringAttribute key="M2_PROFILES" value=""/>
 <listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<stringAttribute key="M2_RUNTIME" value="C:\opt\maven\apache-maven-3.1.1"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.m2e.launching.MavenSourceLocator"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;true&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>

diff --git a/common/pom.xml b/common/pom.xml
@@ -210,15 +210,19 @@
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>${hibernate.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream-hibernate</artifactId>
+			<version>${xstream.version}</version>
+		</dependency>
 
 		<!-- proxying -->
 
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>${cglib.version}</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -332,11 +336,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>${groovy.version}</version>
-		</dependency>
 
 	</dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -59,62 +59,60 @@
 	<properties>
 
 		<!-- Spring related -->
-		<spring.version>3.2.3.RELEASE</spring.version>
-		<spring-security.version>3.2.0.M1</spring-security.version> <!-- 3.2.0.M1 -->
-		<javassist.version>3.17.1-GA</javassist.version>
-		<cglib.version>2.2.2</cglib.version>
-		<aspectjweaver.version>1.7.1</aspectjweaver.version>
+		<spring.version>4.0.0.RELEASE</spring.version>
+		<spring-security.version>3.2.0.RELEASE</spring-security.version> <!--  -->
+		<javassist.version>3.18.1-GA</javassist.version>
+		<aspectjweaver.version>1.7.4</aspectjweaver.version>
 
 		<!-- web -->
 		<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
 
 		<!-- marshalling -->
-		<jackson.version>2.2.2</jackson.version>
-		<jaxb-api.version>2.2.7</jaxb-api.version>
-		<xstream.version>1.4.4</xstream.version>
+		<jackson.version>2.2.3</jackson.version>
+		<jaxb-api.version>2.2.11</jaxb-api.version>
+		<xstream.version>1.4.6</xstream.version>
 
 		<!-- commons and utils -->
 		<commons-lang3.version>3.2-SNAPSHOT</commons-lang3.version>
-		<guava.version>14.0.1</guava.version>
+		<guava.version>16.0-rc1</guava.version>
 
 		<!-- UNSORTED -->
-		<commons-codec.version>1.7</commons-codec.version>
+		<commons-codec.version>1.9</commons-codec.version>
 
 		<!-- persistence -->
-		<mysql-connector-java.version>5.1.25</mysql-connector-java.version> <!-- latest version on: 03.19.2013 - http://dev.mysql.com/downloads/connector/j/ -->
-		<hibernate.version>4.2.2.Final</hibernate.version>
-		<hibernate-jpamodelgen.version>1.2.0.Final</hibernate-jpamodelgen.version>
+		<mysql-connector-java.version>5.1.28</mysql-connector-java.version> <!-- latest version on: 02.01.2014 - http://dev.mysql.com/downloads/connector/j/ -->
+		<hibernate.version>4.3.0.Final</hibernate.version>
+		<hibernate-jpamodelgen.version>4.3.0.Final</hibernate-jpamodelgen.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
-		<querydsl.version>2.9.0</querydsl.version>
-		<spring-data-jpa.version>1.3.2.RELEASE</spring-data-jpa.version>
+		<querydsl.version>3.3.0</querydsl.version>
+		<spring-data-jpa.version>1.4.3.RELEASE</spring-data-jpa.version>
 
-		<h2.version>1.3.170</h2.version>
-		<hsqldb.version>2.2.9</hsqldb.version>
+		<h2.version>1.3.174</h2.version>
+		<hsqldb.version>2.3.1</hsqldb.version>
 
-		<validation-api.version>1.0.0.GA</validation-api.version>
-		<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
+		<validation-api.version>1.1.0.Final</validation-api.version>
+		<hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.3</org.slf4j.version>
-		<logback.version>1.0.10</logback.version>
+		<logback.version>1.0.11</logback.version>
 
 		<!-- testing -->
 		<org.hamcrest.version>1.3</org.hamcrest.version>
 		<junit.version>4.11</junit.version>
 		<mockito.version>1.9.5</mockito.version>
 
-		<httpcore.version>4.2.4</httpcore.version>
-		<httpclient.version>4.2.5</httpclient.version>
+		<httpcore.version>4.3.1</httpcore.version>
+		<httpclient.version>4.3.1</httpclient.version>
 
-		<rest-assured.version>1.8.0</rest-assured.version>
-		<groovy.version>1.8.9</groovy.version>
+		<rest-assured.version>2.1.0</rest-assured.version>
 
 		<!-- maven plugins -->
-		<maven-surefire-plugin.version>2.14.1</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
 		<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
-		<jrebel-maven-plugin.version>1.1.3</jrebel-maven-plugin.version>
-		<cargo-maven2-plugin.version>1.4.2</cargo-maven2-plugin.version>
+		<jrebel-maven-plugin.version>1.1.5</jrebel-maven-plugin.version>
+		<cargo-maven2-plugin.version>1.4.6</cargo-maven2-plugin.version>
 
 	</properties>
 

diff --git a/sec/pom.xml b/sec/pom.xml
@@ -108,11 +108,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>${groovy.version}</version>
-		</dependency>
 
 	</dependencies>
 

diff --git a/test/pom.xml b/test/pom.xml
@@ -75,11 +75,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>${groovy.version}</version>
-		</dependency>
 
 	</dependencies>