svn commit: r1513039 - in /gump/metadata: profile/gump.xml project/ant-contrib.xml project/ant.xml project/jakarta-bsf.xml project/tomcat-trunk.xml

[bo...@apache.org]

Author: bodewig
Date: Mon Aug 12 05:06:49 2013
New Revision: 1513039

URL: http://svn.apache.org/r1513039
Log:
more tweaks

Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/ant-contrib.xml
    gump/metadata/project/ant.xml
    gump/metadata/project/jakarta-bsf.xml
    gump/metadata/project/tomcat-trunk.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1513039&r1=1513038&r2=1513039&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Mon Aug 12 05:06:49 2013
@@ -90,7 +90,6 @@
   <module href="project/xml-stylebook.xml"/>
   <module href="project/xml-xalan.xml"/>
   <module href="project/xml-xerces2.xml"/>
-  <module href="project/xml-xmlbeans.xml"/>
 
 <!-- Apache XML Graphics -->
 
@@ -117,7 +116,6 @@
   <module href="project/jdepend.xml"/>
   <module href="project/jsch.xml"/>
   <module href="project/packaged-jaxen.xml"/>
-  <module href="project/rhino.xml"/>
   <module href="project/xz-java.xml"/>
 
 <!-- Sun -->
@@ -185,7 +183,6 @@
   <project name="javax.transaction.jta"
                                    package="jta-spec1_0_1"/>
   <project name="jta"              package="jta-spec1_0_1"/>
-  <project name="jtidy"            package="jtidy" />
   <project name="ldap"             package="ldap-1_2_4"/>
   <project name="oro"              package="apache-attic"/>
   <project name="packaged-jaxen"   package="jaxen-1.1-beta-6"/>
@@ -199,6 +196,7 @@
   <repository href="repository/asf.xml"/>
   <repository href="repository/eclipse.xml"/>
   <repository href="repository/github.xml" />
+  <repository href="repository/google-guava.xml" />
   <repository href="repository/hamcrest.xml"/>
   <repository href="repository/javanet.svn.xml"/>
   <repository href="repository/javanet.xml"/>

Modified: gump/metadata/project/ant-contrib.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant-contrib.xml?rev=1513039&r1=1513038&r2=1513039&view=diff
==============================================================================
--- gump/metadata/project/ant-contrib.xml (original)
+++ gump/metadata/project/ant-contrib.xml Mon Aug 12 05:06:49 2013
@@ -32,10 +32,12 @@
     </ant>
 
     <depend project="ant" inherit="runtime"/>
+    <depend project="commons-httpclient" inherit="runtime"/>
     <depend project="xml-apis"/>
     <depend project="xml-xerces"/>
     <depend project="bcel" runtime="true"/>
     <depend project="ant-contrib-private-ivy"/>
+    <depend project="ant-contrib-private-ivy2"/>
 
     <jar name="target/ant-contrib-@@DATE@@.jar" id="ant-contrib"/>
     <license name="docs/LICENSE.txt"/>
@@ -45,4 +47,8 @@
     <jar name="lib/ivy/jars/ivy-1.4.1.jar"/>
   </project>
 
+  <project name="ant-contrib-private-ivy2">
+    <jar name="lib/ivy/jars/ivy-2.0.0.jar"/>
+  </project>
+
 </module>

Modified: gump/metadata/project/ant.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant.xml?rev=1513039&r1=1513038&r2=1513039&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant.xml Mon Aug 12 05:06:49 2013
@@ -183,7 +183,6 @@
     
     <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
     <option project="xml-commons-which"/>
-    <option project="rhino"/>
     <option project="bsh"/>
     <option project="commons-codec"/>
 

Modified: gump/metadata/project/jakarta-bsf.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-bsf.xml?rev=1513039&r1=1513038&r2=1513039&view=diff
==============================================================================
--- gump/metadata/project/jakarta-bsf.xml (original)
+++ gump/metadata/project/jakarta-bsf.xml Mon Aug 12 05:06:49 2013
@@ -39,7 +39,6 @@
     <depend project="commons-logging"/>
     <depend project="logging-log4j-12"/>
 
-    <option project="rhino"/>
     <option project="xalan"/>
 
     <work nested="build/classes"/>

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1513039&r1=1513038&r2=1513039&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Mon Aug 12 05:06:49 2013
@@ -27,7 +27,6 @@
 
   <svn repository="asf" dir="tomcat/trunk"/>
 
-  <mkdir dir="tomcat-deps" />
   <project name="tomcat-trunk">
     <package>org.apache.catalina</package>
     <ant>
@@ -56,6 +55,7 @@
       The *-dbcp project is also built before this one, see above. -->
     <option project="tomcat-trunk-validate"><noclasspath/></option>
     <option project="tomcat-trunk-validate-eoln"><noclasspath/></option>
+    <mkdir dir="tomcat-deps" />
     <work nested="output/classes" />
 
     <license name="LICENSE" />
@@ -129,6 +129,7 @@
    <depend project="commons-logging" />
    <depend project="commons-collections" />
    <depend project="antlr" />
+   <depend project="google-guava"/>
    <!-- depend project="emma" / -->
    <!--
    <depend project="jdom" />