dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17722
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-12-17 14:13:54 +0100
message:
  update to spring 4.1.3
modified:
  dhis-2/dhis-support/dhis-support-external/pom.xml
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-support/dhis-support-external/pom.xml'
--- dhis-2/dhis-support/dhis-support-external/pom.xml	2014-11-20 18:38:54 +0000
+++ dhis-2/dhis-support/dhis-support-external/pom.xml	2014-12-17 13:13:54 +0000
@@ -2,29 +2,29 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-support</artifactId>
     <version>2.18-SNAPSHOT</version>
   </parent>
-  
+
   <artifactId>dhis-support-external</artifactId>
   <packaging>jar</packaging>
   <name>DHIS External Support</name>
-  
+
   <dependencies>
-    
+
     <!-- DHIS -->
-        
+
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-api</artifactId>
     </dependency>
-    
-	<!-- Spring -->
-	
-	<dependency>
+
+    <!-- Spring -->
+
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
     </dependency>
@@ -64,9 +64,9 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
     </dependency>
-	
+
     <!--Spring Security -->
-	  
+
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
@@ -87,16 +87,20 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-openid</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security.oauth</groupId>
+      <artifactId>spring-security-oauth2</artifactId>
+    </dependency>
 
     <!-- Other -->
-	
+
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.openid4java</groupId>
-        <artifactId>openid4java</artifactId>
+      <groupId>org.openid4java</groupId>
+      <artifactId>openid4java</artifactId>
     </dependency>
   </dependencies>
   <properties>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2014-12-16 17:00:41 +0000
+++ dhis-2/pom.xml	2014-12-17 13:13:54 +0000
@@ -487,12 +487,21 @@
           </exclusion>
         </exclusions>
       </dependency>
+
+      <!-- OAuth 2.0 -->
+      <dependency>
+          <groupId>org.springframework.security.oauth</groupId>
+          <artifactId>spring-security-oauth2</artifactId>
+          <version>2.0.4.RELEASE</version>
+      </dependency>
+
       <!-- Spring Mobile -->
       <dependency>
         <groupId>org.springframework.mobile</groupId>
         <artifactId>spring-mobile-device</artifactId>
         <version>1.1.3.RELEASE</version>
       </dependency>
+
       <!-- Jasypt -->
       <dependency>
 	    <groupId>org.jasypt</groupId>
@@ -986,7 +995,7 @@
   <properties>
     <rootDir></rootDir>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>4.1.2.RELEASE</spring.version>
+    <spring.version>4.1.3.RELEASE</spring.version>
     <spring.security.version>3.2.5.RELEASE</spring.security.version>
     <struts.version>2.3.16.3</struts.version>
     <hibernate.version>4.2.0.Final</hibernate.version>