You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/05/28 18:21:35 UTC
svn commit: r949218 - in /cxf/trunk: ./ distribution/ distribution/bundle/
distribution/bundle/all/ distribution/bundle/jaxrs/
distribution/bundle/minimal/ distribution/manifest/ rt/bindings/jbi/
rt/frontend/jaxrs/ rt/transports/jbi/
Author: dkulp
Date: Fri May 28 16:21:35 2010
New Revision: 949218
URL: http://svn.apache.org/viewvc?rev=949218&view=rev
Log:
Don't use some deprecated things that maven 3 warns about
Modified:
cxf/trunk/distribution/bundle/all/pom.xml
cxf/trunk/distribution/bundle/jaxrs/pom.xml
cxf/trunk/distribution/bundle/minimal/pom.xml
cxf/trunk/distribution/bundle/pom.xml
cxf/trunk/distribution/manifest/pom.xml
cxf/trunk/distribution/pom.xml
cxf/trunk/pom.xml
cxf/trunk/rt/bindings/jbi/pom.xml
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/transports/jbi/pom.xml
Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Fri May 28 16:21:35 2010
@@ -36,199 +36,199 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-schemas</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-validator</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-misctools</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-corba</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-osgi</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-aegis</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-javascript</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
@@ -249,10 +249,10 @@
<Implementation-Title>Apache CXF</Implementation-Title>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<DynamicImport-Package>
com.sun.xml.bind.api,
com.sun.xml.bind.api.*,
@@ -304,7 +304,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
'=META-INF.cxf.osgi',
'=META-INF.cxf'
</Export-Package>
Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Fri May 28 16:21:35 2010
@@ -37,37 +37,37 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
@@ -78,7 +78,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
@@ -109,10 +109,10 @@
<Implementation-Title>Apache CXF</Implementation-Title>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<DynamicImport-Package>
com.ctc.wstx.*,
org.apache.commons.logging.*,
@@ -157,7 +157,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
'=META-INF.cxf.osgi',
'=META-INF.cxf'
</Export-Package>
Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Fri May 28 16:21:35 2010
@@ -36,100 +36,100 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-schemas</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-aegis</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
@@ -149,10 +149,10 @@
<Implementation-Title>Apache CXF</Implementation-Title>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<DynamicImport-Package>
com.ctc.wstx.*,
com.sun.xml.bind.api,
@@ -168,7 +168,7 @@
!org.apache.cxf.*,
!META-INF.cxf,
!schemas*,
- org.apache.cxf.tools.*;version=${pom.version};resolution:=optional,
+ org.apache.cxf.tools.*;version=${project.version};resolution:=optional,
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
@@ -206,7 +206,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
'=META-INF.cxf',
'=META-INF.cxf.osgi',
'=schemas',
Modified: cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/pom.xml (original)
+++ cxf/trunk/distribution/bundle/pom.xml Fri May 28 16:21:35 2010
@@ -35,7 +35,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
- <cxf.version>${pom.version}</cxf.version>
+ <cxf.version>${project.version}</cxf.version>
<createSourcesJar>false</createSourcesJar>
</properties>
Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Fri May 28 16:21:35 2010
@@ -35,67 +35,67 @@
<properties>
<maven.test.skip>true</maven.test.skip>
- <cxf.version>${pom.version}</cxf.version>
+ <cxf.version>${project.version}</cxf.version>
</properties>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-schemas</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-validator</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-misctools</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-corba</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -121,36 +121,36 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -160,103 +160,103 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-aegis</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-javascript</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
@@ -303,7 +303,7 @@
</manifest>
<manifestEntries>
<!-- Add an entry for the renamed bundle jar in the distro -->
- <Class-Path>cxf-${pom.version}.jar</Class-Path>
+ <Class-Path>cxf-${project.version}.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Fri May 28 16:21:35 2010
@@ -34,7 +34,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
- <cxf.version>${pom.version}</cxf.version>
+ <cxf.version>${project.version}</cxf.version>
<checkstyle.extension>-corba</checkstyle.extension>
</properties>
@@ -47,60 +47,60 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-schemas</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-validator</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-misctools</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-corba</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -126,41 +126,41 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-osgi</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -170,100 +170,100 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-http</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-aegis</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-javascript</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
@@ -276,7 +276,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -320,7 +320,7 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
<classifier>javadoc</classifier>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -338,25 +338,25 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-integration-jbi</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-integration-jca</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-jbi</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-jbi</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
</artifactItem>
<artifactItem>
@@ -430,10 +430,10 @@
<property name="output.ext" value="" />
<echo file="${basedir}/target/srcbuild_env${output.ext}" message="${output.cp}" />
<echo file="${basedir}/target/srcbuild_env.ant" message="${cp}" />
- <echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}" />
+ <echo file="${basedir}/target/version.properties" message="cxf.version=${project.version}" />
<copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml" overwrite="yes">
<filterset>
- <filter token="CXF_VERSION" value="${pom.version}" />
+ <filter token="CXF_VERSION" value="${project.version}" />
</filterset>
</copy>
<delete file="build.xml" />
Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Fri May 28 16:21:35 2010
@@ -514,13 +514,13 @@
<configuration>
<archive>
<manifestEntries>
- <Specification-Title>${name}</Specification-Title>
+ <Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${version}</Specification-Version>
- <Implementation-Title>${name}</Implementation-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Version>${version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
@@ -552,7 +552,7 @@
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-buildtools</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
Modified: cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ cxf/trunk/rt/bindings/jbi/pom.xml Fri May 28 16:21:35 2010
@@ -142,17 +142,17 @@
<Implementation-Title>Apache CXF</Implementation-Title>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<DynamicImport-Package>
</DynamicImport-Package>
<Import-Package>
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
META-INF.cxf.binding.jbi
</Export-Package>
<_failok>true</_failok>
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Fri May 28 16:21:35 2010
@@ -65,7 +65,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/pom.xml?rev=949218&r1=949217&r2=949218&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ cxf/trunk/rt/transports/jbi/pom.xml Fri May 28 16:21:35 2010
@@ -114,17 +114,17 @@
<Implementation-Title>Apache CXF</Implementation-Title>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<DynamicImport-Package>
</DynamicImport-Package>
<Import-Package>
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
META-INF.cxf.transport.jbi
</Export-Package>
<_failok>true</_failok>