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:45:01 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1770ee8c7 -> e2fceb72f


Cleaning up + upgrading various dependencies


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

Branch: refs/heads/master
Commit: e2fceb72f8d174860096507898637f2de0a3a620
Parents: 1770ee8
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:44:48 2014 +0100

----------------------------------------------------------------------
 examples/spring2Webapp/pom.xml       |  1 -
 plugins/spring2/pom.xml              |  1 -
 pom.xml                              | 15 +++++++++------
 services/idp/pom.xml                 | 20 ++++++++++----------
 services/sts/pom.xml                 |  2 +-
 systests/jetty8/pom.xml              |  2 +-
 systests/spring/pom.xml              |  2 +-
 systests/spring2Webapp/pom.xml       |  1 -
 systests/springPreauthWebapp/pom.xml | 10 +++++-----
 systests/tomcat7/pom.xml             |  2 +-
 10 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/examples/spring2Webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spring2Webapp/pom.xml b/examples/spring2Webapp/pom.xml
index e6f438c..be2a330 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/e2fceb72/plugins/spring2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring2/pom.xml b/plugins/spring2/pom.xml
index c2576cc..b22328c 100644
--- a/plugins/spring2/pom.xml
+++ b/plugins/spring2/pom.xml
@@ -32,7 +32,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>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d16fc27..359d8f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,26 +28,29 @@
     <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>3.0.0</cxf.version>
         <cxf.build-utils.version>2.6.0</cxf.build-utils.version>
         <ehcache.version>2.8.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>
+        <spring.version>3.2.6.RELEASE</spring.version>
         <spring.security.version>3.1.4.RELEASE</spring.security.version>
         <tomcat.version>7.0.42</tomcat.version>
         <wss4j.version>2.0.0</wss4j.version>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 6c9235d..5827862 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -34,17 +34,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>
@@ -98,7 +98,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>
@@ -156,7 +156,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>
@@ -181,7 +181,7 @@
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>${hsqldb.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -193,7 +193,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
-            <version>2.2.2</version>
+            <version>${openjpa.version}</version>
         </dependency>
         -->
         <dependency>
@@ -204,12 +204,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>2.2.2</version>
+            <version>${openjpa.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>2.2.2</version>
+            <version>${openjpa.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -220,7 +220,7 @@
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>1.0.0.GA</version>
+            <version>${javax.validation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.bval</groupId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 92a0630..f94db75 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -75,7 +75,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/e2fceb72/systests/jetty8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jetty8/pom.xml b/systests/jetty8/pom.xml
index 75e0929..e7101e8 100644
--- a/systests/jetty8/pom.xml
+++ b/systests/jetty8/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/systests/spring/pom.xml
----------------------------------------------------------------------
diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml
index ca51972..879adcd 100644
--- a/systests/spring/pom.xml
+++ b/systests/spring/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>                 
     </dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/systests/spring2Webapp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/spring2Webapp/pom.xml b/systests/spring2Webapp/pom.xml
index a617f83..50d3e8d 100644
--- a/systests/spring2Webapp/pom.xml
+++ b/systests/spring2Webapp/pom.xml
@@ -33,7 +33,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/e2fceb72/systests/springPreauthWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/springPreauthWebapp/pom.xml b/systests/springPreauthWebapp/pom.xml
index 89ad8e3..85feaf8 100644
--- a/systests/springPreauthWebapp/pom.xml
+++ b/systests/springPreauthWebapp/pom.xml
@@ -39,13 +39,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 -->
@@ -63,7 +63,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>
@@ -78,12 +78,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>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e2fceb72/systests/tomcat7/pom.xml
----------------------------------------------------------------------
diff --git a/systests/tomcat7/pom.xml b/systests/tomcat7/pom.xml
index a34e008..d58f758 100644
--- a/systests/tomcat7/pom.xml
+++ b/systests/tomcat7/pom.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>


Mime
View raw message