8:02 p.m.
Author: richard.opalka(a)jboss.com
Date: 2011-08-08 14:02:35 -0400 (Mon, 08 Aug 2011)
New Revision: 14791
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
Log:
updating dependencies
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml 2011-08-08 17:11:38
UTC (rev 14790)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml 2011-08-08 18:02:35
UTC (rev 14791)
@@ -220,12 +220,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
<build>
@@ -277,7 +273,7 @@
<classpathLayoutType>custom</classpathLayoutType>
<!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be
reviewed(remove one $) when maven jar plugin is updated-->
<customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
- </manifest>
+ </manifest>
<manifestEntries>
<Class-Path>jbossws-framework.jar jaxws-api.jar jboss-logging.jar
jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar
slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
</manifestEntries>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 17:11:38
UTC (rev 14790)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 18:02:35
UTC (rev 14791)
@@ -631,8 +631,11 @@
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <!-- Lib below required just for jaxrpc tests; listed here to prevent
CXF stack from depending on Native stack -->
+
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+
<additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ <!-- Libs below required just for jaxrpc tests; listed here to
prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
+
<additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 18:02:35 UTC (rev 14791)
@@ -64,7 +64,7 @@
<cxf.xjcplugins.version>2.3.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>2.2.0.CR1</jboss.logging.version>
+ <jboss.logging.version>3.0.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.2.Beta7</jboss.xb.version>
@@ -1170,15 +1170,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
<artifactId>jboss-jms-api_1.1_spec</artifactId>
<version>${jms.api.version}</version>