Author: jbonofre
Date: Tue Sep 6 09:44:39 2011
New Revision: 1165580
URL: http://svn.apache.org/viewvc?rev=1165580&view=rev
Log:
[KARAF-851] Upgrade and cleanup Maven plugins
Modified:
karaf/trunk/deployer/kar/pom.xml
karaf/trunk/manual/pom.xml
karaf/trunk/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/pom.xml
karaf/trunk/webconsole/admin/pom.xml
Modified: karaf/trunk/deployer/kar/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1165580&r1=1165579&r2=1165580&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Tue Sep 6 09:44:39 2011
@@ -58,11 +58,6 @@
<artifactId>spring-osgi-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
Modified: karaf/trunk/manual/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1165580&r1=1165579&r2=1165580&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Tue Sep 6 09:44:39 2011
@@ -132,7 +132,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<id>add-source</id>
@@ -146,6 +145,21 @@
</sources>
</configuration>
</execution>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>install</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${manual}.html</file>
+ <type>html</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -291,28 +305,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>install</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${manual}.html</file>
- <type>html</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
<configuration>
@@ -444,7 +436,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<id>attach-artifacts</id>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1165580&r1=1165579&r2=1165580&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Sep 6 09:44:39 2011
@@ -128,7 +128,7 @@
<felix.fileinstall.version>3.1.10</felix.fileinstall.version>
<felix.framework.version>3.2.2</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>
@@ -1182,13 +1182,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-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
<configuration>
<outputDirectory>${basedir}/eclipse-classes</outputDirectory>
<downloadSources>true</downloadSources>
@@ -1198,7 +1213,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -1232,7 +1247,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1310,7 +1325,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
@@ -1323,7 +1338,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -1334,7 +1348,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -1355,8 +1368,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<goals>
@@ -1402,7 +1415,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1412,17 +1425,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
</plugin>
</plugins>
</reporting>
@@ -1477,9 +1490,9 @@
<plugins>
<!-- 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.5</version>
+ <inherited>true</inherited>
<configuration>
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
@@ -1487,8 +1500,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.2</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -1564,7 +1577,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -1577,7 +1589,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<configuration>
<source>1.5</source>
</configuration>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1165580&r1=1165579&r2=1165580&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Tue Sep 6 09:44:39 2011
@@ -29,10 +29,10 @@
<artifactId>karaf-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Apache Karaf :: Tooling :: Maven3 Karaf Plugin</name>
+ <name>Apache Karaf :: Tooling :: Maven Karaf Plugin</name>
<description>
- A Maven 3 plugin for working with karaf.
+ A Maven plugin for working with karaf.
</description>
<properties>
@@ -40,12 +40,11 @@
</properties>
<dependencies>
- <!-- Aether resolver support -->
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.0.3</version>
- <!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
@@ -61,19 +60,16 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0.3</version>
- <!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.0.3</version>
- <!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.0.3</version>
- <!--<scope>provided</scope>-->
</dependency>
@@ -81,11 +77,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.maven</groupId>-->
- <!--<artifactId>maven-project</artifactId>-->
- <!--<version>3.0.3</version>-->
- <!--</dependency>-->
+
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
@@ -147,6 +139,10 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
</dependency>
Modified: karaf/trunk/webconsole/admin/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1165580&r1=1165579&r2=1165580&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Tue Sep 6 09:44:39 2011
@@ -58,11 +58,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
