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/06/17 01:51:50 UTC
svn commit: r955433 - in /cxf/branches/2.2.x-fixes: ./
distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml
distribution/bundle/minimal/pom.xml distribution/bundle/pom.xml
distribution/pom.xml pom.xml systests/jaxrs/pom.xml testutils/pom.xml
Author: dkulp
Date: Wed Jun 16 23:51:50 2010
New Revision: 955433
URL: http://svn.apache.org/viewvc?rev=955433&view=rev
Log:
Merged revisions 955429 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r955429 | dkulp | 2010-06-16 19:33:50 -0400 (Wed, 16 Jun 2010) | 2 lines
Update to make the "versions" in the osgi bundles consistent to osgi
conventions.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/pom.xml
cxf/branches/2.2.x-fixes/distribution/pom.xml
cxf/branches/2.2.x-fixes/pom.xml
cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/testutils/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Wed Jun 16 23:51:50 2010
@@ -252,10 +252,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>${project.version}</Implementation-Version>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
<DynamicImport-Package>
com.sun.xml.bind.api,
com.sun.xml.bind.api.*,
@@ -295,6 +295,7 @@
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
+ org.slf4j*;resolution:=optional,
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
javax.annotation;version="[0.0,2)",
@@ -307,7 +308,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
'=META-INF.cxf.osgi',
'=META-INF.cxf'
</Export-Package>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Wed Jun 16 23:51:50 2010
@@ -112,10 +112,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>${project.version}</Implementation-Version>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
<DynamicImport-Package>
com.ctc.wstx.*,
org.apache.commons.logging.*,
@@ -148,6 +148,7 @@
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
+ org.slf4j*;resolution:=optional,
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
javax.annotation;version="[0.0,2)",
@@ -160,7 +161,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
'=META-INF.cxf.osgi',
'=META-INF.cxf'
</Export-Package>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Wed Jun 16 23:51:50 2010
@@ -152,10 +152,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>${project.version}</Implementation-Version>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
<Specification-Title>Apache CXF</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
<DynamicImport-Package>
com.ctc.wstx.*,
com.sun.xml.bind.api,
@@ -171,7 +171,7 @@
!org.apache.cxf.*,
!META-INF.cxf,
!schemas*,
- org.apache.cxf.tools.*;version=${project.version};resolution:=optional,
+ org.apache.cxf.tools.*;version=${cxf.osgi.version.clean};resolution:=optional,
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
@@ -197,6 +197,7 @@
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
+ org.slf4j*;resolution:=optional,
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
javax.annotation;version="[0.0,2)",
@@ -209,7 +210,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
+ org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
'=META-INF.cxf',
'=META-INF.cxf.osgi',
'=schemas',
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/pom.xml Wed Jun 16 23:51:50 2010
@@ -49,6 +49,64 @@
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>create-prop</id>
+ <phase>initialize</phase>
+ <configuration>
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+ <property name="mv" value="${project.version}" />
+ <echo message="Maven version: ${mv}" />
+ <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+ <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+ <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0" />
+ <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue="" />
+ <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+ <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+ <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+ <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
+ <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
+ <property name="os" value="${ov.p1a}${ov.p2a}" />
+ <echo message="OSGi version: ${ov}" />
+ <mkdir dir="target" />
+ <echo file="target/cxf.osgi.version.txt">
+cxf.osgi.version.clean = ${ov}
+cxf.schema.version = ${os}
+ </echo>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>target/cxf.osgi.version.txt</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -58,7 +116,7 @@
<archive>
<manifestEntries>
<Bundle-SymbolicName>${bundle.symbolic.name}.source</Bundle-SymbolicName>
- <Eclipse-SourceBundle>${bundle.symbolic.name};version="${project.version}"</Eclipse-SourceBundle>
+ <Eclipse-SourceBundle>${bundle.symbolic.name};version="${cxf.osgi.version.clean}"</Eclipse-SourceBundle>
</manifestEntries>
</archive>
</configuration>
@@ -129,8 +187,8 @@
<modules>
<module>all</module>
- <module>minimal</module>
- <module>jaxrs</module>
- </modules>
+ <module>minimal</module>
+ <module>jaxrs</module>
+ </modules>
</project>
Modified: cxf/branches/2.2.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/pom.xml Wed Jun 16 23:51:50 2010
@@ -405,13 +405,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.8.0</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>process-sources-xsl</id>
Modified: cxf/branches/2.2.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/pom.xml Wed Jun 16 23:51:50 2010
@@ -458,6 +458,29 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml Wed Jun 16 23:51:50 2010
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
</dependency>
<dependency>
<groupId>jetty</groupId>
Modified: cxf/branches/2.2.x-fixes/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/pom.xml?rev=955433&r1=955432&r2=955433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/testutils/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/testutils/pom.xml Wed Jun 16 23:51:50 2010
@@ -83,14 +83,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.8.0</version>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<!--