You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/02/03 10:21:16 UTC
svn commit: r1066767 - in /aries/trunk/quiesce: pom.xml
quiesce-manager-itest/pom.xml quiesce-manager/pom.xml
Author: zoe
Date: Thu Feb 3 09:21:16 2011
New Revision: 1066767
URL: http://svn.apache.org/viewvc?rev=1066767&view=rev
Log:
ARIES-562 Fix quiesce poms so that dependency versions are all in top level.
Modified:
aries/trunk/quiesce/pom.xml
aries/trunk/quiesce/quiesce-manager-itest/pom.xml
aries/trunk/quiesce/quiesce-manager/pom.xml
Modified: aries/trunk/quiesce/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/pom.xml?rev=1066767&r1=1066766&r2=1066767&view=diff
==============================================================================
--- aries/trunk/quiesce/pom.xml (original)
+++ aries/trunk/quiesce/pom.xml Thu Feb 3 09:21:16 2011
@@ -20,7 +20,6 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>0.3-SNAPSHOT</version>
- <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,6 +42,24 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <!-- internal dependencies on other Aries modules -->
+ <groupId>org.apache.aries.quiesce</groupId>
+ <artifactId>org.apache.aries.quiesce.api</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.quiesce</groupId>
+ <artifactId>org.apache.aries.quiesce.manager</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.quiesce</groupId>
+ <artifactId>org.apache.aries.quiesce.manager.itest</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+
+ <!-- dependencies on other Aries modules -->
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>0.3-SNAPSHOT</version>
@@ -53,6 +70,7 @@
<version>0.3-SNAPSHOT</version>
</dependency>
+ <!-- external dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
@@ -68,6 +86,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Modified: aries/trunk/quiesce/quiesce-manager-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager-itest/pom.xml?rev=1066767&r1=1066766&r2=1066767&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager-itest/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager-itest/pom.xml Thu Feb 3 09:21:16 2011
@@ -32,13 +32,11 @@
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<scope>provided</scope>
- <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.manager</artifactId>
<scope>provided</scope>
- <version>${version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -80,7 +78,7 @@
<artifactId>pax-url-mvn</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
Modified: aries/trunk/quiesce/quiesce-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager/pom.xml?rev=1066767&r1=1066766&r2=1066767&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager/pom.xml Thu Feb 3 09:21:16 2011
@@ -54,8 +54,6 @@
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
- <scope>provided</scope>
- <version>${version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>