You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2013/08/11 10:08:46 UTC
svn commit: r1512892 - in /gump/metadata: profile/ project/
Author: bodewig
Date: Sun Aug 11 08:08:45 2013
New Revision: 1512892
URL: http://svn.apache.org/r1512892
Log:
fix some of the build errors
Added:
gump/metadata/project/ant-contrib.xml (with props)
gump/metadata/project/apache-httpd.xml (with props)
gump/metadata/project/apr.xml (with props)
gump/metadata/project/junit3.xml (with props)
gump/metadata/project/pcre.xml (with props)
gump/metadata/project/rat.xml (with props)
Removed:
gump/metadata/project/jgroups.xml
Modified:
gump/metadata/profile/gump.xml
gump/metadata/project/ant.xml
gump/metadata/project/apache-attic.xml
gump/metadata/project/commons-proper.xml
gump/metadata/project/forrest.xml
gump/metadata/project/gump.xml
gump/metadata/project/poi.xml
gump/metadata/project/tomcat-tc7.xml
gump/metadata/project/tomcat-trunk.xml
gump/metadata/project/xml-fop.xml
Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Sun Aug 11 08:08:45 2013
@@ -22,6 +22,10 @@
<module href="project/ant.xml"/>
<module href="project/ant-antlibs.xml"/>
+<!-- Apache Attic -->
+
+ <module href="project/apache-attic.xml"/>
+
<!-- Apache.Commons -->
<module href="project/commons-proper.xml"/>
@@ -32,6 +36,10 @@
<module href="project/commons-lang-2.x.xml"/>
<module href="project/commons-pool-1.x.xml"/>
+<!-- Apache Creadur -->
+
+ <module href="project/rat.xml"/>
+
<!-- Apache Forrest -->
<module href="project/forrest.xml"/>
@@ -40,6 +48,11 @@
<module href="project/gump.xml"/>
+<!-- Apache.HTTPd -->
+
+ <module href="project/pcre.xml"/>
+ <module href="project/apache-httpd.xml"/>
+
<!-- Apache.Jakarta -->
<!--module href="project/jakarta-alexandria.xml"/-->
@@ -63,7 +76,10 @@
<!-- Apache.Logging -->
<module href="project/logging-log4j-12.xml"/>
- <!-- Apache Tika -->
+<!-- Apache Portable Runtime -->
+ <module href="project/apr.xml"/>
+
+ <!-- Apache Tika -->
<module href="project/tika.xml"/>
<!-- Apache.XML -->
@@ -81,17 +97,13 @@
<module href="project/xml-batik.xml"/>
<module href="project/xml-fop.xml"/>
-<!-- Apache Velocity -->
-
- <module href="project/apache-attic.xml"/>
-
<!-- SourceForge -->
+ <module href="project/ant-contrib.xml"/>
<module href="project/checkstyle.xml"/>
<module href="project/dnsjava.xml"/>
<module href="project/dumbster.xml"/>
<module href="project/fop-hyph.xml"/>
- <module href="project/jgroups.xml"/>
<module href="project/junit.xml"/>
<module href="project/xmlunit.xml"/>
@@ -99,8 +111,9 @@
<module href="project/antlr.xml"/>
<module href="project/javacc.xml"/>
- <module href="project/jsch.xml"/>
<module href="project/jdepend.xml"/>
+ <module href="project/jsch.xml"/>
+ <module href="project/junit3.xml"/>
<module href="project/packaged-jaxen.xml"/>
<module href="project/rhino.xml"/>
<module href="project/xz-java.xml"/>
@@ -153,7 +166,6 @@
<project name="javax.mail" package="javamail-1.4"/>
<project name="jaxp-12" package="java_xml_pack-summer-02_01"/>
<project name="jaxp" package="jaxp-1_3"/>
- <project name="jce" package="jce"/>
<project name="jdbc" package="jdbc2_0"/>
<project name="jdepend" package="jdepend-2.6"/>
<project name="jms" package="jms1.1"/>
@@ -169,6 +181,7 @@
package="jta-spec1_0_1"/>
<project name="jta" package="jta-spec1_0_1"/>
<project name="jtidy" package="jtidy" />
+ <project name="junit3" package="junit3.8.1"/>
<project name="ldap" package="ldap-1_2_4"/>
<project name="oro" package="apache-attic"/>
<project name="packaged-jaxen" package="jaxen-1.1-beta-6"/>
Added: gump/metadata/project/ant-contrib.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant-contrib.xml?rev=1512892&view=auto
==============================================================================
--- gump/metadata/project/ant-contrib.xml (added)
+++ gump/metadata/project/ant-contrib.xml Sun Aug 11 08:08:45 2013
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="ant-contrib">
+
+ <url href="http://sourceforge.net/projects/ant-contrib/"/>
+ <description>
+ Useful little Ant tasks
+ </description>
+ <redistributable/>
+
+ <svn repository="sourceforge-ant-contrib" dir="ant-contrib/trunk"/>
+
+ <project name="ant-contrib">
+ <ant>
+ <property name="no-ivy" value="no-ivy"/>
+ <property name="jar.name" value="ant-contrib-@@DATE@@.jar"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime"/>
+ <depend project="xml-apis"/>
+ <depend project="xml-xerces"/>
+ <depend project="bcel" runtime="true"/>
+ <depend project="ant-contrib-private-ivy"/>
+
+ <jar name="target/ant-contrib-@@DATE@@.jar" id="ant-contrib"/>
+ <license name="docs/LICENSE.txt"/>
+ </project>
+
+ <project name="ant-contrib-private-ivy">
+ <jar name="lib/ivy/jars/ivy-1.4.1.jar"/>
+ </project>
+
+</module>
Propchange: gump/metadata/project/ant-contrib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/ant.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant.xml Sun Aug 11 08:08:45 2013
@@ -37,6 +37,7 @@
</ant>
<depend project="bootstrap-ant"/>
+ <depend project="junit3.xml"/>
<depend project="xml-xerces"/>
<depend project="xml-apis"/>
<option project="xalan" ids="xalan-unbundled"/>
Modified: gump/metadata/project/apache-attic.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apache-attic.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/apache-attic.xml (original)
+++ gump/metadata/project/apache-attic.xml Sun Aug 11 08:08:45 2013
@@ -24,16 +24,6 @@
its end of life.
</description>
- <project name="slide-webdavlib" groupId="slide">
- <jar name="slide-webdavlib-2.1.jar"/>
- <license name="LICENSE"/>
- </project>
-
- <project name="ecs" groupId="ecs">
- <jar name="ecs-1.4.2.jar"/>
- <license name="LICENSE"/>
- </project>
-
<project name="oro" groupId="oro">
<jar name="oro-2.0.8.jar"/>
<license name="LICENSE"/>
Added: gump/metadata/project/apache-httpd.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apache-httpd.xml?rev=1512892&view=auto
==============================================================================
--- gump/metadata/project/apache-httpd.xml (added)
+++ gump/metadata/project/apache-httpd.xml Sun Aug 11 08:08:45 2013
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="apache-httpd">
+
+ <url href="http://httpd.apache.org/"/>
+ <description>
+ Apache HTTP Server
+ </description>
+
+ <svn repository="asf" dir="httpd/httpd/trunk"/>
+
+ <project name="apache-httpd-buildconf">
+ <script name="buildconf">
+ <arg name="--with-apr" project="apr-make-install" reference="home"/>
+ </script>
+ <depend project="apr-make-install"/>
+ </project>
+
+ <project name="apache-httpd-configure">
+ <configure>
+ <arg name="--prefix" path="dest-@@DATE@@"/>
+ <arg name="--with-apr" project="apr-configure" reference="home"/>
+ <arg name="--with-pcre" project="pcre-configure" reference="home"/>
+ </configure>
+ <depend project="apache-httpd-buildconf"/>
+ <depend project="pcre-make-install"/>
+ </project>
+
+ <project name="apache-httpd-make">
+ <make/>
+ <depend project="apache-httpd-configure"/>
+ </project>
+
+ <project name="apache-httpd-make-install">
+ <make target="install"/>
+ <depend project="apache-httpd-make"/>
+ <jar name="dest-@@DATE@@/bin/apxs" id="apxs"/>
+ </project>
+</module>
\ No newline at end of file
Propchange: gump/metadata/project/apache-httpd.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: gump/metadata/project/apr.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apr.xml?rev=1512892&view=auto
==============================================================================
--- gump/metadata/project/apr.xml (added)
+++ gump/metadata/project/apr.xml Sun Aug 11 08:08:45 2013
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="apr">
+
+ <url href="http://apr.apache.org/"/>
+ <description>
+ Apache Portable Runtime
+ </description>
+
+ <svn repository="asf" dir="apr/apr/trunk"/>
+
+ <project name="apr-buildconf">
+ <script name="buildconf"/>
+ </project>
+
+ <project name="apr-configure">
+ <configure>
+ <arg name="--prefix" path="dest-@@DATE@@"/>
+ </configure>
+ <depend project="apr-buildconf"/>
+ <home nested="dest-@@DATE@@"/>
+ </project>
+
+ <project name="apr-make">
+ <make/>
+ <depend project="apr-configure"/>
+ </project>
+
+ <project name="apr-make-install">
+ <make target="install"/>
+ <depend project="apr-make"/>
+ <output name="dest-@@DATE@@/bin/apr-2-config" id="apr-config" type="script"/>
+ </project>
+</module>
\ No newline at end of file
Propchange: gump/metadata/project/apr.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Sun Aug 11 08:08:45 2013
@@ -24,12 +24,6 @@
<svn repository="asf" dir="commons/trunks-proper"/>
- <project name="commons-parent">
- <pom name="commons-parent/pom.xml"/>
- <mvn2install basedir="commons-parent"/>
- <option project="junit"/>
- </project>
-
<project name="commons-beanutils" groupId="commons-beanutils">
<package>org.apache.commons.beanutils</package>
<description>Bean Utilities</description>
@@ -92,7 +86,6 @@
<description>Commons CLI Package</description>
<url href="http://commons.apache.org/cli/"/>
- <depend project="commons-parent"/>
<mvn2 basedir="cli"/>
<depend project="org.apache.ant" inherit="runtime"/>
Modified: gump/metadata/project/forrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/forrest.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/forrest.xml (original)
+++ gump/metadata/project/forrest.xml Sun Aug 11 08:08:45 2013
@@ -143,7 +143,7 @@
<depend project="forrest-core" inherit="runtime"/>
<depend project="forrest-test-deploy-plugins"/>
<depend project="commons-jxpath"/>
- <depend project="jtidy-svn"/>
+ <!--depend project="jtidy-svn"/-->
<!-- Our own packaged stuff that Gump does not provide: -->
<work nested="lib/core/cocoon-2.1.12-dev.jar"/>
<work nested="lib/core/cocoon-asciiart-block.jar"/>
Modified: gump/metadata/project/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/gump.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/gump.xml (original)
+++ gump/metadata/project/gump.xml Sun Aug 11 08:08:45 2013
@@ -41,9 +41,4 @@
<pom name="metadata/pom-overrides/xalan.pom" id="xalan"/>
</project>
- <project name="doxia-sink-api" groupId="gump-org.apache.maven.doxia">
- <depend project="doxia-sink-api-jar" inherit="jars"/>
- <pom name="metadata/pom-overrides/doxia-sink-api.pom"/>
- </project>
-
</module>
Added: gump/metadata/project/junit3.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/junit3.xml?rev=1512892&view=auto
==============================================================================
--- gump/metadata/project/junit3.xml (added)
+++ gump/metadata/project/junit3.xml Sun Aug 11 08:08:45 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="junit3">
+
+ <url href="http://www.junit.org/"/>
+ <description>
+ Unit test framework
+ </description>
+ <redistributable/>
+
+ <project name="junit3">
+ <package>org.junit</package>
+
+ <jar name="junit.jar" id="junit"/>
+ </project>
+
+</module>
\ No newline at end of file
Propchange: gump/metadata/project/junit3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: gump/metadata/project/pcre.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/pcre.xml?rev=1512892&view=auto
==============================================================================
--- gump/metadata/project/pcre.xml (added)
+++ gump/metadata/project/pcre.xml Sun Aug 11 08:08:45 2013
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="pcre">
+
+ <url href="http://www.pcre.org/"/>
+ <description>
+ PCRE - Perl Compatible Regular Expressions
+ </description>
+
+ <svn repository="pcre" dir="code/trunk"/>
+
+ <project name="pcre-autogen">
+ <script name="autogen.sh">
+ </script>
+ </project>
+
+ <project name="pcre-configure">
+ <configure>
+ <arg name="--prefix" path="dest-@@DATE@@"/>
+ </configure>
+ <depend project="pcre-autogen"/>
+ <home nested="dest-@@DATE@@"/>
+ </project>
+
+ <project name="pcre-make">
+ <make/>
+ <depend project="pcre-configure"/>
+ </project>
+
+ <project name="pcre-make-install">
+ <make target="install"/>
+ <depend project="pcre-make"/>
+ <jar name="dest-@@DATE@@/bin/pcre-config" id="pcre-config"/>
+ </project>
+
+ <project name="pcre-test">
+ <make target="check"/>
+ <depend project="pcre-make-install"/>
+ </project>
+</module>
\ No newline at end of file
Propchange: gump/metadata/project/pcre.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/poi.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/poi.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/poi.xml (original)
+++ gump/metadata/project/poi.xml Sun Aug 11 08:08:45 2013
@@ -38,7 +38,7 @@
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
<depend project="xalan"/>
- <depend project="dom4j"/>
+ <!--depend project="dom4j"/-->
<depend project="poi-ooxml-deps" />
<depend project="poi-ooxml-schemas" />
@@ -109,7 +109,7 @@
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
<depend project="xalan"/>
- <depend project="dom4j"/>
+ <!--depend project="dom4j"/-->
<depend project="poi"/>
<depend project="poi-ooxml-deps" />
<depend project="poi-ooxml-schemas" />
Added: gump/metadata/project/rat.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/rat.xml?rev=1512892&view=auto
==============================================================================
--- gump/metadata/project/rat.xml (added)
+++ gump/metadata/project/rat.xml Sun Aug 11 08:08:45 2013
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="rat" groupId="org.apache.rat">
+
+ <url href="http://creadur.apache.org/rat/"/>
+ <description>
+ Release Audit Tool
+ </description>
+
+ <svn repository="asf" dir="creadur/rat/trunk"/>
+
+ <project name="rat">
+ <package>org.apache.rat</package>
+ <mvn2>
+ <property name="skipTests" value="true"/>
+ </mvn2>
+ <option project="ant"/>
+ <option project="ant-testutil"/>
+ <option project="antunit"/>
+ <option project="commons-beanutils"/>
+ <option project="commons-collections"/>
+ <option project="commons-compress"/>
+ <option project="junit"/>
+ <jar name="apache-rat-core/target/apache-rat-core-*[0-9T].jar" id="apache-rat-core"/>
+ <jar name="apache-rat-plugin/target/apache-rat-plugin-*[0-9T].jar" id="gumps-apache-rat-plugin"/>
+ <jar name="apache-rat-tasks/target/apache-rat-tasks-*[0-9T].jar" id="apache-rat-tasks"/>
+ </project>
+
+</module>
Propchange: gump/metadata/project/rat.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Sun Aug 11 08:08:45 2013
@@ -155,8 +155,10 @@
<depend project="commons-collections" />
<depend project="antlr" />
<!-- depend project="emma" / -->
+ <!--
<depend project="jdom" />
<depend project="org.apache.velocity.velocity-engine" />
+ -->
<nag to="dev@tomcat.apache.org"
from="Bill Barker <billbarker@apache.org>" />
Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Sun Aug 11 08:08:45 2013
@@ -130,8 +130,10 @@
<depend project="commons-collections" />
<depend project="antlr" />
<!-- depend project="emma" / -->
+ <!--
<depend project="jdom" />
<depend project="org.apache.velocity.velocity-engine" />
+ -->
<option project="javamail" />
<option project="jaf" />
Modified: gump/metadata/project/xml-fop.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xml-fop.xml?rev=1512892&r1=1512891&r2=1512892&view=diff
==============================================================================
--- gump/metadata/project/xml-fop.xml (original)
+++ gump/metadata/project/xml-fop.xml Sun Aug 11 08:08:45 2013
@@ -76,7 +76,7 @@
<depend project="xml-fop" inherit="all"/>
<depend project="fop-hyph"/>
<depend project="junit"/>
- <depend project="mockito"/>
+ <!--depend project="mockito"/-->
<option project="xmlunit"/>
<work nested="build/classes"/>