#50 upgrade spring related deps

justinhrobbins · Aug 21, 2014 · 414e3ed · 414e3ed
1 parent 8ef9717
commit 414e3ed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/...s_Test/src/main/java/org/robbins/flashcards/tests/webservices/AbstractRestTestClient.java b/...s_Test/src/main/java/org/robbins/flashcards/tests/webservices/AbstractRestTestClient.java
@@ -219,7 +219,7 @@ public HttpStatus putEntity(final String url, final Long id, final E entity) {
         // make the REST call
         @SuppressWarnings("rawtypes")
         ResponseEntity response = getRestTemplate().exchange(url, HttpMethod.PUT,
-                httpEntity, null, vars);
+                httpEntity, ResponseEntity.class, vars);
         return response.getStatusCode();
     }
 
@@ -244,7 +244,7 @@ public HttpStatus updateEntity(final String url,
         // make the REST call
         @SuppressWarnings("rawtypes")
         ResponseEntity response = getRestTemplate().exchange(url, HttpMethod.POST,
-                httpEntity, null, uriVariables);
+                httpEntity, ResponseEntity.class, uriVariables);
         return response.getStatusCode();
     }
 
@@ -268,7 +268,7 @@ public HttpStatus putEntity(final String url, final Map<String, String> uriVaria
         // make the REST call
         @SuppressWarnings("rawtypes")
         ResponseEntity response = getRestTemplate().exchange(url, HttpMethod.PUT,
-                httpEntity, null, uriVariables);
+                httpEntity, ResponseEntity.class, uriVariables);
         return response.getStatusCode();
     }
 
@@ -293,7 +293,7 @@ public HttpStatus deleteEntity(final String url, final Long id) {
         // make the REST call
         @SuppressWarnings("rawtypes")
         ResponseEntity response = getRestTemplate().exchange(url, HttpMethod.DELETE,
-                httpEntity, null, vars);
+                httpEntity, ResponseEntity.class, vars);
         return response.getStatusCode();
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -63,10 +63,11 @@
         <reflections.version>0.9.8</reflections.version>
         <restygwt.version>1.3.1</restygwt.version>
         <slf4j.version>1.7.5</slf4j.version>
-        <spring.version>3.1.1.RELEASE</spring.version>
-        <springdata.version>1.1.0.RELEASE</springdata.version>
-        <springdata.commons.version>1.3.2.RELEASE</springdata.commons.version>
-        <spring.test.dbunit.version>1.0.1</spring.test.dbunit.version>
+        <spring.version>3.2.10.RELEASE</spring.version>
+        <spring.security.version>3.1.1.RELEASE</spring.security.version>
+        <springdata.version>1.6.2.RELEASE</springdata.version>
+        <springdata.commons.version>1.4.1.RELEASE</springdata.commons.version>
+        <spring.test.dbunit.version>1.1.0</spring.test.dbunit.version>
         <struts.version>2.3.4.1</struts.version>
         <swagger.version>1.3.0</swagger.version>
 
@@ -144,7 +145,7 @@
     </pluginRepositories>
     <modules>
         <module>FlashCards_Domain</module>
-        <module>FlashCards_GWT</module>
+        <!-- <module>FlashCards_GWT</module> -->
         <module>FlashCards_Service</module>
         <module>FlashCards_Service_SpringData</module>
         <module>FlashCards_Service_Jpa</module>
@@ -329,11 +330,6 @@
                 <artifactId>spring-expression</artifactId>
                 <version>${spring.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-core</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
@@ -356,16 +352,21 @@
             </dependency>
 
             <!-- Spring Security -->
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-core</artifactId>
+                <version>${spring.security.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-web</artifactId>
-                <version>${spring.version}</version>
+                <version>${spring.security.version}</version>
                 <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-config</artifactId>
-                <version>${spring.version}</version>
+                <version>${spring.security.version}</version>
                 <scope>runtime</scope>
             </dependency>
 
@@ -828,6 +829,7 @@
                     </dependencies>
                     <configuration>
                         <webapps>
+<!--
                             <webapp> 
                                 <groupId>org.robbins.flashcards</groupId> 
                                 <artifactId>FlashCards_WebServices</artifactId> 
@@ -836,6 +838,7 @@
                                 <asWebapp>true</asWebapp>
                                 <contextPath>/api</contextPath>
                             </webapp>
+-->
                              <webapp> 
                                 <groupId>org.robbins.flashcards</groupId> 
                                 <artifactId>FlashCards_GWT</artifactId>