maven upgrades

DRisal · Dec 14, 2012 · e6233d9 · e6233d9
1 parent 8437700
commit e6233d9
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 27 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org</groupId>
 		<artifactId>rest-parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.10-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -17,13 +17,13 @@
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-common</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-test</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org</groupId>
 		<artifactId>rest-parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.10-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org</groupId>
 	<artifactId>rest-parent</artifactId>
-	<version>0.9-SNAPSHOT</version>
+	<version>0.10-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>rest-security</name>
 	<url>https://github.com/eugenp/REST</url>
@@ -58,7 +58,7 @@
 	<properties>
 
 		<!-- Spring related -->
-		<spring.version>3.2.0.RC2</spring.version> <!-- 3.1.3.RELEASE -->
+		<spring.version>3.2.0</spring.version>
 		<spring-security.version>3.1.3.RELEASE</spring-security.version>
 		<javassist.version>3.17.1-GA</javassist.version>
 		<cglib.version>2.2.2</cglib.version>

diff --git a/sandbox/pom.xml b/sandbox/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org</groupId>
 		<artifactId>rest-parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.10-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -17,13 +17,13 @@
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-common</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-test</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/sec/.settings/org.eclipse.wst.common.component b/sec/.settings/org.eclipse.wst.common.component
@@ -4,12 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="rest-common-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rest-common/rest-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="rest-api-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rest-api/rest-api">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="java-output-path" value="/rest/target/classes"/>
         <property name="context-root" value="rest-sec"/>
     </wb-module>

diff --git a/sec/pom.xml b/sec/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org</groupId>
 		<artifactId>rest-parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.10-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -17,20 +17,20 @@
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-common</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-test</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-api</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 		</dependency>
 
 		<!-- util -->

diff --git a/test/pom.xml b/test/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org</groupId>
 		<artifactId>rest-parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.10-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-common</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 		</dependency>
 
 		<!-- web -->

diff --git a/ui/.settings/org.eclipse.wst.common.component b/ui/.settings/org.eclipse.wst.common.component
@@ -4,9 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="rest-common-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rest-common/rest-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="rest-ui"/>
         <property name="java-output-path" value="/rest-ui/target/classes"/>
     </wb-module>

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org</groupId>
 		<artifactId>rest-parent</artifactId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.10-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -18,13 +18,13 @@
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-common</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org</groupId>
 			<artifactId>rest-test</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.10-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>