Author: gertv
Date: Wed Oct 20 20:48:20 2010
New Revision: 1025715
URL: http://svn.apache.org/viewvc?rev=1025715&view=rev
Log:
Fix components build with Maven 3
Modified:
servicemix/components/components-pom/trunk/pom.xml
Modified: servicemix/components/components-pom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=1025715&r1=1025714&r2=1025715&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Wed Oct 20 20:48:20 2010
@@ -23,6 +23,7 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
<version>4</version>
+ <relativePath>../../servicemix-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -487,10 +488,15 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <version>${pax-exam-version}</version>
- </plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <version>${pax-exam-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -601,7 +607,7 @@
<configuration>
<instructions>
<Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${servicemix.osgi.export}</Export-Package>
<Import-Package>${servicemix.osgi.import}</Import-Package>
<DynamicImport-Package>${servicemix.osgi.dynamic.import}</DynamicImport-Package>
@@ -698,18 +704,7 @@
<profile>
<id>release</id>
<build>
- <plugins>
- <!-- We want to deploy the artifact to a staging location for
perusal -->
- <plugin>
- <inherited>true</inherited>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
- <configuration>
-
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
- <!-- We want to sign the artifact, the POM, and all attached
artifacts -->
+ <plugins> <!-- We want to sign the artifact, the POM, and all
attached artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
