diff --git a/.gitignore b/.gitignore index 38bc88e..01c4031 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ apache-ant-1.7.1-src.tar.bz2 +/apache-ant-1.8.1-src.tar.bz2 diff --git a/ant-1.7.1.pom b/ant-1.7.1.pom deleted file mode 100644 index df8689a..0000000 --- a/ant-1.7.1.pom +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant - 1.7.1 - org.apache.tools.ant - Apache Ant - - - org.apache.ant - ant-launcher - 1.7.1 - compile - - - - xerces - xercesImpl - 2.9.0 - true - runtime - - - - xml-apis - xml-apis - 1.3.04 - true - compile - - - - - ../../../../target/ant/.build.timestamp.properties - - - - org.apache.maven.plugins - maven-jar-plugin - - - - maven-antrun-plugin - - - create-timestamp-file - generate-resources - - run - - - - - - - - - - - - delete-timestamp-file - clean - - run - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/** - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/types/optional/** - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/util/depend/** - org/apache/tools/ant/util/optional/** - org/apache/tools/ant/util/Script* - org/apache/tools/ant/listener/Log4jListener* - org/apache/tools/ant/listener/CommonsLoggingListener* - org/apache/tools/ant/util/regexp/JakartaRegexp* - org/apache/tools/ant/util/regexp/JakartaOro* - org/apache/tools/ant/util/regexp/Jdk14Regexp* - org/apache/tools/ant/taskdefs/email/MimeMailer* - org/apache/tools/ant/launch/** - - - org/apache/tools/ant/taskdefs/optional/** - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/types/optional/** - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/util/depend/** - org/apache/tools/ant/util/optional/** - org/apache/tools/ant/util/Script* - org/apache/tools/ant/listener/Log4jListener* - org/apache/tools/ant/listener/CommonsLoggingListener* - org/apache/tools/ant/util/regexp/JakartaRegexp* - org/apache/tools/ant/util/regexp/JakartaOro* - org/apache/tools/ant/util/regexp/Jdk14Regexp* - org/apache/tools/ant/taskdefs/email/MimeMailer* - org/apache/tools/ant/launch/** - org/apache/tools/ant/taskdefs/StyleTest* - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - ant.home - ${env.ANT_HOME} - - - build.tests - ../../../../target/ant/testcases - - - build.tests.value - ../../../../target/ant/testcases - - - offline - true - - - root - ../../../.. - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - - - ../../../../src/main - true - - org/apache/tools/ant/taskdefs/default.properties - org/apache/tools/ant/types/default.properties - org/apache/tools/ant/taskdefs/default.properties - org/apache/tools/ant/types/conditions/antlib.xml - org/apache/tools/ant/defaultManifest.mf - org/apache/tools/ant/version.txt - - - - ../../../../src/resources - true - - **/antlib.xml - - - - ../../../../docs - false - - images/ant_logo_large.gif - - - - - - ../../../../src/etc/testcases - true - - - ../../../../src/main - true - - **/*.java - - - - ../../../../src/main - ../../../../src/tests/junit - ../../../../target/ant/classes - ../../../../target/ant/testcases - ../../../../target/ant - - diff --git a/ant-antlr-1.7.1.pom b/ant-antlr-1.7.1.pom deleted file mode 100644 index da567bb..0000000 --- a/ant-antlr-1.7.1.pom +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-antlr - 1.7.1 - antlr specific task. - The implementation forks a java process, therefore the antlr jar file is only needed at runtime - - - org.apache.ant - ant - 1.7.1 - true - compile - - - - antlr - antlr - 2.7.2 - true - runtime - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/ANTLR* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-bcel-1.7.1.pom b/ant-apache-bcel-1.7.1.pom deleted file mode 100644 index 6560b13..0000000 --- a/ant-apache-bcel-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-bcel - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - bcel - bcel - 5.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/tfilters/util/JavaClassHelper* - org/apache/tools/ant/tutil/depend/bcel/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-bsf-1.7.1.pom b/ant-apache-bsf-1.7.1.pom deleted file mode 100644 index d675aca..0000000 --- a/ant-apache-bsf-1.7.1.pom +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-bsf - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - bsf - bsf - 2.4.0 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/Script* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/util/Script* - org/apache/tools/ant/util/optional/Script* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-log4j-1.7.1.pom b/ant-apache-log4j-1.7.1.pom deleted file mode 100644 index ea714cd..0000000 --- a/ant-apache-log4j-1.7.1.pom +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-log4j - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - log4j - log4j - 1.2.13 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/listener/Log4jListener* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-oro-1.7.1.pom b/ant-apache-oro-1.7.1.pom deleted file mode 100644 index c616002..0000000 --- a/ant-apache-oro-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-oro - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - oro - oro - 2.0.8 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/util/regexp/JakartaOro* - org/apache/tools/ant/taskdefs/optional/perforce/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-regexp-1.7.1.pom b/ant-apache-regexp-1.7.1.pom deleted file mode 100644 index 8c3985a..0000000 --- a/ant-apache-regexp-1.7.1.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-regexp - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - regexp - regexp - 1.3 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/util/regexp/JakartaRegexp* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - - diff --git a/ant-apache-resolver-1.7.1.pom b/ant-apache-resolver-1.7.1.pom deleted file mode 100644 index 531e663..0000000 --- a/ant-apache-resolver-1.7.1.pom +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-resolver - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - xml-resolver - xml-resolver - 1.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/types/resolver/** - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-commons-logging-1.7.1.pom b/ant-commons-logging-1.7.1.pom deleted file mode 100644 index 409dd6d..0000000 --- a/ant-commons-logging-1.7.1.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-commons-logging - 1.7.1 - Ant Listener based on commons-logging - - - org.apache.ant - ant - 1.7.1 - compile - - - commons-logging - commons-logging-api - 1.0.4 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/tlistener/CommonsLoggingListener* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-commons-net-1.7.1.pom b/ant-commons-net-1.7.1.pom deleted file mode 100644 index cb7ec12..0000000 --- a/ant-commons-net-1.7.1.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-commons-net - 1.7.1 - ftp, rexec and telnet tasks - - - org.apache.ant - ant - 1.7.1 - compile - - - commons-net - commons-net - 1.4.0 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/net/RExec* - org/apache/tools/ant/taskdefs/optional/net/TelnetTask* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-javamail-1.7.1.pom b/ant-javamail-1.7.1.pom deleted file mode 100644 index a5adf07..0000000 --- a/ant-javamail-1.7.1.pom +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-javamail - 1.7.1 - implementation of the mail task based on javamail. - Required to send emails to SMTP servers using user/password combinations - or to send mail over SSL - - - org.apache.ant - ant - 1.7.1 - compile - - - javax.mail - mail - 1.4 - compile - - - javax.activation - activation - 1.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/email/MimeMailer* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jdepend-1.7.1.pom b/ant-jdepend-1.7.1.pom deleted file mode 100644 index 1deacf1..0000000 --- a/ant-jdepend-1.7.1.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-jdepend - 1.7.1 - task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the - jdepend parser available on the maven repository - - - org.apache.ant - ant - 1.7.1 - compile - - - jdepend - jdepend - 2.7 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/jdepend/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jmf-1.7.1.pom b/ant-jmf-1.7.1.pom deleted file mode 100644 index 1fb92aa..0000000 --- a/ant-jmf-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-jmf - 1.7.1 - contains the sound task and a soundplayer listener - download the dependency from http://java.sun.com/products/java-media/jmf/ - - - org.apache.ant - ant - 1.7.1 - compile - - - javax.media - jmf - 2.1.1e - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/sound/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jsch-1.7.1.pom b/ant-jsch-1.7.1.pom deleted file mode 100644 index d8dd61e..0000000 --- a/ant-jsch-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-jsch - 1.7.1 - contains the sshexec and scp tasks - jsch 0.1.29 might not be available from maven - - - org.apache.ant - ant - 1.7.1 - compile - - - com.jcraft - jsch - 0.1.29 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/ssh/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-junit-1.7.1.pom b/ant-junit-1.7.1.pom deleted file mode 100644 index e142ea8..0000000 --- a/ant-junit-1.7.1.pom +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-junit - 1.7.1 - contains the junit and junirreport tasks - - - org.apache.ant - ant - 1.7.1 - compile - - - junit - junit - 3.8.2 - compile - - - - - - maven-antrun-plugin - - - create-timestamp-file - generate-resources - - run - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/junit/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-launcher-1.7.1.pom b/ant-launcher-1.7.1.pom deleted file mode 100644 index 5f50880..0000000 --- a/ant-launcher-1.7.1.pom +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-launcher - 1.7.1 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/launch/*.java - - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/ant-launcher/classes - ../../../../target/ant-launcher/testcases - ../../../../target/ant-launcher - - diff --git a/ant-netrexx-1.7.1.pom b/ant-netrexx-1.7.1.pom deleted file mode 100644 index 9a67297..0000000 --- a/ant-netrexx-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-netrexx - 1.7.1 - NetRexxC task - dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html - - - org.apache.ant - ant - 1.7.1 - compile - - - com.ibm.netrexx - netrexx - 2.0.5 - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/NetRexxC* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-nodeps-1.7.1.pom b/ant-nodeps-1.7.1.pom deleted file mode 100644 index 2c43a25..0000000 --- a/ant-nodeps-1.7.1.pom +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-nodeps - 1.7.1 - contains all the optional tasks and types which do not have particular dependencies - - - org.apache.ant - ant - 1.7.1 - compile - - - - xerces - xercesImpl - 2.9.0 - true - runtime - - - - xml-apis - xml-apis - 1.3.04 - true - compile - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/** - org/apache/tools/ant/types/optional/** - org/apache/tools/ant/util/depend/* - org/apache/tools/ant/util/optional/** - org/apache/tools/ant/util/java15/** - org/apache/tools/ant/util/regexp/Jdk14Regexp* - - - org/apache/tools/ant/taskdefs/optional/TraXLiaison* - org/apache/tools/ant/taskdefs/optional/junit/** - org/apache/tools/ant/taskdefs/optional/perforce/** - org/apache/tools/ant/taskdefs/optional/Script* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/util/optional/Script* - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/taskdefs/optional/StyleBook* - org/apache/tools/ant/taskdefs/optional/NetRexxC* - org/apache/tools/ant/taskdefs/optional/ejb/Ejbc* - org/apache/tools/ant/taskdefs/optional/ejb/DDCreator* - org/apache/tools/ant/taskdefs/optional/ejb/WLRun* - org/apache/tools/ant/taskdefs/optional/ejb/WLStop* - org/apache/tools/ant/taskdefs/optional/net/Telnet* - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/net/RExec* - org/apache/tools/ant/taskdefs/optional/scm/AntStarTeam* - org/apache/tools/ant/taskdefs/optional/starteam/* - org/apache/tools/ant/taskdefs/optional/ANTLR* - org/apache/tools/ant/taskdefs/optional/sound/* - org/apache/tools/ant/taskdefs/optional/image/* - org/apache/tools/ant/types/optional/image/* - org/apache/tools/ant/taskdefs/optional/jdepend/* - org/apache/tools/ant/taskdefs/optional/splash/* - org/apache/tools/ant/taskdefs/optional/ssh/* - - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/ant-nodeps/classes - ../../../../target/ant-nodeps/testcases - ../../../../target/ant-nodeps - - diff --git a/ant-parent-1.7.1.pom b/ant-parent-1.7.1.pom deleted file mode 100644 index 2de8494..0000000 --- a/ant-parent-1.7.1.pom +++ /dev/null @@ -1,111 +0,0 @@ - - - - - 4.0.0 - org.apache.ant - ant-parent - 1.7.1 - pom - master POM - Apache Ant - http://ant.apache.org/ - 2000 - - Apache Software Foundation - - - - - dummy - Dummy to avoid accidental deploys - - - - - scm:svn:http://svn.apache.org/repos/asf/ant/core/trunk - scm:svn:https://svn.apache.org/repos/asf/jant/core/trunk - http://svn.apache.org/repos/asf/ant/core/trunk - - - - Ant Developers List - dev-subscribe@ant.apache.org - dev-unsubscribe@ant.apache.org - dev@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-dev - - - Ant Users List - user-subscribe@ant.apache.org - user-unsubscribe@ant.apache.org - user@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-user - - - - bugzilla - http://issues.apache.org/bugzilla/ - - - ant - ant-antlr - ant-apache-bcel - ant-apache-bsf - ant-apache-log4j - ant-apache-oro - ant-apache-regexp - ant-apache-resolver - ant-commons-logging - ant-commons-net - ant-jai - ant-javamail - ant-jdepend - ant-jmf - ant-jsch - ant-junit - ant-launcher - ant-netrexx - ant-nodeps - ant-starteam - ant-stylebook - ant-swing - ant-testutil - ant-trax - ant-weblogic - - - - junit - junit - 3.8.2 - test - - - - ../../../src/main - ../../../src/testcases - ../../../target/classes - ../../../target/testcases - - diff --git a/ant-starteam-1.7.1.pom b/ant-starteam-1.7.1.pom deleted file mode 100644 index 4a5dd5c..0000000 --- a/ant-starteam-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-starteam - Starteam SDK tasks - - - org.apache.ant - ant - 1.7.1 - compile - - - com.starteam - starteam-sdk - 5.2 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/scm/AntStarTeam* - org/apache/tools/ant//taskdefs/optional/scm/starteam/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-stylebook-1.7.1.pom b/ant-stylebook-1.7.1.pom deleted file mode 100644 index 8130b81..0000000 --- a/ant-stylebook-1.7.1.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-stylebook - 1.7.1 - executes the Apache Stylebook document generator. Deprecated since Ant 1.7 - - - org.apache.ant - ant - 1.7.1 - compile - - - stylebook - stylebook - 1.0-b2 - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/StyleBook* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - - diff --git a/ant-swing-1.7.1.pom b/ant-swing-1.7.1.pom deleted file mode 100644 index a08f400..0000000 --- a/ant-swing-1.7.1.pom +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-swing - 1.7.1 - a listener and a splash task based on Swing - - - org.apache.ant - ant - 1.7.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/splash/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - - diff --git a/ant-trax-1.7.1.pom b/ant-trax-1.7.1.pom deleted file mode 100644 index d61b533..0000000 --- a/ant-trax-1.7.1.pom +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-trax - 1.7.1 - contains particularly one class necessary for the execution of the xslt task - - - org.apache.ant - ant - 1.7.1 - compile - - - - xerces - xercesImpl - 2.9.0 - true - runtime - - - - xml-apis - xml-apis - 1.3.04 - true - compile - - - - xalan - xalan - 2.7.0 - true - runtime - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/TraXLiaison* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-weblogic-1.7.1.pom b/ant-weblogic-1.7.1.pom deleted file mode 100644 index 3f4b405..0000000 --- a/ant-weblogic-1.7.1.pom +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-weblogic - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - com.bea - weblogicclasses - 5.1 - provided - - - com.bea - weblogic - 8.1.3.0 - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/ejb/Ejbc* - org/apache/tools/ant//taskdefs/optional/ejb/DDCreator* - org/apache/tools/ant//taskdefs/optional/ejb/WLRun* - org/apache/tools/ant//taskdefs/optional/ejb/WLStop* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant.spec b/ant.spec index 69b4b45..8a731e5 100644 --- a/ant.spec +++ b/ant.spec @@ -50,14 +50,14 @@ %define ant_home %{_datadir}/ant %define section free -%define major_version 1.7 -%define cvs_version 1.7.1 +%define major_version 1.8 +%define cvs_version 1.8.1 Name: ant -Version: 1.7.1 -Release: 12%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Epoch: 0 -Summary: Ant build tool for java +Summary: Build tool for java Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java License: ASL 2.0 @@ -65,35 +65,9 @@ URL: http://ant.apache.org/ Group: Development/Build Tools Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 Source2: apache-ant-%{major_version}.ant.conf -Source1: http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom -Source3: http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom -Source4: http://repo1.maven.org/maven2/org/apache/ant/ant-netrexx/1.7.1/ant-netrexx-1.7.1.pom -Source5: http://repo1.maven.org/maven2/org/apache/ant/ant-starteam/1.7.1/ant-starteam-1.7.1.pom -Source6: http://repo1.maven.org/maven2/org/apache/ant/ant-stylebook/1.7.1/ant-stylebook-1.7.1.pom -Source7: http://repo1.maven.org/maven2/org/apache/ant/ant-weblogic/1.7.1/ant-weblogic-1.7.1.pom -Source8: http://repo1.maven.org/maven2/org/apache/ant/ant-antlr/1.7.1/ant-antlr-1.7.1.pom -Source9: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bsf/1.7.1/ant-apache-bsf-1.7.1.pom -Source10: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-resolver/1.7.1/ant-apache-resolver-1.7.1.pom -Source11: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/1.7.1/ant-commons-logging-1.7.1.pom -Source12: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/1.7.1/ant-commons-net-1.7.1.pom -#Source13: http://repo1.maven.org/maven2/org/apache/ant/ant-jai/1.7.1/ant-jai-1.7.1.pom -Source14: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/1.7.1/ant-apache-bcel-1.7.1.pom -Source15: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/1.7.1/ant-apache-log4j-1.7.1.pom -Source16: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-oro/1.7.1/ant-apache-oro-1.7.1.pom -Source17: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-regexp/1.7.1/ant-apache-regexp-1.7.1.pom -Source18: http://repo1.maven.org/maven2/org/apache/ant/ant-javamail/1.7.1/ant-javamail-1.7.1.pom -Source19: http://repo1.maven.org/maven2/org/apache/ant/ant-jdepend/1.7.1/ant-jdepend-1.7.1.pom -Source20: http://repo1.maven.org/maven2/org/apache/ant/ant-jmf/1.7.1/ant-jmf-1.7.1.pom -Source21: http://repo1.maven.org/maven2/org/apache/ant/ant-jsch/1.7.1/ant-jsch-1.7.1.pom -Source22: http://repo1.maven.org/maven2/org/apache/ant/ant-junit/1.7.1/ant-junit-1.7.1.pom -Source23: http://repo1.maven.org/maven2/org/apache/ant/ant-nodeps/1.7.1/ant-nodeps-1.7.1.pom -Source24: http://repo1.maven.org/maven2/org/apache/ant/ant-swing/1.7.1/ant-swing-1.7.1.pom -Source25: http://repo1.maven.org/maven2/org/apache/ant/ant-trax/1.7.1/ant-trax-1.7.1.pom -Source26: http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/ant-parent-1.7.1.pom # Fix some places where copies of classes are included in the wrong jarfiles Patch1: apache-ant-bz163689.patch -Patch2: apache-ant-gnu-classpath.patch Patch3: apache-ant-no-test-jar.patch Patch4: apache-ant-class-path-in-manifest.patch @@ -104,6 +78,7 @@ BuildRequires: jaxp_transform_impl BuildRequires: ant BuildRequires: junit BuildRequires: xml-commons-jaxp-1.3-apis +BuildRequires: xalan-j2 BuildRequires: xerces-j2 %endif @@ -134,6 +109,8 @@ Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release} Provides: %{name}-libs = %{epoch}:%{version}-%{release} Obsoletes: %{name}-core < %{epoch}:%{version}-%{release} Provides: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-trax < %{epoch}:%{version}-%{release} +Provides: %{name}-trax = %{epoch}:%{version}-%{release} %if %{gcj_support} BuildRequires: java-gcj-compat-devel %endif @@ -192,23 +169,6 @@ Optional swing tasks for %{name}. %description swing -l fr Taches swing optionelles pour %{name}. -%package trax -Summary: Optional trax tasks for %{name} -Group: Development/Build Tools -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: jaxp_transform_impl -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} -Provides: ant-trax = %{epoch}:%{version}-%{release} -# The ant-xalan jar has been merged into the ant-trax one -Obsoletes: ant-xalan2 < %{epoch}:%{version}-%{release} -Provides: ant-xalan2 = %{epoch}:%{version}-%{release} - -%description trax -Optional trax tasks for %{name}. - -%description trax -l fr -Taches trax optionelles pour %{name}. - %if %without bootstrap %if %{with_manifest_only} %package manifest-only @@ -390,6 +350,21 @@ Optional apache regexp tasks for %{name}. %description apache-regexp -l fr Taches apache regexp optionelles pour %{name}. +%package apache-xalan2 +Summary: Optional apache xalan2 tasks for %{name} +Group: Development/Build Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} +Requires: regexp +BuildRequires: regexp +Provides: ant-apache-xalan2 = %{epoch}:%{version}-%{release} + +%description apache-xalan2 +Optional apache xalan2 tasks for %{name}. + +%description apache-xalan2 -l fr +Taches apache xalan2 optionelles pour %{name}. + %package javamail Summary: Optional javamail tasks for %{name} Group: Development/Build Tools @@ -443,6 +418,7 @@ Group: Development/Build Tools Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: junit +Requires: xalan-j2 Provides: ant-junit = %{epoch}:%{version}-%{release} %description junit @@ -500,18 +476,20 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t %patch1 -p1 %endif -# Update ant to work with recent versions of GNU Classpath -%patch2 -p1 - # When bootstrapping, we don't have junit %patch3 -p1 # Fix class-path-in-manifest rpmlint warning -%patch4 -p0 +%patch4 -p1 # clean jar files find . -name "*.jar" | %{_bindir}/xargs -t rm +#install jars +%if %without bootstrap +build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver +%endif + # Fix file-not-utf8 rpmlint warning iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 mv KEYS.utf8 KEYS @@ -540,9 +518,9 @@ chmod +x %{__perl_requires} %build export OPT_JAR_LIST=: %if %without bootstrap -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver) %{ant} jars %if %{build_javadoc} +export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) %{ant} javadocs %endif %else @@ -560,103 +538,42 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc} # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 build/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -install -m 644 build/lib/ant-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bootstrap-%{version}.jar -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.apache.ant %{name} %{version} JPP %{name} -install -m 644 build/lib/ant-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-launcher.pom -%add_to_maven_depmap org.apache.ant %{name}-launcher %{version} JPP %{name}-launcher - -install -m 644 build/lib/ant-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar -install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jmf.pom -%add_to_maven_depmap org.apache.ant %{name}-jmf %{version} JPP/%{name} %{name}-jmf -install -m 644 build/lib/ant-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar -install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-nodeps.pom -%add_to_maven_depmap org.apache.ant %{name}-nodeps %{version} JPP/%{name} %{name}-nodeps -install -m 644 build/lib/ant-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar -install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-swing.pom -%add_to_maven_depmap org.apache.ant %{name}-swing %{version} JPP/%{name} %{name}-swing -install -m 644 build/lib/ant-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar -install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-trax.pom -%add_to_maven_depmap org.apache.ant %{name}-trax %{version} JPP/%{name} %{name}-trax - -# optional jars -%if %without bootstrap -%if %{with_manifest_only} -install -m 644 build/lib/ant-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar -install -m 644 build/lib/ant-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-netrexx.pom -%add_to_maven_depmap org.apache.ant %{name}-netrexx %{version} JPP/%{name} %{name}-netrexx -install -m 644 build/lib/ant-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-starteam.pom -%add_to_maven_depmap org.apache.ant %{name}-starteam %{version} JPP/%{name} %{name}-starteam -install -m 644 build/lib/ant-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-stylebook.pom -%add_to_maven_depmap org.apache.ant %{name}-stylebook %{version} JPP/%{name} %{name}-stylebook -install -m 644 build/lib/ant-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar -install -m 644 build/lib/ant-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-weblogic.pom -%add_to_maven_depmap org.apache.ant %{name}-weblogic %{version} JPP/%{name} %{name}-weblogic -install -m 644 build/lib/ant-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar -install -m 644 build/lib/ant-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar -%endif -install -m 644 build/lib/ant-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-antlr.pom -%add_to_maven_depmap org.apache.ant %{name}-antlr %{version} JPP/%{name} %{name}-antlr -install -m 644 build/lib/ant-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-bsf.pom -%add_to_maven_depmap org.apache.ant %{name}-apache-bsf %{version} JPP/%{name} %{name}-apache-bsf -install -m 644 build/lib/ant-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-resolver.pom -%add_to_maven_depmap org.apache.ant %{name}-apache-resolver %{version} JPP/%{name} %{name}-apache-resolver -install -m 644 build/lib/ant-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons-logging.pom -%add_to_maven_depmap org.apache.ant %{name}-commons-logging %{version} JPP/%{name} %{name}-commons-logging -install -m 644 build/lib/ant-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar -install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons-net.pom -%add_to_maven_depmap org.apache.ant %{name}-commons-net %{version} JPP/%{name} %{name}-commons-net -#install -m 644 build/lib/ant-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar -#install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jai.pom -#%add_to_maven_depmap org.apache.ant %{name}-jai %{version} JPP/%{name} %{name}-jai -install -m 644 build/lib/ant-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar -install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-bcel.pom -%add_to_maven_depmap org.apache.ant %{name}-apache-bcel %{version} JPP/%{name} %{name}-apache-bcel -install -m 644 build/lib/ant-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar -install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-log4j.pom -%add_to_maven_depmap org.apache.ant %{name}-apache-log4j %{version} JPP/%{name} %{name}-apache-log4j -install -m 644 build/lib/ant-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar -install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-oro.pom -%add_to_maven_depmap org.apache.ant %{name}-apache-oro %{version} JPP/%{name} %{name}-apache-oro -install -m 644 build/lib/ant-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar -install -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-regexp.pom -%add_to_maven_depmap org.apache.ant %{name}-apache-regexp %{version} JPP/%{name} %{name}-apache-regexp -ln -sf %{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel.jar -ln -sf %{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j.jar -ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar -ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.jar -install -m 644 build/lib/ant-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar -install -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-javamail.pom -%add_to_maven_depmap org.apache.ant %{name}-javamail %{version} JPP/%{name} %{name}-javamail -install -m 644 build/lib/ant-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar -install -m 644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jdepend.pom -%add_to_maven_depmap org.apache.ant %{name}-jdepend %{version} JPP/%{name} %{name}-jdepend -install -m 644 build/lib/ant-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar -install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jsch.pom -%add_to_maven_depmap org.apache.ant %{name}-jsch %{version} JPP/%{name} %{name}-jsch -install -m 644 build/lib/ant-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar -install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-junit.pom -%add_to_maven_depmap org.apache.ant %{name}-junit %{version} JPP/%{name} %{name}-junit -install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom -%add_to_maven_depmap org.apache.ant %{name}-parent %{version} JPP %{name}-parent -%endif - -# jar aliases -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done) -(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/%{name}/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done) + +for jar in build/lib/*.jar +do + jarname=$(basename $jar .jar) + + #Determine where to put it + case $jarname in +#These go into %{_javadir} + ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";; +#Bootstracp builds an incomplete ant-junit, don't ship it +%if %with bootstrap + ant-junit) continue;; +%endif +#These go into %{_javadir}/ant + *) destdir=$RPM_BUILD_ROOT%{_javadir}/%{name}; destname="/%{name}"; + esac + + #instal jar + install -m 644 ${jar} ${destdir}/${jarname}-%{version}.jar + # jar aliases + ln -sf ${jarname}-%{version}.jar ${destdir}/${jarname}.jar + ln -sf ../../java${destname}/${jarname}.jar $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}.jar + + #bootstrap does not have a pom + [ $jarname == ant-bootstrap ] && continue + + #install pom + install -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-${jarname}.pom + %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname} +done + +#ant-parent pom +install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom +%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP/%{name} ant-parent # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -682,7 +599,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing -echo "jaxp_transform_impl ant/ant-trax xalan-j2-serializer" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax %if %without bootstrap echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf @@ -694,6 +610,7 @@ echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp +echo "xalan-j2 ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2 echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch @@ -798,22 +715,6 @@ then fi %endif -%if %{gcj_support} -%post trax -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun trax -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %if %without bootstrap %if %{gcj_support} %post commons-net @@ -915,6 +816,22 @@ fi %endif %if %{gcj_support} +%post apache-xalan2 +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-xalan2 +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} %post apache-resolver if [ -x %{_bindir}/rebuild-gcj-db ] then @@ -1060,11 +977,14 @@ fi %dir %{ant_home}/etc %{ant_home}/etc/ant-update.xsl %{ant_home}/etc/changelog.xsl +%{ant_home}/etc/coverage-frames.xsl +%{ant_home}/etc/mmetrics-frames.xsl %{ant_home}/etc/log.xsl %{ant_home}/etc/tagdiff.xsl %{ant_home}/etc/junit-frames-xalan1.xsl %if %without bootstrap %{ant_home}/etc/common2master.xsl +%{ant_home}/etc/printFailingTests.xsl %endif %dir %{ant_home}/lib %{ant_home}/lib/%{name}.jar @@ -1109,18 +1029,6 @@ fi %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.* %endif -%files trax -%defattr(0644,root,root,0755) -%{_javadir}/%{name}/%{name}-trax.jar -%{_javadir}/%{name}/%{name}-trax-%{version}.jar -%{ant_home}/lib/%{name}-trax.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/trax -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/coverage-frames.xsl -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-%{version}.jar.* -%endif - %if %without bootstrap %if %{with_manifest_only} %files manifest-only @@ -1210,7 +1118,6 @@ fi %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-bcel.jar %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar -%{_javadir}/%{name}/%{name}-jakarta-bcel.jar %{ant_home}/lib/%{name}-apache-bcel.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel %if %{gcj_support} @@ -1221,7 +1128,6 @@ fi %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-log4j.jar %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar -%{_javadir}/%{name}/%{name}-jakarta-log4j.jar %{ant_home}/lib/%{name}-apache-log4j.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j %if %{gcj_support} @@ -1232,7 +1138,6 @@ fi %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-oro.jar %{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar -%{_javadir}/%{name}/%{name}-jakarta-oro.jar %{ant_home}/lib/%{name}-apache-oro.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro %{ant_home}/etc/maudit-frames.xsl @@ -1244,13 +1149,22 @@ fi %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-regexp.jar %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar -%{_javadir}/%{name}/%{name}-jakarta-regexp.jar %{ant_home}/lib/%{name}-apache-regexp.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp %if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.* %endif +%files apache-xalan2 +%defattr(0644,root,root,0755) +%{_javadir}/%{name}/%{name}-apache-xalan2.jar +%{_javadir}/%{name}/%{name}-apache-xalan2-%{version}.jar +%{ant_home}/lib/%{name}-apache-xalan2.jar +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2 +%if %{gcj_support} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-xalan2-%{version}.jar.* +%endif + %files javamail %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-javamail.jar @@ -1314,6 +1228,15 @@ fi # ----------------------------------------------------------------------------- %changelog +* Mon Aug 16 2010 Orion Poplawski 0:1.8.1-1 +- Update to ant 1.8.1 +- Update no-test-jar patch +- Update class-path-in-manifest patch +- Drop gnu-classpath patch +- Retire trax subpackage no longer shipped +- Add xalan2 subpackage and support for junitreport task +- Drop old jakarta jar aliases + * Thu Aug 13 2009 Alexander Kurtakov 0:1.7.1-12 - Fix compile with commons-net 2.0. diff --git a/apache-ant-1.7.0-javah.patch b/apache-ant-1.7.0-javah.patch deleted file mode 100644 index 480a666..0000000 --- a/apache-ant-1.7.0-javah.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig 2006-12-13 07:16:19.000000000 -0500 -+++ src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2007-07-27 12:59:04.000000000 -0400 -@@ -114,7 +114,7 @@ - } - kaffeDetected = false; - try { -- Class.forName("kaffe.util.NotImplemented"); -+ Class.forName("gnu.classpath.Configuration"); - kaffeDetected = true; - } catch (Throwable t) { - // swallow as this simply doesn't seem to be Kaffe ---- src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig 2006-12-13 07:16:22.000000000 -0500 -+++ src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2007-07-27 13:00:51.000000000 -0400 -@@ -56,7 +56,7 @@ - - private Commandline setupKaffehCommand(Javah javah) { - Commandline cmd = new Commandline(); -- cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh")); -+ cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah")); - - if (javah.getDestdir() != null) { - cmd.createArgument().setValue("-d"); diff --git a/apache-ant-1.7.ant.conf b/apache-ant-1.7.ant.conf deleted file mode 100644 index f55de9f..0000000 --- a/apache-ant-1.7.ant.conf +++ /dev/null @@ -1,20 +0,0 @@ -# ant.conf (Ant 1.7.x) -# JPackage Project - -# Validate --noconfig setting in case being invoked -# from pre Ant 1.6.x environment -if [ -z "$no_config" ] ; then - no_config=true -fi - -# Setup ant configuration -if $no_config ; then - # Disable RPM layout - rpm_mode=false -else - # Use RPM layout - rpm_mode=true - - # ANT_HOME for rpm layout - ANT_HOME=/usr/share/ant -fi diff --git a/apache-ant-1.8.ant.conf b/apache-ant-1.8.ant.conf new file mode 100644 index 0000000..e169839 --- /dev/null +++ b/apache-ant-1.8.ant.conf @@ -0,0 +1,20 @@ +# ant.conf (Ant 1.8.x) +# JPackage Project + +# Validate --noconfig setting in case being invoked +# from pre Ant 1.6.x environment +if [ -z "$no_config" ] ; then + no_config=true +fi + +# Setup ant configuration +if $no_config ; then + # Disable RPM layout + rpm_mode=false +else + # Use RPM layout + rpm_mode=true + + # ANT_HOME for rpm layout + ANT_HOME=/usr/share/ant +fi diff --git a/apache-ant-class-path-in-manifest.patch b/apache-ant-class-path-in-manifest.patch index 7f2e474..b6ece6a 100644 --- a/apache-ant-class-path-in-manifest.patch +++ b/apache-ant-class-path-in-manifest.patch @@ -1,15 +1,15 @@ ---- build.xml.orig 2008-09-25 09:14:02.000000000 -0400 -+++ build.xml 2008-09-25 09:14:16.000000000 -0400 -@@ -811,10 +811,10 @@ - - - -- -+ - - - + + +- ++ + + + - - -+ - - - -@@ -849,6 +850,7 @@ - - - -+ - - - diff --git a/apache-ant-no-test-jar.patch b/apache-ant-no-test-jar.patch index ca05bd7..d180c53 100644 --- a/apache-ant-no-test-jar.patch +++ b/apache-ant-no-test-jar.patch @@ -1,11 +1,11 @@ ---- apache-ant-1.7.1/build.xml.orig 2008-07-15 15:34:52.748697343 -0400 -+++ apache-ant-1.7.1/build.xml 2008-07-15 15:35:20.247215410 -0400 -@@ -925,7 +925,7 @@ - =================================================================== - --> - - - +--- apache-ant-1.8.1/build.xml.orig 2010-04-30 16:05:05.000000000 -0600 ++++ apache-ant-1.8.1/build.xml 2010-08-16 12:19:41.227167815 -0600 +@@ -792,7 +792,7 @@ + =================================================================== + --> + + + diff --git a/apache-ant-r529855.patch b/apache-ant-r529855.patch deleted file mode 100644 index 0c0b9d6..0000000 --- a/apache-ant-r529855.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java -=================================================================== ---- src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java (revision 529854) -+++ src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java (revision 529855) -@@ -321,10 +321,10 @@ - if (attributes.getSource() != null && !assumeJava13()) { - cmd.createArgument().setValue("-source"); - String source = attributes.getSource(); -- if ((assumeJava14() || assumeJava15()) -- && (source.equals("1.1") || source.equals("1.2"))) { -+ if (source.equals("1.1") || source.equals("1.2")) { - // support for -source 1.1 and -source 1.2 has been -- // added with JDK 1.4.2 - and isn't present in 1.5.0 either -+ // added with JDK 1.4.2 - and isn't present in 1.5.0 -+ // or 1.6.0 either - cmd.createArgument().setValue("1.3"); - } else { - cmd.createArgument().setValue(source); diff --git a/sources b/sources index 3e4cc5f..0af1f4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d68db4a1ada5c91bcbf53cefd0c2fd7 apache-ant-1.7.1-src.tar.bz2 +8c31b30f6b9863d1fef4bdf484fc8507 apache-ant-1.8.1-src.tar.bz2