You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2010/06/30 05:23:09 UTC
svn commit: r959174 - in /servicemix/smx4: all/ bundles/trunk/
features/trunk/ features/trunk/activemq/activemq-commands/
features/trunk/assembly/ features/trunk/assembly/src/main/filtered-resources/
features/trunk/branding/ features/trunk/camel/servic...
Author: ccustine
Date: Wed Jun 30 03:23:08 2010
New Revision: 959174
URL: http://svn.apache.org/viewvc?rev=959174&view=rev
Log:
SMX4-544 - Update poms to not have warnings with Maven 3
- Updated Features project for Maven 3
- Updated parent pom relativePath: This quiets maven 3 builds when servicemix-pom is not in a sibling directory to nmr, features, etc. If the directory is not present or the GAV does not match, maven reverts to the repository so this change is harmless.
Modified:
servicemix/smx4/all/ (props changed)
servicemix/smx4/bundles/trunk/pom.xml
servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml
servicemix/smx4/features/trunk/branding/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml
servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml
servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/features/trunk/war/deployer/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
servicemix/smx4/specs/trunk/pom.xml
Propchange: servicemix/smx4/all/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Wed Jun 30 03:23:08 2010
@@ -2,3 +2,4 @@ features https://svn.apach
nmr https://svn.apache.org/repos/asf/servicemix/smx4/nmr/trunk/
specs https://svn.apache.org/repos/asf/servicemix/smx4/specs/trunk/
bundles https://svn.apache.org/repos/asf/servicemix/smx4/bundles/trunk
+servicemix-pom https://svn.apache.org/repos/asf/servicemix/servicemix-pom/trunk
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Jun 30 03:23:08 2010
@@ -31,6 +31,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
+ <relativePath>../servicemix-pom/pom.xml</relativePath>
<version>2</version>
</parent>
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml Wed Jun 30 03:23:08 2010
@@ -82,7 +82,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.servicemix.activemq.commands;version=${project.version};-split-package:=merge-first</Export-Package>
<Import-Package>
org.apache.felix.gogo.commands,
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Jun 30 03:23:08 2010
@@ -472,7 +472,7 @@
<dependency>
<groupId>org.apache.servicemix.activemq</groupId>
<artifactId>org.apache.servicemix.activemq.commands</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
@@ -492,17 +492,17 @@
<dependency>
<groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.binding.nmr</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.war</groupId>
<artifactId>org.apache.servicemix.war.deployer</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!--
<dependency>
@@ -939,7 +939,7 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/filtered-resources</directory>
+ <directory>${project.basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
@@ -1063,7 +1063,7 @@
<artifactItem>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>org.apache.servicemix.features.branding</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix-version.jar</destFileName>
</artifactItem>
@@ -1159,7 +1159,7 @@
<descriptors>
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
</descriptors>
- <finalName>${pom.artifactId}-${pom.version}</finalName>
+ <finalName>${project.artifactId}-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
@@ -1173,7 +1173,7 @@
<descriptors>
<descriptor>src/main/descriptors/windows-bin.xml</descriptor>
</descriptors>
- <finalName>${pom.artifactId}-${pom.version}</finalName>
+ <finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
</execution>
<execution>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml Wed Jun 30 03:23:08 2010
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
<packaging>pom</packaging>
- <version>${version}</version>
+ <version>${project.version}</version>
<name>Apache ServiceMix Examples</name>
<modules>
Modified: servicemix/smx4/features/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/branding/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/branding/pom.xml (original)
+++ servicemix/smx4/features/trunk/branding/pom.xml Wed Jun 30 03:23:08 2010
@@ -35,7 +35,7 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
@@ -48,7 +48,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
<Export-Package>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Wed Jun 30 03:23:08 2010
@@ -189,7 +189,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
<Export-Package>org.apache.servicemix.camel.nmr*</Export-Package>
</instructions>
Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Wed Jun 30 03:23:08 2010
@@ -93,7 +93,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.xml.stream;version="[0.0,2)",
*
@@ -101,7 +101,7 @@
<!-- Needed for jaxb annotations classes -->
<DynamicImport-Package>*</DynamicImport-Package>
<Export-Package>
- ${pom.artifactId}*,
+ ${project.artifactId}*,
'=META-INF.cxf.binding.nmr'
</Export-Package>
<Private-Package />
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Wed Jun 30 03:23:08 2010
@@ -85,7 +85,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.xml.bind*;version="[0.0,3)",
javax.activation;version="[0.0,2)",
@@ -96,7 +96,7 @@
<!-- Needed for jaxb annotations classes -->
<DynamicImport-Package>*</DynamicImport-Package>
<Export-Package>
- ${pom.artifactId}*,
+ ${project.artifactId}*,
org.apache.cxf.transports.nmr,
'=META-INF.cxf.transport.nmr'
</Export-Package>
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Wed Jun 30 03:23:08 2010
@@ -48,7 +48,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>org.apache.servicemix.camel.nmr,org.apache.servicemix.nmr.api,*</Import-Package>
<Private-Package>org.apache.servicemix.examples.camel</Private-Package>
</instructions>
Modified: servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -53,7 +53,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>*,org.apache.camel.osgi</Import-Package>
<Private-Package>org.apache.servicemix.examples.camel</Private-Package>
</instructions>
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Wed Jun 30 03:23:08 2010
@@ -58,7 +58,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,javax.wsdl,META-INF.cxf,META-INF.cxf.transport.nmr,
org.apache.cxf.bus,org.apache.servicemix.camel.nmr,
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Wed Jun 30 03:23:08 2010
@@ -59,7 +59,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.wsdl,
javax.xml.bind,
Modified: servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Wed Jun 30 03:23:08 2010
@@ -48,7 +48,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws, javax.wsdl,
META-INF.cxf,META-INF.cxf.transport.nmr,
Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -53,7 +53,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml Wed Jun 30 03:23:08 2010
@@ -81,7 +81,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-rm/pom.xml Wed Jun 30 03:23:08 2010
@@ -89,7 +89,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -61,7 +61,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.xml.bind.annotation,
Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/pom.xml Wed Jun 30 03:23:08 2010
@@ -52,7 +52,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/pom.xml Wed Jun 30 03:23:08 2010
@@ -85,7 +85,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml Wed Jun 30 03:23:08 2010
@@ -76,7 +76,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -76,7 +76,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -76,7 +76,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -76,7 +76,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -76,7 +76,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.wsdl,
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml Wed Jun 30 03:23:08 2010
@@ -59,7 +59,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.jws,
javax.xml.bind.annotation,
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Jun 30 03:23:08 2010
@@ -24,6 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
+ <relativePath>../servicemix-pom/pom.xml</relativePath>
<version>4</version>
</parent>
@@ -314,17 +315,6 @@
</repository>
<!-- Java.net repo -->
<repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
<id>java.net.2</id>
<name>Java Net 2 Repository</name>
<url>http://download.java.net/maven/2</url>
@@ -684,11 +674,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version>
</plugin>
@@ -709,6 +694,22 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+
</plugins>
</pluginManagement>
<plugins>
Modified: servicemix/smx4/features/trunk/war/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/deployer/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/deployer/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/deployer/pom.xml Wed Jun 30 03:23:08 2010
@@ -65,7 +65,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Jun 30 03:23:08 2010
@@ -23,6 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
+ <relativePath>../servicemix-pom/pom.xml</relativePath>
<version>4</version>
</parent>
Modified: servicemix/smx4/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/pom.xml?rev=959174&r1=959173&r2=959174&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/pom.xml (original)
+++ servicemix/smx4/specs/trunk/pom.xml Wed Jun 30 03:23:08 2010
@@ -24,6 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
+ <relativePath>../servicemix-pom/pom.xml</relativePath>
<version>3</version>
</parent>