Author: coheigea
Date: Thu Jan 10 11:32:46 2013
New Revision: 1431288
URL: http://svn.apache.org/viewvc?rev=1431288&view=rev
Log:
Moving various dependency versions to the parent pom
Modified:
cxf/fediz/trunk/examples/simpleWebapp/pom.xml
cxf/fediz/trunk/examples/springWebapp/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
cxf/fediz/trunk/plugins/core/pom.xml
cxf/fediz/trunk/plugins/jetty/pom.xml
cxf/fediz/trunk/plugins/spring/pom.xml
cxf/fediz/trunk/pom.xml
cxf/fediz/trunk/services/idp/pom.xml
cxf/fediz/trunk/systests/idp/pom.xml
cxf/fediz/trunk/systests/simpleWebapp/pom.xml
cxf/fediz/trunk/systests/tests/pom.xml
Modified: cxf/fediz/trunk/examples/simpleWebapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/pom.xml Thu Jan 10 11:32:46 2013
@@ -39,7 +39,7 @@
<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 -->
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
+ <version>${commons.lang.version}</version>
</dependency>
</dependencies>
Modified: cxf/fediz/trunk/examples/springWebapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/pom.xml Thu Jan 10 11:32:46 2013
@@ -30,18 +30,19 @@
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <spring.version>3.1.3.RELEASE</spring.version>
</properties>
<dependencies>
<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 -->
@@ -59,22 +60,22 @@
<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>
<artifactId>spring-security-web</artifactId>
- <version>3.1.3.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>3.1.3.RELEASE</version>
+ <version>${spring.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>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Thu Jan 10 11:32:46
2013
@@ -43,7 +43,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -62,7 +62,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>
Modified: cxf/fediz/trunk/plugins/core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/pom.xml (original)
+++ cxf/fediz/trunk/plugins/core/pom.xml Thu Jan 10 11:32:46 2013
@@ -64,7 +64,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cxf/fediz/trunk/plugins/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/jetty/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/jetty/pom.xml (original)
+++ cxf/fediz/trunk/plugins/jetty/pom.xml Thu Jan 10 11:32:46 2013
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.2</version>
+ <version>${httpclient.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.htmlparser.jericho</groupId>
<artifactId>jericho-html</artifactId>
- <version>3.2</version>
+ <version>${jericho.version}</version>
<scope>test</scope>
</dependency>
<!--
Modified: cxf/fediz/trunk/plugins/spring/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/spring/pom.xml (original)
+++ cxf/fediz/trunk/plugins/spring/pom.xml Thu Jan 10 11:32:46 2013
@@ -59,7 +59,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cxf/fediz/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Thu Jan 10 11:32:46 2013
@@ -32,20 +32,27 @@
</parent>
<properties>
+ <commons.lang.version>3.0.1</commons.lang.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
+ <cxf.version>2.6.5</cxf.version>
+ <cxf.build-utils.version>2.4.1</cxf.build-utils.version>
<ehcache.version>2.5.1</ehcache.version>
- <slf4j.version>1.6.5</slf4j.version>
- <spring.version>3.0.7.RELEASE</spring.version>
- <tomcat.version>7.0.27</tomcat.version>
+ <httpclient.version>4.2.2</httpclient.version>
+ <jericho.version>3.2</jericho.version>
<jetty.version>8.1.8.v20121106</jetty.version>
<!--<jetty.version>7.6.8.v20121106</jetty.version>-->
<junit.version>4.8.2</junit.version>
- <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
- <cxf.version>2.6.5</cxf.version>
+ <log4j.version>1.2.15</log4j.version>
+ <servlet.version>2.5</servlet.version>
+ <slf4j.version>1.6.5</slf4j.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
+ <tomcat.version>7.0.27</tomcat.version>
<wss4j.version>1.6.9</wss4j.version>
+
+ <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.6</jdk.version>
<compiler.fork>false</compiler.fork>
- <cxf.build-utils.version>2.4.1</cxf.build-utils.version>
<fediz.protect-xmlschema-collections>false</fediz.protect-xmlschema-collections>
<fediz.surefire.fork.mode>once</fediz.surefire.fork.mode>
Modified: cxf/fediz/trunk/services/idp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Thu Jan 10 11:32:46 2013
@@ -39,7 +39,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
+ <version>${commons.lang.version}</version>
</dependency>
</dependencies>
<build>
Modified: cxf/fediz/trunk/systests/idp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/idp/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/idp/pom.xml (original)
+++ cxf/fediz/trunk/systests/idp/pom.xml Thu Jan 10 11:32:46 2013
@@ -30,7 +30,7 @@
<packaging>war</packaging>
<dependencyManagement>
<dependencies>
- </dependencies>
+ </dependencies>
</dependencyManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -39,7 +39,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
+ <version>${commons.lang.version}</version>
</dependency>
</dependencies>
<build>
Modified: cxf/fediz/trunk/systests/simpleWebapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/simpleWebapp/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/simpleWebapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/simpleWebapp/pom.xml Thu Jan 10 11:32:46 2013
@@ -36,7 +36,7 @@
<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 -->
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
+ <version>${commons.lang.version}</version>
</dependency>
</dependencies>
<build>
Modified: cxf/fediz/trunk/systests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/tests/pom.xml?rev=1431288&r1=1431287&r2=1431288&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/tests/pom.xml (original)
+++ cxf/fediz/trunk/systests/tests/pom.xml Thu Jan 10 11:32:46 2013
@@ -84,13 +84,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.2</version>
+ <version>${httpclient.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.htmlparser.jericho</groupId>
<artifactId>jericho-html</artifactId>
- <version>3.2</version>
+ <version>${jericho.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
