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/24 10:27:03 UTC
svn commit: r1074085 - in
/aries/branches/experimental-release-by-module/proxy: pom.xml
proxy-api/pom.xml proxy-bundle/pom.xml proxy-impl/pom.xml
proxy-itests/pom.xml proxy-parent/pom.xml
Author: zoe
Date: Thu Feb 24 09:27:02 2011
New Revision: 1074085
URL: http://svn.apache.org/viewvc?rev=1074085&view=rev
Log:
move internal dependencies to submodule poms
Modified:
aries/branches/experimental-release-by-module/proxy/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml
Modified: aries/branches/experimental-release-by-module/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/pom.xml?rev=1074085&r1=1074084&r2=1074085&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/pom.xml Thu Feb 24 09:27:02 2011
@@ -25,8 +25,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>proxy-group</artifactId>
- <name>Apache Aries Proxy Group</name>
+ <artifactId>proxy-module</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <name>Apache Aries Proxy Module</name>
<packaging>pom</packaging>
<description>
@@ -34,12 +35,13 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/experimental-release-by-module/proxy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/experimental-release-by-module/proxy</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/proxy-module-0.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/proxy-module-0.3</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/tags/proxy-module-0.3</url>
</scm>
<modules>
+ <!--Must be in dependency order (maven 2?) -->
<module>proxy-parent</module>
<module>proxy-api</module>
<module>proxy-impl</module>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml?rev=1074085&r1=1074084&r2=1074085&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml Thu Feb 24 09:27:02 2011
@@ -45,6 +45,7 @@
</properties>
<dependencies>
+ <!-- There should be no dependency version in this pom, all versions are in the module parent or default parent -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml?rev=1074085&r1=1074084&r2=1074085&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml Thu Feb 24 09:27:02 2011
@@ -49,6 +49,20 @@
</properties>
<dependencies>
+ <!--Internal module dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
+ <!-- Dependencies on other aries modules, versions specified in module parent -->
+
+ <!-- External dependencies, versions specified in module parent or default-parent -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -69,14 +83,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
- </dependency>
</dependencies>
</project>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml?rev=1074085&r1=1074084&r2=1074085&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml Thu Feb 24 09:27:02 2011
@@ -33,7 +33,7 @@
</description>
<properties>
- <aries.osgi.export.pkg/>
+ <aries.osgi.export.pkg />
<aries.osgi.activator>
org.apache.aries.proxy.impl.ProxyManagerActivator
</aries.osgi.activator>
@@ -48,6 +48,20 @@
</properties>
<dependencies>
+ <!-- Internal module dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- Dependencies on other aries modules, versions specified in module parent -->
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!-- External dependencies, versions specified in module parent or default-parent -->
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
@@ -82,16 +96,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml?rev=1074085&r1=1074084&r2=1074085&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml Thu Feb 24 09:27:02 2011
@@ -32,6 +32,20 @@
</description>
<dependencies>
+ <!-- Internal module dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Dependencies on other aries modules, versions specified in module parent -->
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- External dependencies, versions specified in module parent or default-parent -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -48,16 +62,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<scope>test</scope>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml?rev=1074085&r1=1074084&r2=1074085&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml Thu Feb 24 09:27:02 2011
@@ -37,27 +37,6 @@
<dependencyManagement>
<dependencies>
- <!-- internal dependencies -->
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.itests</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
<!-- dependencies on other aries modules -->
<dependency>
<groupId>org.apache.aries</groupId>
@@ -87,7 +66,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+<!--
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -95,6 +74,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+ -->
</project>