Author: jbonofre
Date: Tue Sep 6 10:05:59 2011
New Revision: 1165584
URL: http://svn.apache.org/viewvc?rev=1165584&view=rev
Log:
[KARAF-851] Upgrade and cleanup Maven plugins
Modified:
karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml
karaf/branches/karaf-2.2.x/pom.xml
karaf/branches/karaf-2.2.x/webconsole/console/pom.xml
Modified: karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml?rev=1165584&r1=1165583&r2=1165584&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/branding/shell/pom.xml Tue Sep 6 10:05:59
2011
@@ -34,7 +34,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 @@
<extensions>true</extensions>
<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: karaf/branches/karaf-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1165584&r1=1165583&r2=1165584&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Tue Sep 6 10:05:59 2011
@@ -125,7 +125,7 @@
<felix.fileinstall.version>3.1.10</felix.fileinstall.version>
<felix.framework.version>3.0.9</felix.framework.version>
<felix.gogo.version>0.6.1</felix.gogo.version>
- <felix.plugin.version>2.3.4</felix.plugin.version>
+ <felix.plugin.version>2.3.5</felix.plugin.version>
<felix.utils.version>1.1.0</felix.utils.version>
<felix.webconsole.version>3.1.8</felix.webconsole.version>
<felix.metatype.version>1.0.4</felix.metatype.version>
@@ -1023,8 +1023,28 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<configuration>
<outputDirectory>${basedir}/eclipse-classes</outputDirectory>
<downloadSources>true</downloadSources>
@@ -1034,7 +1054,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2.1</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -1059,7 +1079,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
@@ -1068,17 +1088,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
@@ -1088,7 +1108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1108,7 +1128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1121,7 +1141,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -1130,8 +1149,8 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<goals>
@@ -1195,27 +1214,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
</plugins>
</reporting>
@@ -1281,7 +1300,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -1303,9 +1321,9 @@
</plugin>
<!-- We want to deploy the artifact to a staging location
for perusal -->
<plugin>
- <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
+ <inherited>true</inherited>
<configuration>
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
@@ -1313,8 +1331,8 @@
</plugin>
<!-- We want to sign the artifact, the POM, and all
attached artifacts -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Modified: karaf/branches/karaf-2.2.x/webconsole/console/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/console/pom.xml?rev=1165584&r1=1165583&r2=1165584&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/console/pom.xml Tue Sep 6 10:05:59
2011
@@ -108,7 +108,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Bundle-Vendor>
The Apache Software Foundation
