Repository: cxf
Updated Branches:
refs/heads/master 9251e70e5 -> dfbe1e515
Moving cxf.tomcat.version property to systests/cdi/pom.xml as CXF does not uses it in builds
and downgrading the version to 7.x to get the tests passing with Java6, with thanks to Dan
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dfbe1e51
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dfbe1e51
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dfbe1e51
Branch: refs/heads/master
Commit: dfbe1e515a3aa4283655b422b4f717d05cc77415
Parents: 9251e70
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Mar 11 16:23:01 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Mar 11 16:23:01 2014 +0000
----------------------------------------------------------------------
parent/pom.xml | 1 -
systests/cdi/pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dfbe1e51/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f1cf90d..b250214 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,6 @@
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.5</cxf.jettison.version>
<cxf.jetty.version>8.1.14.v20131031</cxf.jetty.version>
- <cxf.tomcat.version>8.0.3</cxf.tomcat.version>
<cxf.jetty.osgi.version>[7.6,8.2)</cxf.jetty.osgi.version>
<cxf.jibx.version>1.2.5</cxf.jibx.version>
<cxf.junit.version>4.11</cxf.junit.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/dfbe1e51/systests/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index 14850c3..c6a9ad3 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -35,7 +35,7 @@
<cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version>
<cxf.surefire.fork.vmargs>-XX:MaxPermSize=192m</cxf.surefire.fork.vmargs>
<cxf.server.launcher.vmargs>-XX:MaxPermSize=192m</cxf.server.launcher.vmargs>
-
+ <cxf.tomcat.version>7.0.52</cxf.tomcat.version>
</properties>
<dependencies>
<dependency>
|