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/26 17:46:13 UTC

svn commit: r1074874 - in /aries/branches/experimental-release-by-module/proxy/proxy-distro: pom.xml src/main/assemblies/proxy-distro.xml

Author: zoe
Date: Sat Feb 26 16:46:13 2011
New Revision: 1074874

URL: http://svn.apache.org/viewvc?rev=1074874&view=rev
Log:
Switch to using dependencySets

Modified:
    aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml
    aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml

Modified: aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml?rev=1074874&r1=1074873&r2=1074874&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml Sat Feb 26 16:46:13 2011
@@ -38,13 +38,30 @@
     </scm>
 
 
-    <modules>
-        <module>../proxy-api</module>
-        <module>../proxy-impl</module>
-        <module>../proxy-bundle</module> 
-    </modules>
+    <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</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>0.4</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy.itests</artifactId>
+            <version>0.4</version>
+        </dependency>
+    </dependencies>
 
-	<build>
+    <build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>

Modified: aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml?rev=1074874&r1=1074873&r2=1074874&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml Sat Feb 26 16:46:13 2011
@@ -25,7 +25,17 @@
 
 	<includeBaseDirectory>false</includeBaseDirectory>
 
+    <dependencySets>
+      <dependencySet>
+      <includes>
+        <include>org.apache.aries.proxy*</include>
+      </includes>
+      <outputDirectory>apache-aries-proxy-${project.version}/bundles</outputDirectory>
+      </dependencySet>
+    </dependencySets>
+
     <!-- These two files are required to get the IANAL checks to pass. Maybe there is a better way? -->
+    <!--
     <files>
       <file>
         <source>../NOTICE</source>
@@ -57,5 +67,5 @@
             </binaries>
         </moduleSet>
     </moduleSets>
-    
+-->    
 </assembly>