Author: dkulp
Date: Tue Jan 24 15:54:34 2012
New Revision: 1235315
URL: http://svn.apache.org/viewvc?rev=1235315&view=rev
Log:
Fix warning when using Maven 3
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/felix/shell.tui/pom.xml
cxf/dosgi/trunk/pom.xml
cxf/dosgi/trunk/samples/discovery/client/pom.xml
cxf/dosgi/trunk/samples/discovery/impl/pom.xml
cxf/dosgi/trunk/samples/discovery/interface/pom.xml
cxf/dosgi/trunk/samples/ds/client/pom.xml
cxf/dosgi/trunk/samples/ds/impl/pom.xml
cxf/dosgi/trunk/samples/ds/interface/pom.xml
cxf/dosgi/trunk/samples/security_filter/pom.xml
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Tue Jan 24 15:54:34 2012
@@ -335,9 +335,27 @@
<outputDirectory>${project.build.directory}/distribution_bundles</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.2.0</version>
+ <type>jar</type>
+ <outputDirectory>target/deps</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
-
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -357,30 +375,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <type>jar</type>
- <outputDirectory>target/deps</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Modified: cxf/dosgi/trunk/felix/shell.tui/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/shell.tui/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/shell.tui/pom.xml (original)
+++ cxf/dosgi/trunk/felix/shell.tui/pom.xml Tue Jan 24 15:54:34 2012
@@ -54,6 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<excludes>**/*.java</excludes>
</configuration>
@@ -61,6 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<excludes>
<exclude>**/*.java</exclude>
Modified: cxf/dosgi/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/pom.xml (original)
+++ cxf/dosgi/trunk/pom.xml Tue Jan 24 15:54:34 2012
@@ -157,6 +157,11 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <version>1.2.4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -166,6 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.9</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
Modified: cxf/dosgi/trunk/samples/discovery/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/client/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/client/pom.xml Tue Jan 24 15:54:34 2012
@@ -56,7 +56,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the client-side
implementation of the Distributed OSGi Discovery sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.consumer.Activator</Bundle-Activator>
Modified: cxf/dosgi/trunk/samples/discovery/impl/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/pom.xml Tue Jan 24 15:54:34 2012
@@ -56,7 +56,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the server-side
implementation of the Distributed OSGi Discovery sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.impl.Activator</Bundle-Activator>
Modified: cxf/dosgi/trunk/samples/discovery/interface/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/interface/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/interface/pom.xml Tue Jan 24 15:54:34 2012
@@ -38,7 +38,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the interfaces of the
Distributed OSGi Discovery sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package />
Modified: cxf/dosgi/trunk/samples/ds/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/client/pom.xml Tue Jan 24 15:54:34 2012
@@ -51,7 +51,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the client-side
implementation of the Distributed OSGi with Declarative Services
sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.cxf.dosgi.samples.ds.consumer.Activator</Bundle-Activator>
Modified: cxf/dosgi/trunk/samples/ds/impl/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/impl/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/impl/pom.xml Tue Jan 24 15:54:34 2012
@@ -45,7 +45,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the server-side
implementation of the Distributed OSGi with Declarative Services
sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>org.apache.cxf.dosgi.samples.ds</Import-Package>
Modified: cxf/dosgi/trunk/samples/ds/interface/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/interface/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/interface/pom.xml Tue Jan 24 15:54:34 2012
@@ -38,7 +38,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the interfaces of the
Distributed OSGi with Declarative Services sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package />
Modified: cxf/dosgi/trunk/samples/security_filter/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/pom.xml?rev=1235315&r1=1235314&r2=1235315&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/pom.xml (original)
+++ cxf/dosgi/trunk/samples/security_filter/pom.xml Tue Jan 24 15:54:34 2012
@@ -63,7 +63,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains an example Distributed
OSGi endpoint that passes requests through a security
filter.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.cxf.dosgi.samples.security</Private-Package>
