You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/07 20:46:16 UTC
[04/10] git commit: Move depends plugin version defintion to parent
pom
Move depends plugin version defintion to parent pom
Conflicts:
services/xkms/xkms-itests/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/93008c9a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/93008c9a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/93008c9a
Branch: refs/heads/2.7.x-fixes
Commit: 93008c9afc3ce35cf1ed455eab02ef9a763dc24d
Parents: 57151f1
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 12 09:38:41 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 14:03:19 2014 -0400
----------------------------------------------------------------------
osgi/itests/pom.xml | 1 -
parent/pom.xml | 5 +++++
services/xkms/xkms-itests/pom.xml | 14 ++++++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/93008c9a/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 0d35084..58a1f55 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -99,7 +99,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
http://git-wip-us.apache.org/repos/asf/cxf/blob/93008c9a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 307f512..c9497dd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,6 +255,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/cxf/blob/93008c9a/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 0e1703f..e4b6239 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -112,6 +112,20 @@
<build>
<plugins>
+ <!-- generate dependency versions -->
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>