gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1207089 - in /gump/metadata/project: castor.xml commons-proper.xml directory-junit-addon.xml doxia.xml james-imap.xml james-jsieve.xml logging-log4j-2.xml mina.xml pdfbox.xml ws-commons.xml
Date Mon, 28 Nov 2011 11:36:17 GMT
Author: bodewig
Date: Mon Nov 28 11:36:15 2011
New Revision: 1207089

URL: http://svn.apache.org/viewvc?rev=1207089&view=rev
Log:
adapt build order to what is downloaded by mvn

Modified:
    gump/metadata/project/castor.xml
    gump/metadata/project/commons-proper.xml
    gump/metadata/project/directory-junit-addon.xml
    gump/metadata/project/doxia.xml
    gump/metadata/project/james-imap.xml
    gump/metadata/project/james-jsieve.xml
    gump/metadata/project/logging-log4j-2.xml
    gump/metadata/project/mina.xml
    gump/metadata/project/pdfbox.xml
    gump/metadata/project/ws-commons.xml

Modified: gump/metadata/project/castor.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/castor.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/castor.xml (original)
+++ gump/metadata/project/castor.xml Mon Nov 28 11:36:15 2011
@@ -44,11 +44,12 @@
     </mvn2>
     <!-- this is the stuff downloaded by mvn -->
     <option project="commons-httpclient"/>
+    <option project="commons-lang"/>
     <option project="commons-logging"/>
     <option project="jdom"/>
     <option project="junit"/>
     <option project="logging-log4j-12"/>
-    <option project="commons-lang"/>
+    <option project="slf4j"/>
     <jar name="core/target/castor-core-*[0-9T].jar"/>
   </project>
 
@@ -70,17 +71,18 @@
     </mvn2>
     <option project="castor-core"/>
     <!-- this is the stuff downloaded by mvn -->
+    <option project="ant" inherit="runtime"/>
+    <option project="commons-cli"/>
     <option project="commons-httpclient"/>
     <option project="commons-io"/>
+    <option project="commons-lang"/>
     <option project="commons-logging"/>
+    <option project="ivy"/>
+    <option project="jakarta-regexp"/>
     <option project="jdom"/>
     <option project="junit"/>
     <option project="logging-log4j-12"/>
-    <option project="commons-lang"/>
-    <option project="jakarta-regexp"/>
-    <option project="ant" inherit="runtime"/>
-    <option project="commons-cli"/>
-    <option project="ivy"/>
+    <option project="objenesis"/>
     <jar name="xml/target/castor-xml-*[0-9T].jar"/>
   </project>
 

Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Mon Nov 28 11:36:15 2011
@@ -366,6 +366,8 @@
     <option project="commons-collections"/>
     <option project="commons-lang"/>
     <option project="junit"/>
+    <option project="mockito"/>
+    <option project="objenesis"/>
     <option project="velocity-engine"/>
     <option project="xpp"/>
 
@@ -618,6 +620,7 @@
     <option project="xml-apis"/>
     <option project="xml-xerces"/>
 
+    <option project="commons-chain"/>
     <option project="commons-collections"/>
     <option project="commons-configuration"/>
     <option project="commons-dbcp"/>
@@ -708,6 +711,7 @@
     <option project="commons-collections"/>
     <option project="commons-lang"/>
     <option project="junit"/>
+    <option project="objenesis"/>
     <option project="org.apache.ant"/>
     <option project="velocity-engine"/>
     <option project="xpp"/>

Modified: gump/metadata/project/directory-junit-addon.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-junit-addon.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/directory-junit-addon.xml (original)
+++ gump/metadata/project/directory-junit-addon.xml Mon Nov 28 11:36:15 2011
@@ -30,6 +30,7 @@
     <pom name="pom.xml" id="directory-junit-addons"/>
     <mvn3install artifactId="directory-junit-addons"/>
     <option project="junit"/>
+    <option project="xpp"/>
   </project>
 
   <project name="directory-junit-addons">

Modified: gump/metadata/project/doxia.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/doxia.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/doxia.xml (original)
+++ gump/metadata/project/doxia.xml Mon Nov 28 11:36:15 2011
@@ -35,7 +35,9 @@
     <depend project="doxia-parent"/>
     <mvn2 separateLocalRepository="doxia" goal="install"
          basedir="doxia/doxia-core"/>
-    <option project="commons-httpclient"/>
+    <!-- causes a circular dependency
+    <option project="httpcomponents-client"/>
+    -->
     <option project="commons-lang"/>
     <option project="doxia-logging-api"/>
     <option project="doxia-sink-api"/>
@@ -144,6 +146,9 @@
     <mvn2 separateLocalRepository="doxia" goal="install"
          basedir="doxia-sitetools/doxia-decoration-model"/>
     <option project="doxia-core"/>
+    <!-- causes a circular dependency
+    <option project="slf4j"/>
+    -->
     <jar name="doxia-sitetools/doxia-decoration-model/target/doxia-decoration-model-*[0-9T].jar"/>
   </project>
 
@@ -153,6 +158,7 @@
          basedir="doxia-sitetools/doxia-site-renderer">
       <property name="skipTests" value="true"/>
     </mvn2>
+    <option project="commons-chain"/>
     <option project="commons-collections"/>
     <option project="doxia-core"/>
     <option project="doxia-decoration-model"/>

Modified: gump/metadata/project/james-imap.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/james-imap.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/james-imap.xml (original)
+++ gump/metadata/project/james-imap.xml Mon Nov 28 11:36:15 2011
@@ -69,6 +69,7 @@
 
   <project name="james-imap-test">
     <depend project="james-imap"/>
+    <option project="commons-email"/>
     <mvn3 goal="test"/>
   </project>
 

Modified: gump/metadata/project/james-jsieve.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/james-jsieve.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/james-jsieve.xml (original)
+++ gump/metadata/project/james-jsieve.xml Mon Nov 28 11:36:15 2011
@@ -35,6 +35,7 @@
       <property name="maven.test.skip" value="true"/>
     </mvn3>
     <option project="commons-logging"/>
+    <option project="httpcomponents-client"/>
     <option project="jaf"/>
     <option project="javamail" id="javamail"/>
     <option project="junit"/>

Modified: gump/metadata/project/logging-log4j-2.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/logging-log4j-2.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/logging-log4j-2.xml (original)
+++ gump/metadata/project/logging-log4j-2.xml Mon Nov 28 11:36:15 2011
@@ -31,6 +31,7 @@
 
     <option project="doxia-site-renderer"/>
     <option project="junit"/>
+    <option project="slf4j"/>
     <option project="velocity-engine"/>
 
     <nag to="rgoers@apache.org"

Modified: gump/metadata/project/mina.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/mina.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/mina.xml (original)
+++ gump/metadata/project/mina.xml Mon Nov 28 11:36:15 2011
@@ -40,13 +40,16 @@
     </mvn2>
 
     <option project="ant"/>
+    <option project="ant-contrib"/>
     <option project="cglib"/>
     <option project="commons-net" />
+    <!-- causes a circular dependency
+    <option project="shared-ldap-codec-core"/>
+    -->
+    <option project="jakarta-tomcat-jni"/>
+    <option project="jsse"/> 
     <option project="junit" />
     <option project="slf4j" ids="slf4j-simple"/>
-    <option project="jsse"/> 
-    <option project="ant-contrib"/>
-    <option project="jakarta-tomcat-jni"/>
     <depend project="mina-core"/>
 
   </project>
@@ -55,6 +58,15 @@
     <mvn2 basedir="core" separateLocalRepository="mina">
       <property name="maven.test.skip.exec" value="true"/>
     </mvn2>
+    <option project="ant"/>
+    <option project="asm"/>
+    <option project="commons-validator"/>
+    <option project="doxia-core"/>
+    <option project="junit"/>
+    <option project="logging-log4j"/>
+    <option project="mockito"/>
+    <option project="slf4j"/>
+    <option project="xpp"/>
     <jar name="core/target/mina-core-*[0-9T].jar"/>
   </project>
 

Modified: gump/metadata/project/pdfbox.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/pdfbox.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/pdfbox.xml (original)
+++ gump/metadata/project/pdfbox.xml Mon Nov 28 11:36:15 2011
@@ -37,6 +37,7 @@
     <depend project="pdfbox-parent"/>
     <mvn2 basedir="fontbox"/>
     <option project="junit"/>
+    <option project="tika-core"/>
     <jar name="fontbox/target/fontbox-*[0-9T].jar"/>
     <license name="LICENSE.txt"/>
   </project>

Modified: gump/metadata/project/ws-commons.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ws-commons.xml?rev=1207089&r1=1207088&r2=1207089&view=diff
==============================================================================
--- gump/metadata/project/ws-commons.xml (original)
+++ gump/metadata/project/ws-commons.xml Mon Nov 28 11:36:15 2011
@@ -57,6 +57,9 @@
           separateLocalRepository="ws-commons"/>
     <jar name="axiom/modules/axiom-buildutils/target/axiom-buildutils-*[0-9T].jar"/>
     <pom name="axiom/modules/axiom-buildutils/pom.xml"/>
+    <option project="commons-validator"/>
+    <option project="doxia-core"/>
+    <option project="slf4j"/>
   </project>
 
   <project name="axiom-api" groupId="org.apache.ws.commons.axiom">
@@ -231,6 +234,9 @@
     <jar name="axiom/modules/shade-plugin-patched/target/shade-plugin-patched-*[0-9T].jar"
          id="shade-plugin-patched"/>
     <pom name="axiom/modules/shade-plugin-patched/pom.xml"/>
+    <option project="commons-validator"/>
+    <option project="commons-compress"/>
+    <option project="rat"/>
   </project>
 
   <project name="ws-commons-axiom" groupId="org.apache.ws.commons.axiom">



Mime
View raw message