Author: jglick
Date: Wed May 26 20:04:40 2010
New Revision: 948562
URL: http://svn.apache.org/viewvc?rev=948562&view=rev
Log:
Merging ant-nodeps.jar into ant.jar.
Not at all sure that the POMs are now correct; very hard to tell with a
monolithic source tree.
Consolidation in manual to follow.
Removed:
ant/core/trunk/src/etc/poms/ant-nodeps/
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/build.xml
ant/core/trunk/release/ivy.xml
ant/core/trunk/src/etc/poms/ant-apache-xalan2/pom.xml
ant/core/trunk/src/etc/poms/ant/pom.xml
ant/core/trunk/src/etc/poms/pom.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=948562&r1=948561&r2=948562&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed May 26 20:04:40 2010
@@ -14,6 +14,8 @@ Changes that could break older environme
make the task overwrite read-only destinations.
Bugzilla Report 49261.
+ * Removed ant-nodeps.jar; it is now merged into ant.jar.
+
Fixed bugs:
-----------
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=948562&r1=948561&r2=948562&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Wed May 26 20:04:40 2010
@@ -44,7 +44,6 @@
<property name="taskdefs.package" value="${ant.package}/taskdefs"/>
<property name="condition.package" value="${taskdefs.package}/condition"/>
<property name="optional.package" value="${taskdefs.package}/optional"/>
- <property name="optional.condition.package"
value="${optional.package}/condition"/>
<property name="type.package" value="${ant.package}/types"/>
<property name="optional.type.package" value="${type.package}/optional"/>
<property name="apache.resolver.type.package"
value="${ant.package}/types/resolver"/>
@@ -173,7 +172,7 @@
<selector id="needs.jdk1.5+">
<or>
<filename name="${taskdefs.package}/AptTest*"/>
- <filename name="${util.package}/java15/*"/>
+ <filename name="${util.package}/java15/"/>
<filename name="${ant.package}/loader/*5*"/>
</or>
</selector>
@@ -187,11 +186,11 @@
</selector>
<selector id="needs.apache-resolver">
- <filename name="${apache.resolver.type.package}/**"/>
+ <filename name="${apache.resolver.type.package}/"/>
</selector>
<selector id="needs.junit">
- <filename name="${optional.package}/junit/**"/>
+ <filename name="${optional.package}/junit/"/>
</selector>
<selector id="needs.apache-regexp">
@@ -201,14 +200,14 @@
<selector id="needs.apache-oro">
<or>
<filename name="${regexp.package}/JakartaOro*"/>
- <filename name="${optional.package}/perforce/*"/>
+ <filename name="${optional.package}/perforce/"/>
</or>
</selector>
<selector id="needs.apache-bcel">
<or>
<filename name="${ant.package}/filters/util/JavaClassHelper*"/>
- <filename name="${util.package}/depend/bcel/*"/>
+ <filename name="${util.package}/depend/bcel/"/>
<filename name="${optional.type.package}/depend/ClassFileSetTest*"/>
</or>
</selector>
@@ -251,26 +250,26 @@
</selector>
<selector id="needs.jmf">
- <filename name="${optional.package}/sound/*"/>
+ <filename name="${optional.package}/sound/"/>
</selector>
<selector id="needs.jai">
<or>
- <filename name="${optional.package}/image/*"/>
- <filename name="${optional.type.package}/image/*"/>
+ <filename name="${optional.package}/image/"/>
+ <filename name="${optional.type.package}/image/"/>
</or>
</selector>
<selector id="needs.jdepend">
- <filename name="${optional.package}/jdepend/*"/>
+ <filename name="${optional.package}/jdepend/"/>
</selector>
<selector id="needs.swing">
- <filename name="${optional.package}/splash/*"/>
+ <filename name="${optional.package}/splash/"/>
</selector>
<selector id="needs.jsch">
- <filename name="${optional.package}/ssh/*"/>
+ <filename name="${optional.package}/ssh/"/>
</selector>
<!-- needs TraceListenerEx3 interface implemented by PrintTraceListener -->
@@ -279,7 +278,7 @@
</selector>
<selector id="ant.launcher">
- <filename name="${ant.package}/launch/**/*"/>
+ <filename name="${ant.package}/launch/"/>
</selector>
<patternset id="onlinetests">
@@ -640,32 +639,28 @@
manifest="${manifest}"
whenmanifestonly="fail">
<not>
- <selector id="non-core">
- <or>
- <and>
- <filename name="${optional.package}/**"/>
- <not><!-- #49287 -->
- <or>
- <filename name="${optional.package}/TraXLiaison*"/>
- <filename name="${optional.package}/XSLTTraceSupport*"/>
- </or>
- </not>
- </and>
- <filename name="${optional.type.package}/**"/>
- <filename name="${util.package}/depend/**"/>
- <filename name="${util.package}/optional/**"/>
- <selector refid="needs.apache-log4j"/>
- <selector refid="needs.commons-logging"/>
- <selector refid="needs.apache-bcel"/>
- <selector refid="needs.apache-bsf"/>
- <selector refid="needs.apache-regexp"/>
- <selector refid="needs.apache-resolver"/>
- <selector refid="needs.apache-oro"/>
- <selector refid="needs.jdk1.5+"/>
- <selector refid="needs.javamail"/>
- <selector refid="ant.launcher"/>
- </or>
- </selector>
+ <or>
+ <!-- Verification: (cd dist/lib; for j in *.jar; do jar tf $j; done)
| egrep -v '/$|META-INF/MANIFEST\.MF' | sort | uniq -d -->
+ <selector refid="needs.antlr"/>
+ <selector refid="needs.apache-bcel"/>
+ <selector refid="needs.apache-bsf"/>
+ <selector refid="needs.apache-log4j"/>
+ <selector refid="needs.apache-oro"/>
+ <selector refid="needs.apache-regexp"/>
+ <selector refid="needs.apache-resolver"/>
+ <selector refid="needs.apache-xalan2"/>
+ <selector refid="needs.commons-logging"/>
+ <selector refid="needs.commons-net"/>
+ <selector refid="needs.jai"/>
+ <selector refid="needs.javamail"/>
+ <selector refid="needs.jdepend"/>
+ <selector refid="needs.jmf"/>
+ <selector refid="needs.jsch"/>
+ <selector refid="needs.junit"/>
+ <selector refid="needs.netrexx"/>
+ <selector refid="needs.swing"/>
+ <selector refid="ant.launcher"/>
+ </or>
</not>
<metainf dir="${build.dir}">
<include name="LICENSE.txt"/>
@@ -711,42 +706,6 @@
</manifest>
</jar>
- <jar destfile="${build.lib}/ant-nodeps.jar"
- basedir="${build.classes}"
- manifest="${manifest.tmp}"
- whenmanifestonly="${optional.jars.whenmanifestonly}">
- <and>
- <selector refid="non-core"/>
- <not>
- <or>
- <selector refid="ant.launcher"/>
- <selector refid="needs.apache-resolver"/>
- <selector refid="needs.junit"/>
- <selector refid="needs.apache-regexp"/>
- <selector refid="needs.apache-oro"/>
- <selector refid="needs.apache-bcel"/>
- <selector refid="needs.apache-log4j"/>
- <selector refid="needs.commons-logging"/>
- <selector refid="needs.apache-bsf"/>
- <selector refid="needs.javamail"/>
- <selector refid="needs.netrexx"/>
- <selector refid="needs.commons-net"/>
- <selector refid="needs.antlr"/>
- <selector refid="needs.jmf"/>
- <selector refid="needs.jai"/>
- <selector refid="needs.jdepend"/>
- <selector refid="needs.swing"/>
- <selector refid="needs.jsch"/>
- <selector refid="needs.apache-xalan2"/>
- </or>
- </not>
- </and>
- <metainf dir="${build.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </jar>
-
<macrodef name="optional-jar">
<attribute name="dep"/>
<sequential>
@@ -1026,7 +985,7 @@
<copy todir="${src.dist.docs}">
<fileset dir="${docs.dir}">
- <exclude name="manual/api/**"/>
+ <exclude name="manual/api/"/>
<patternset refid="site.excludes"/>
</fileset>
</copy>
@@ -1106,7 +1065,7 @@
<include name="${dist.name}/bin/*.py"/>
</zipfileset>
<fileset dir="${dist.name}/..">
- <include name="${dist.name}/**"/>
+ <include name="${dist.name}/"/>
<exclude name="${dist.name}/bin/ant"/>
<exclude name="${dist.name}/bin/antRun"/>
<exclude name="${dist.name}/bin/*.pl"/>
@@ -1126,7 +1085,7 @@
<include name="${dist.name}/bin/*.py"/>
</tarfileset>
<tarfileset dir="${dist.name}/.." username="ant" group="ant">
- <include name="${dist.name}/**"/>
+ <include name="${dist.name}/"/>
<exclude name="${dist.name}/bin/ant"/>
<exclude name="${dist.name}/bin/antRun"/>
<exclude name="${dist.name}/bin/*.pl"/>
@@ -1160,7 +1119,6 @@
<delete dir="${dist.name}"/>
<checksums>
<fileset dir="${dist.base.binaries}/">
- <include name="**/*"/>
<exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/>
@@ -1177,7 +1135,7 @@
<include name="${dist.name}/build.sh"/>
</zipfileset>
<fileset dir="${dist.name}/..">
- <include name="${dist.name}/**"/>
+ <include name="${dist.name}/"/>
<exclude name="${dist.name}/bootstrap.sh"/>
<exclude name="${dist.name}/build.sh"/>
</fileset>
@@ -1192,7 +1150,7 @@
<include name="${dist.name}/build.sh"/>
</tarfileset>
<tarfileset dir="${dist.name}/.." username="ant" group="ant">
- <include name="${dist.name}/**"/>
+ <include name="${dist.name}/"/>
<exclude name="${dist.name}/bootstrap.sh"/>
<exclude name="${dist.name}/build.sh"/>
</tarfileset>
@@ -1205,7 +1163,6 @@
<delete dir="${dist.name}"/>
<checksums>
<fileset dir="${dist.base.source}/">
- <include name="**/*"/>
<exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/>
@@ -1684,7 +1641,7 @@ see ${build.junit.reports} / ${antunit.r
<exclude
name="${ant.package}/types/selectors/BaseSelectorTest.java"/>
<!-- helper classes, not testcases -->
- <exclude name="org/example/**"/>
+ <exclude name="org/example/"/>
<exclude name="${taskdefs.package}/TaskdefTest*Task.java"/>
<exclude name="${optional.package}/junit/TestFormatter.java"/>
Modified: ant/core/trunk/release/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/release/ivy.xml?rev=948562&r1=948561&r2=948562&view=diff
==============================================================================
--- ant/core/trunk/release/ivy.xml (original)
+++ ant/core/trunk/release/ivy.xml Wed May 26 20:04:40 2010
@@ -100,10 +100,6 @@
<artifact name="ant-netrexx" type="pom.asc" ext="pom.asc"/>
<artifact name="ant-netrexx" type="jar" ext="jar"/>
<artifact name="ant-netrexx" type="jar.asc" ext="jar.asc"/>
- <artifact name="ant-nodeps" type="pom" ext="pom"/>
- <artifact name="ant-nodeps" type="pom.asc" ext="pom.asc"/>
- <artifact name="ant-nodeps" type="jar" ext="jar"/>
- <artifact name="ant-nodeps" type="jar.asc" ext="jar.asc"/>
<artifact name="ant-swing" type="pom" ext="pom"/>
<artifact name="ant-swing" type="pom.asc" ext="pom.asc"/>
<artifact name="ant-swing" type="jar" ext="jar"/>
Modified: ant/core/trunk/src/etc/poms/ant-apache-xalan2/pom.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/poms/ant-apache-xalan2/pom.xml?rev=948562&r1=948561&r2=948562&view=diff
==============================================================================
--- ant/core/trunk/src/etc/poms/ant-apache-xalan2/pom.xml (original)
+++ ant/core/trunk/src/etc/poms/ant-apache-xalan2/pom.xml Wed May 26 20:04:40
2010
@@ -41,12 +41,6 @@ xsi:schemaLocation="http://maven.apache.
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.8.2-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.1</version>
Modified: ant/core/trunk/src/etc/poms/ant/pom.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/poms/ant/pom.xml?rev=948562&r1=948561&r2=948562&view=diff
==============================================================================
--- ant/core/trunk/src/etc/poms/ant/pom.xml (original)
+++ ant/core/trunk/src/etc/poms/ant/pom.xml Wed May 26 20:04:40 2010
@@ -93,27 +93,36 @@
<source>1.4</source>
<target>1.4</target>
<excludes>
- <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
- <exclude>org/apache/tools/ant/types/optional/**</exclude>
<exclude>org/apache/tools/ant/types/resolver/**</exclude>
- <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
- <exclude>org/apache/tools/ant/util/depend/**</exclude>
- <exclude>org/apache/tools/ant/util/optional/**</exclude>
<exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
<exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
<exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/launch/**</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
+
<exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
+
<exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
+
<exclude>org/apache/tools/ant/taskdefs/optional/perforce/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
+ <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
+ <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
+ <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
+
<exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
+
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
+ <exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
+
<exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
</excludes>
<testExcludes>
- <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
- <exclude>org/apache/tools/ant/types/optional/**</exclude>
<exclude>org/apache/tools/ant/types/resolver/**</exclude>
- <exclude>org/apache/tools/ant/util/depend/**</exclude>
- <exclude>org/apache/tools/ant/util/optional/**</exclude>
<exclude>org/apache/tools/ant/util/Script*</exclude>
<exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
Modified: ant/core/trunk/src/etc/poms/pom.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/poms/pom.xml?rev=948562&r1=948561&r2=948562&view=diff
==============================================================================
--- ant/core/trunk/src/etc/poms/pom.xml (original)
+++ ant/core/trunk/src/etc/poms/pom.xml Wed May 26 20:04:40 2010
@@ -87,7 +87,6 @@ xsi:schemaLocation="http://maven.apache.
<module>ant-junit</module>
<module>ant-launcher</module>
<module>ant-netrexx</module>
- <module>ant-nodeps</module>
<module>ant-swing</module>
<module>ant-testutil</module>
</modules>
