You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/11/27 13:17:01 UTC
karaf git commit: [KARAF-3380] Restore compatibility with maven 3.0.x
Repository: karaf
Updated Branches:
refs/heads/master c5ca124eb -> dde0339d1
[KARAF-3380] Restore compatibility with maven 3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dde0339d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dde0339d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dde0339d
Branch: refs/heads/master
Commit: dde0339d1caff13134808b68b2bf0b6ec9f0249c
Parents: c5ca124
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Nov 27 13:16:45 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Nov 27 13:16:45 2014 +0100
----------------------------------------------------------------------
tooling/karaf-maven-plugin/pom.xml | 12 ++++++++++--
tooling/karaf-services-maven-plugin/pom.xml | 20 ++++++++++++++++----
2 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dde0339d/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index c72fc35..5e5949a 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -241,17 +241,25 @@
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <executions>
+ <execution>
+ <id>default-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+
<reporting>
<!--<outputDirectory>target/site</outputDirectory>-->
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dde0339d/tooling/karaf-services-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml
index 6b4e6c2..b7f9581 100644
--- a/tooling/karaf-services-maven-plugin/pom.xml
+++ b/tooling/karaf-services-maven-plugin/pom.xml
@@ -134,16 +134,28 @@
</dependency>
</dependencies>
- <reporting>
- <!--<outputDirectory>target/site</outputDirectory>-->
+ <build>
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
+ <executions>
+ <execution>
+ <id>default-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
</plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <!--<outputDirectory>target/site</outputDirectory>-->
+ <plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
</plugin>
</plugins>
</reporting>