gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r943429 - in /gump/metadata/project: directory-apacheds.xml directory-shared.xml jetty-parent.xml jetty.xml
Date Wed, 12 May 2010 10:17:47 GMT
Author: bodewig
Date: Wed May 12 10:17:47 2010
New Revision: 943429

URL: http://svn.apache.org/viewvc?rev=943429&view=rev
Log:
depend/option in a project without a builder doesn't influence the build order, so it seems.
 Move dependencies to basic projects in project families of apacheds, directory-shared and
jetty.

Modified:
    gump/metadata/project/directory-apacheds.xml
    gump/metadata/project/directory-shared.xml
    gump/metadata/project/jetty-parent.xml
    gump/metadata/project/jetty.xml

Modified: gump/metadata/project/directory-apacheds.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-apacheds.xml?rev=943429&r1=943428&r2=943429&view=diff
==============================================================================
--- gump/metadata/project/directory-apacheds.xml (original)
+++ gump/metadata/project/directory-apacheds.xml Wed May 12 10:17:47 2010
@@ -27,25 +27,6 @@
 
   <project name="apacheds-parent">
     <jar name="pom.xml"/>
-
-    <!-- dependencies defined inside parent pom
-         (there also is a bunch of stuff we don't build, yet) -->
-    <option project="antlr"/>
-    <option project="commons-cli"/>
-    <option project="commons-collections"/>
-    <option project="commons-daemon"/>
-    <option project="commons-dbcp"/>
-    <option project="commons-io"/>
-    <option project="commons-lang"/>
-    <option project="commons-net"/>
-    <option project="commons-pool"/>
-    <option project="junit"/>
-    <option project="logging-log4j-12"/>
-    <option project="mina"/>
-    <option project="shared-all"/>
-    <option project="slf4j"/>
-    <option project="velocity-engine"/>
-    <option project="xml-xerces"/>
   </project>
 
   <project name="apacheds-all">
@@ -153,6 +134,25 @@
 
     <mvn goal="install" basedir="core-constants"/>
     <jar name="core-constants/target/apacheds-core-constants-*[0-9T].jar"/>
+
+    <!-- dependencies defined inside parent pom
+         (there also is a bunch of stuff we don't build, yet) -->
+    <option project="antlr"/>
+    <option project="commons-cli"/>
+    <option project="commons-collections"/>
+    <option project="commons-daemon"/>
+    <option project="commons-dbcp"/>
+    <option project="commons-io"/>
+    <option project="commons-lang"/>
+    <option project="commons-net"/>
+    <option project="commons-pool"/>
+    <option project="junit"/>
+    <option project="logging-log4j-12"/>
+    <option project="mina"/>
+    <option project="shared-all"/>
+    <option project="slf4j"/>
+    <option project="velocity-engine"/>
+    <option project="xml-xerces"/>
   </project>
 
   <project name="apacheds-core-annotations">

Modified: gump/metadata/project/directory-shared.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-shared.xml?rev=943429&r1=943428&r2=943429&view=diff
==============================================================================
--- gump/metadata/project/directory-shared.xml (original)
+++ gump/metadata/project/directory-shared.xml Wed May 12 10:17:47 2010
@@ -27,21 +27,6 @@
 
   <project name="shared-parent">
     <jar name="pom.xml"/>
-    <!-- dependencies defined inside the parent POM -->
-    <option project="antlr"/>
-    <option project="commons-collections"/>
-    <option project="commons-io"/>
-    <option project="commons-lang"/>
-    <option project="commons-pool"/>
-    <option project="dom4j"/>
-    <option project="junit"/>
-    <option project="logging-log4j-12"/>
-    <option project="mina"/>
-    <option project="slf4j"/>
-    <option project="xpp"/>
-
-    <!-- needed since mvn is going to download it -->
-    <option project="velocity-engine"/>
   </project>
 
   <project name="shared-all">
@@ -115,6 +100,22 @@
     <depend project="shared-parent"/>
 
     <jar name="i18n/target/shared-i18n-*[0-9T].jar"/>
+
+    <!-- dependencies defined inside the parent POM -->
+    <option project="antlr"/>
+    <option project="commons-collections"/>
+    <option project="commons-io"/>
+    <option project="commons-lang"/>
+    <option project="commons-pool"/>
+    <option project="dom4j"/>
+    <option project="junit"/>
+    <option project="logging-log4j-12"/>
+    <option project="mina"/>
+    <option project="slf4j"/>
+    <option project="xpp"/>
+
+    <!-- needed since mvn is going to download it -->
+    <option project="velocity-engine"/>
   </project>
 
   <project name="shared-ldap">
@@ -194,6 +195,22 @@
     <depend project="shared-parent"/>
 
     <jar name="ldap-schema-dao/target/shared-ldap-schema-dao-*[0-9T].jar"/>
+
+    <!-- dependencies defined inside the parent POM -->
+    <option project="antlr"/>
+    <option project="commons-collections"/>
+    <option project="commons-io"/>
+    <option project="commons-lang"/>
+    <option project="commons-pool"/>
+    <option project="dom4j"/>
+    <option project="junit"/>
+    <option project="logging-log4j-12"/>
+    <option project="mina"/>
+    <option project="slf4j"/>
+    <option project="xpp"/>
+
+    <!-- needed since mvn is going to download it -->
+    <option project="velocity-engine"/>
   </project>
 
   <project name="shared-ldap-schema-loader">

Modified: gump/metadata/project/jetty-parent.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jetty-parent.xml?rev=943429&r1=943428&r2=943429&view=diff
==============================================================================
--- gump/metadata/project/jetty-parent.xml (original)
+++ gump/metadata/project/jetty-parent.xml Wed May 12 10:17:47 2010
@@ -26,10 +26,5 @@
   
   <project name="jetty-parent">
     <jar name="pom.xml"/>
-
-    <!-- enough to have most of maven's dependencies around -->
-    <option project="commons-logging"/>
-    <option project="slf4j"/>
-    <option project="velocity-engine"/>
   </project>
 </module>

Modified: gump/metadata/project/jetty.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jetty.xml?rev=943429&r1=943428&r2=943429&view=diff
==============================================================================
--- gump/metadata/project/jetty.xml (original)
+++ gump/metadata/project/jetty.xml Wed May 12 10:17:47 2010
@@ -27,13 +27,6 @@
 
   <project name="jetty-project">
     <jar name="pom.xml"/>
-
-    <option project="jaf"/>
-    <option project="javamail"/>
-    <option project="javax.servlet"/>
-    <option project="junit"/>
-    <option project="slf4j"/>
-
     <depend project="jetty-parent"/>
   </project>
 
@@ -346,7 +339,15 @@
     <mvn goal="install" basedir="jetty-start"/>
     <jar name="jetty-start/target/jetty-start-*[0-9T].jar"/>
 
+    <!-- enough to have most of maven's dependencies around -->
+    <option project="commons-logging"/>
+    <option project="velocity-engine"/>
+    <!-- dependencies defined inside parent POM -->
+    <option project="jaf"/>
+    <option project="javamail"/>
+    <option project="javax.servlet"/>
     <option project="junit"/>
+    <option project="slf4j"/>
   </project>
 
   <project name="jetty-util">
@@ -355,6 +356,13 @@
     <mvn goal="install" basedir="jetty-util"/>
     <jar name="jetty-util/target/jetty-util-*[0-9T].jar"/>
 
+    <!-- enough to have most of maven's dependencies around -->
+    <option project="commons-logging"/>
+    <option project="velocity-engine"/>
+    <!-- dependencies defined inside parent POM -->
+    <option project="jaf"/>
+    <option project="javamail"/>
+    <option project="javax.servlet"/>
     <option project="junit"/>
     <option project="slf4j"/>
   </project>



Mime
View raw message