cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: Cleaning up + upgrading various dependencies
Date Tue, 03 Jun 2014 11:56:26 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.1.x-fixes bd1832b02 -> 5c43fd239


Cleaning up + upgrading various dependencies

Conflicts:
	pom.xml
	services/idp/pom.xml
	services/sts/pom.xml
	systests/jetty8/pom.xml
	systests/spring/pom.xml
	systests/springPreauthWebapp/pom.xml
	systests/tomcat7/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5c43fd23
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5c43fd23
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5c43fd23

Branch: refs/heads/1.1.x-fixes
Commit: 5c43fd2395905837ba7492c1c329974f217f0cbe
Parents: bd1832b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Jun 3 12:44:48 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Jun 3 12:56:13 2014 +0100

----------------------------------------------------------------------
 examples/spring2Webapp/pom.xml       |  1 -
 plugins/spring2/pom.xml              |  1 -
 pom.xml                              | 13 ++++++++-----
 services/idp/pom.xml                 | 10 +++++-----
 services/sts/pom.xml                 |  2 +-
 systests/spring2Webapp/pom.xml       |  1 -
 systests/springPreauthWebapp/pom.xml | 10 +++++-----
 7 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/examples/spring2Webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spring2Webapp/pom.xml b/examples/spring2Webapp/pom.xml
index 4f1a950..41b9a46 100644
--- a/examples/spring2Webapp/pom.xml
+++ b/examples/spring2Webapp/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.security.version>2.0.8.RELEASE</spring.security.version>
-        <spring.version>2.5.6</spring.version>
     </properties>
 
     <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/plugins/spring2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring2/pom.xml b/plugins/spring2/pom.xml
index cde5275..ccbae81 100644
--- a/plugins/spring2/pom.xml
+++ b/plugins/spring2/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.security.version>2.0.8.RELEASE</spring.security.version>
-        <spring.version>2.5.6</spring.version>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e87b19..4d0fc65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,23 +28,26 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>13</version>
+        <version>14</version>
     </parent>
 
     <properties>
-        <commons.lang.version>3.0.1</commons.lang.version>
-        <commons.logging.version>1.1.1</commons.logging.version>
+        <commons.lang.version>3.3.2</commons.lang.version>
+        <commons.logging.version>1.1.3</commons.logging.version>
         <cxf.version>2.7.11</cxf.version>
         <cxf.build-utils.version>2.6.0</cxf.build-utils.version>
         <ehcache.version>2.5.1</ehcache.version>
-        <httpclient.version>4.3.2</httpclient.version>
+        <httpclient.version>4.3.3</httpclient.version>
+        <hsqldb.version>1.8.0.10</hsqldb.version>
         <javassist.version>3.16.1-GA</javassist.version>
-        <jericho.version>3.2</jericho.version>
+        <javax.validation.version>1.1.0.Final</javax.validation.version>
+        <jericho.version>3.3</jericho.version>
         <jetty.version>8.1.12.v20130726</jetty.version>
         <!--<jetty.version>7.6.8.v20121106</jetty.version>-->
         <junit.version>4.11</junit.version>
         <log4j.version>1.2.17</log4j.version>
         <ognl.version>3.0.8</ognl.version>
+        <openjpa.version>2.3.0</openjpa.version>
         <servlet.version>2.5</servlet.version>
         <slf4j.version>1.7.7</slf4j.version>
         <spring.version>3.1.4.RELEASE</spring.version>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 859787b..7ca5429 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -33,17 +33,17 @@
             <dependency>
         	    <groupId>org.springframework</groupId>
         	    <artifactId>spring-jdbc</artifactId>
-        	    <version>3.1.4.RELEASE</version>
+        	    <version>${spring.version}</version>
             </dependency>
             <dependency>
         	    <groupId>org.springframework</groupId>
         	    <artifactId>spring-tx</artifactId>
-        	    <version>3.1.4.RELEASE</version>
+        	    <version>${spring.version}</version>
             </dependency>
             <dependency>
         	    <groupId>org.springframework</groupId>
         	    <artifactId>spring-aop</artifactId>
-        	    <version>3.1.4.RELEASE</version>
+        	    <version>${spring.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.springframework.webflow</groupId>
             <artifactId>spring-webflow</artifactId>
-            <version>2.3.1.RELEASE</version>
+            <version>2.3.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.0.1</version>
+            <version>${commons.lang.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 2e32a77..528b8e4 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -66,7 +66,7 @@
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-core</artifactId>
-			<version>1.3.1.RELEASE</version>
+			<version>1.3.2.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/systests/spring2Webapp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/spring2Webapp/pom.xml b/systests/spring2Webapp/pom.xml
index dbea0ac..022b84b 100644
--- a/systests/spring2Webapp/pom.xml
+++ b/systests/spring2Webapp/pom.xml
@@ -35,7 +35,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.security.version>2.0.8.RELEASE</spring.security.version>
-        <spring.version>2.5.6</spring.version>
     </properties>
 
     <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5c43fd23/systests/springPreauthWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/springPreauthWebapp/pom.xml b/systests/springPreauthWebapp/pom.xml
index 42d0a51..03a5849 100644
--- a/systests/springPreauthWebapp/pom.xml
+++ b/systests/springPreauthWebapp/pom.xml
@@ -40,13 +40,13 @@
        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
+            <version>${commons.logging.version}</version>
             <scope>provided</scope>
         </dependency>    
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Required to cast Principal to FederationPrincipal -->
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.0.1</version>
+            <version>${commons.lang.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -79,12 +79,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>		
+            <version>${slf4j.version}</version>		
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
+            <version>${log4j.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.mail</groupId>


Mime
View raw message