11:45 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2012-03-01 12:45:00 -0500 (Thu, 01 Mar 2012)
New Revision: 15809
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Merged revisions 15806,15808 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15806 | alessio.soldano(a)jboss.com | 2012-03-01 17:45:14 +0100 (Thu, 01 Mar 2012) | 2
lines
[JBWS-3442] Misc dependency updates
.......
r15808 | alessio.soldano(a)jboss.com | 2012-03-01 18:31:06 +0100 (Thu, 01 Mar 2012) | 2
lines
[JBWS-3442] Misc dependency updates
.......
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,1...
+
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
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
+ /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
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-01 17:31:06 UTC
(rev 15808)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-01 17:45:00 UTC
(rev 15809)
@@ -118,7 +118,7 @@
<artifactId>cxf-xjc-ts</artifactId>
</dependency>
<dependency>
- <groupId>apache-velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01
17:31:06 UTC (rev 15808)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01
17:45:00 UTC (rev 15809)
@@ -50,7 +50,7 @@
<include>org.apache.ws.security:wss4j:jar</include>
<include>org.apache.santuario:xmlsec:jar</include>
<include>asm:asm:jar</include>
- <include>apache-velocity:velocity:jar</include>
+ <include>org.apache.velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
<include>commons-beanutils:commons-beanutils:jar</include>
<include>commons-lang:commons-lang:jar</include>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-01 17:31:06 UTC
(rev 15808)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-01 17:45:00 UTC
(rev 15809)
@@ -122,7 +122,7 @@
<artifactId>cxf-xjc-ts</artifactId>
</dependency>
<dependency>
- <groupId>apache-velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
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-01 17:31:06 UTC
(rev 15808)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-01 17:45:00 UTC
(rev 15809)
@@ -25,7 +25,7 @@
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version>
- <org.slf4j.version>1.5.6</org.slf4j.version>
+ <org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.output.dir>${project.build.directory}</log4j.output.dir>
</properties>
@@ -956,7 +956,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
- <version>2.0.0-beta-1</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
@@ -1171,7 +1171,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
- <version>2.0.0-beta-1</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-01 17:31:06 UTC (rev 15808)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-01 17:45:00 UTC (rev 15809)
@@ -73,18 +73,18 @@
<jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.4.6</cxf.version>
- <cxf.asm.version>3.3</cxf.asm.version>
+ <cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
- <jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
- <jboss.logging.version>3.1.0.Beta3</jboss.logging.version>
+ <jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
+ <jboss.logging.version>3.1.0.GA</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
<jboss.xb.version>2.0.3.GA</jboss.xb.version>
<picketbox.version>4.0.6.Beta1</picketbox.version>
<jaxws-jboss-httpserver-httpspi.version>1.0.1-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version>
<httpserver.version>1.0.0.Final</httpserver.version>
- <jaxb.api.version>1.0.0.Final</jaxb.api.version>
+ <jaxb.api.version>1.0.3.Final</jaxb.api.version>
<jaxb.impl.version>2.2.4</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
@@ -92,16 +92,16 @@
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
- <commons-collections.version>3.1</commons-collections.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
<commons-lang.version>2.4</commons-lang.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <log4j.version>1.2.14</log4j.version>
- <mail.version>1.4.2</mail.version>
+ <log4j.version>1.2.16</log4j.version>
+ <mail.version>1.4.4</mail.version>
<neethi.version>3.0.1</neethi.version>
- <saaj.api.version>1.0.0.Final</saaj.api.version>
+ <saaj.api.version>1.0.1.Final</saaj.api.version>
<stax.api.version>1.0-2</stax.api.version>
<jms.api.version>1.0.0.Final</jms.api.version>
- <velocity.version>1.5</velocity.version>
+ <velocity.version>1.6.3</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.0</xmlsec.version>
<wss4j.version>1.6.5-SNAPSHOT</wss4j.version>
@@ -933,7 +933,7 @@
<version>${fastinfoset.api.version}</version>
</dependency>
<dependency>
- <groupId>apache-velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>