[jbossws-commits] JBossWS SVN: r15972 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/addons/transports/http/httpserver and 4 other directories.

[jbossws-commits at lists.jboss.org]

Author: ropalka
Date: 2012-03-16 06:31:48 -0400 (Fri, 16 Mar 2012)
New Revision: 15972

Modified:
   stack/cxf/branches/jbossws-cxf-4.0.x/
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml
Log:
Merged revisions 15967 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk

.......
  r15967 | alessio.soldano at jboss.com | 2012-03-16 11:02:12 +0100 (Fri, 16 Mar 2012) | 2 lines
  
  Minor cleanup / sort of dependencies version
.......



Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
   - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965
   + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965,15967
Modified: svn:mergeinfo
   - /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965
   + /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml	2012-03-16 10:25:27 UTC (rev 15971)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/pom.xml	2012-03-16 10:31:48 UTC (rev 15972)
@@ -86,7 +86,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml	2012-03-16 10:25:27 UTC (rev 15971)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml	2012-03-16 10:31:48 UTC (rev 15972)
@@ -230,7 +230,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml	2012-03-16 10:25:27 UTC (rev 15971)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/pom.xml	2012-03-16 10:31:48 UTC (rev 15972)
@@ -34,7 +34,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml	2012-03-16 10:25:27 UTC (rev 15971)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml	2012-03-16 10:31:48 UTC (rev 15972)
@@ -24,10 +24,13 @@
     <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
     <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
     <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
+    <log4j.output.dir>${project.build.directory}</log4j.output.dir>
+    <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir>
+    
     <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version>
     <org.slf4j.version>1.6.1</org.slf4j.version>
-    <log4j.output.dir>${project.build.directory}</log4j.output.dir>
-    <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir>
+    <gnu.getopt.version>1.0.13</gnu.getopt.version>
+    <log4j.version>1.2.14</log4j.version>
   </properties>
 
   <!-- Modules -->
@@ -53,7 +56,7 @@
     <dependency>
       <groupId>gnu-getopt</groupId>
       <artifactId>getopt</artifactId>
-      <version>1.0.13</version>
+      <version>${gnu.getopt.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -101,7 +104,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
+      <version>${log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml	2012-03-16 10:25:27 UTC (rev 15971)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml	2012-03-16 10:31:48 UTC (rev 15972)
@@ -24,7 +24,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>