You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gu...@apache.org on 2014/03/13 13:45:44 UTC
svn commit: r1577140 - in /felix/trunk/ipojo/manipulator:
bnd-ipojo-plugin/pom.xml ipojo-ant-task/pom.xml manipulator-it/pom.xml
maven-ipojo-plugin/pom.xml
Author: guillaume
Date: Thu Mar 13 12:45:43 2014
New Revision: 1577140
URL: http://svn.apache.org/r1577140
Log:
Use the manipulator BOM to harmonize dependencies' versions
Modified:
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml
Modified: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml?rev=1577140&r1=1577139&r2=1577140&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml Thu Mar 13 12:45:43 2014
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -55,6 +53,18 @@
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>ipojo-manipulator-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
Modified: felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml?rev=1577140&r1=1577139&r2=1577140&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml Thu Mar 13 12:45:43 2014
@@ -41,12 +41,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -64,6 +62,19 @@
<version>1.2</version>
</dependency>
</dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>ipojo-manipulator-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<resources>
<resource>
Modified: felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/pom.xml?rev=1577140&r1=1577139&r2=1577140&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/pom.xml Thu Mar 13 12:45:43 2014
@@ -49,6 +49,18 @@
<module>online-manipulator-it</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>ipojo-manipulator-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
@@ -200,7 +212,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml?rev=1577140&r1=1577139&r2=1577140&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml Thu Mar 13 12:45:43 2014
@@ -71,14 +71,25 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>ipojo-manipulator-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>