Merge pull request #27 from ractive/SOCIAL-419

Fix maven dependencies
spring-attic · Feb 7, 2014 · e4a5b88 · e4a5b88
2 parents 6030c1b + 9724863
commit e4a5b88
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/spring-social-showcase-sec-xml/pom.xml b/spring-social-showcase-sec-xml/pom.xml
@@ -106,7 +106,7 @@
  	    <dependency>
 	    	<groupId>org.apache.httpcomponents</groupId>
 	    	<artifactId>httpclient</artifactId>
-	    	<version>4.2.5</version>
+	    	<version>4.3.1</version>
 			<exclusions>
 				<!-- Exclude Commons Logging in favor of SLF4j -->
 				<exclusion>

diff --git a/spring-social-showcase-sec/pom.xml b/spring-social-showcase-sec/pom.xml
@@ -193,8 +193,8 @@
 		<!-- Servlet -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -219,6 +219,16 @@
 			<artifactId>jstl-impl</artifactId>
 			<version>1.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf-spring4</artifactId>
+			<version>2.1.2.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>nz.net.ultraq.thymeleaf</groupId>
+			<artifactId>thymeleaf-layout-dialect</artifactId>
+			<version>1.2.2</version>
+		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>

diff --git a/spring-social-showcase/pom.xml b/spring-social-showcase/pom.xml
@@ -181,13 +181,13 @@
 		<!-- Thymeleaf -->
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf-spring3</artifactId>
-			<version>2.0.19</version>
+			<artifactId>thymeleaf-spring4</artifactId>
+			<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>nz.net.ultraq.thymeleaf</groupId>
 			<artifactId>thymeleaf-layout-dialect</artifactId>
-			<version>1.1.3</version>
+			<version>1.2.2</version>
 		</dependency>
 
 		<!-- @Inject -->