rpms/ant/devel ant-1.7.1.pom, NONE, 1.1 ant-antlr-1.7.1.pom, NONE, 1.1 ant-apache-bcel-1.7.1.pom, NONE, 1.1 ant-apache-bsf-1.7.1.pom, NONE, 1.1 ant-apache-log4j-1.7.1.pom, NONE, 1.1 ant-apache-oro-1.7.1.pom, NONE, 1.1 ant-apache-regexp-1.7.1.pom, NONE, 1.1 ant-apache-resolver-1.7.1.pom, NONE, 1.1 ant-commons-logging-1.7.1.pom, NONE, 1.1 ant-commons-net-1.7.1.pom, NONE, 1.1 ant-javamail-1.7.1.pom, NONE, 1.1 ant-jdepend-1.7.1.pom, NONE, 1.1 ant-jmf-1.7.1.pom, NONE, 1.1 ant-jsch-1.7.1.pom, NONE, 1.1 ant-junit-1.7.1.pom, NONE, 1.1 ant-launcher-1.7.1.pom, NONE, 1.1 ant-netrexx-1.7.1.pom, NONE, 1.1 ant-nodeps-1.7.1.pom, NONE, 1.1 ant-parent-1.7.1.pom, NONE, 1.1 ant-starteam-1.7.1.pom, NONE, 1.1 ant-stylebook-1.7.1.pom, NONE, 1.1 ant-swing-1.7.1.pom, NONE, 1.1 ant-trax-1.7.1.pom, NONE, 1.1 ant-weblogic-1.7.1.pom, NONE, 1.1 apache-ant-class-path-in-manifest.patch, NONE, 1.1 apache-ant-gnu-classpath.patch, NONE, 1.1 apache-ant-no-test-jar.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 ant.spec, 1.93, 1.94 apache-ant-1.7.ant.conf, 1.1, 1.2 apache-ant-bz163689.patch, 1.1, 1.2 apache-ant-jars.patch, 1.2, 1.3 sources, 1.14, 1.15
Permaine Cheung
pcheung at fedoraproject.org
Fri Sep 26 14:57:16 UTC 2008
Author: pcheung
Update of /cvs/extras/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10140
Modified Files:
.cvsignore ant.spec apache-ant-1.7.ant.conf
apache-ant-bz163689.patch apache-ant-jars.patch sources
Added Files:
ant-1.7.1.pom ant-antlr-1.7.1.pom ant-apache-bcel-1.7.1.pom
ant-apache-bsf-1.7.1.pom ant-apache-log4j-1.7.1.pom
ant-apache-oro-1.7.1.pom ant-apache-regexp-1.7.1.pom
ant-apache-resolver-1.7.1.pom ant-commons-logging-1.7.1.pom
ant-commons-net-1.7.1.pom ant-javamail-1.7.1.pom
ant-jdepend-1.7.1.pom ant-jmf-1.7.1.pom ant-jsch-1.7.1.pom
ant-junit-1.7.1.pom ant-launcher-1.7.1.pom
ant-netrexx-1.7.1.pom ant-nodeps-1.7.1.pom
ant-parent-1.7.1.pom ant-starteam-1.7.1.pom
ant-stylebook-1.7.1.pom ant-swing-1.7.1.pom ant-trax-1.7.1.pom
ant-weblogic-1.7.1.pom apache-ant-class-path-in-manifest.patch
apache-ant-gnu-classpath.patch apache-ant-no-test-jar.patch
Log Message:
Upgrade to 1.7.1
--- NEW FILE ant-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<name>org.apache.tools.ant</name>
<description>Apache Ant</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<!-- the implementation jar of the xerces jar will be used by ant to parse
XML files, particularly the build files, if the JDK does not provide a parser
xercesImpl.jar is provided with ant -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.0</version>
<optional>true</optional>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- xml-apis contains the org.w3c.dom package
since ant is using DOM APIS to parse the XML build file and do other XML related activities
xml-apis is a compile time dependency
a version of xml-apis.jar is delivered with ant -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<filters>
<filter>../../../../target/ant/.build.timestamp.properties</filter>
</filters>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration> </configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>create-timestamp-file</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<tstamp/>
<mkdir dir="${project.build.directory}"/>
<touch file="${project.build.directory}/.build.timestamp.properties"/>
<echo file="${project.build.directory}/.build.timestamp.properties" append="false"
message="TODAY=${TODAY}"/>
</tasks>
</configuration>
</execution>
<execution>
<id>delete-timestamp-file</id>
<phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<delete file="${project.build.directory}/.build.timestamp.properties"/>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</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/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>
<exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
<exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
<exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/launch/**</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>
<exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
<exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
<exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/launch/**</exclude>
<exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
</testExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<omitBasedir>true</omitBasedir>
<systemProperties>
<property>
<name>ant.home</name>
<value>${env.ANT_HOME}</value>
</property>
<property>
<name>build.tests</name>
<value>../../../../target/ant/testcases</value>
</property>
<property>
<name>build.tests.value</name>
<value>../../../../target/ant/testcases</value>
</property>
<property>
<name>offline</name>
<value>true</value>
</property>
<property>
<name>root</name>
<value>../../../..</value>
</property>
</systemProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>../../../../src/main</directory>
<filtering>true</filtering>
<includes>
<include>org/apache/tools/ant/taskdefs/default.properties</include>
<include>org/apache/tools/ant/types/default.properties</include>
<include>org/apache/tools/ant/taskdefs/default.properties</include>
<include>org/apache/tools/ant/types/conditions/antlib.xml</include>
<include>org/apache/tools/ant/defaultManifest.mf</include>
<include>org/apache/tools/ant/version.txt</include>
</includes>
</resource>
<resource>
<directory>../../../../src/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/antlib.xml</include>
</includes>
</resource>
<resource>
<directory>../../../../docs</directory>
<filtering>false</filtering>
<includes>
<include>images/ant_logo_large.gif</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<directory>../../../../src/etc/testcases</directory>
<filtering>true</filtering>
</testResource>
<testResource>
<directory>../../../../src/main</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
<outputDirectory>../../../../target/ant/classes</outputDirectory>
<testOutputDirectory>../../../../target/ant/testcases</testOutputDirectory>
<directory>../../../../target/ant</directory>
</build>
</project>
--- NEW FILE ant-antlr-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.7.1</version>
<description>antlr specific task.
The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
<dependency>
<!-- add a dependency with antlr 2.7.2 consistent with libraries.properties antlr 2.7.6 is also available on ibiblio-->
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.2</version>
<optional>true</optional>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-apache-bcel-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bcel</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>bcel</groupId>
<artifactId>bcel</artifactId>
<version>5.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/tfilters/util/JavaClassHelper*</include>
<include>org/apache/tools/ant/tutil/depend/bcel/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-apache-bsf-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bsf</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/taskdefs/optional/Script*</include>
<include>org/apache/tools/ant/taskdefs/optional/script/**</include>
<include>org/apache/tools/ant/types/optional/*Script*</include>
<include>org/apache/tools/ant/util/Script*</include>
<include>org/apache/tools/ant/util/optional/Script*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-apache-log4j-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-log4j</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/listener/Log4jListener*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-apache-oro-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-oro</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/util/regexp/JakartaOro*</include>
<include>org/apache/tools/ant/taskdefs/optional/perforce/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-apache-regexp-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-apache-resolver-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-resolver</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/types/resolver/**</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-commons-logging-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-logging</artifactId>
<version>1.7.1</version>
<description>Ant Listener based on commons-logging</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/tlistener/CommonsLoggingListener*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-commons-net-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-net</artifactId>
<version>1.7.1</version>
<description>ftp, rexec and telnet tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/taskdefs/optional/net/FTP*</include>
<include>org/apache/tools/ant/taskdefs/optional/net/RExec*</include>
<include>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-javamail-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-javamail</artifactId>
<version>1.7.1</version>
<description>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</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/email/MimeMailer*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-jdepend-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jdepend</artifactId>
<version>1.7.1</version>
<description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
jdepend parser available on the maven repository</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jdepend</groupId>
<artifactId>jdepend</artifactId>
<version>2.7</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/jdepend/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-jmf-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jmf</artifactId>
<version>1.7.1</version>
<description>contains the sound task and a soundplayer listener
download the dependency from http://java.sun.com/products/java-media/jmf/</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.media</groupId>
<artifactId>jmf</artifactId>
<version>2.1.1e</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/sound/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-jsch-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
<version>1.7.1</version>
<description>contains the sshexec and scp tasks
jsch 0.1.29 might not be available from maven</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.29</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/ssh/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-junit-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.7.1</version>
<description>contains the junit and junirreport tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>create-timestamp-file</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<mkdir dir="${project.build.outputDirectory}"/>
<copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
<fileset dir="${project.build.sourceDirectory}/../etc">
<include name="junit-frames.xsl"/>
<include name="junit-noframes.xsl"/>
</fileset>
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/junit/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-launcher-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.7.1</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/launch/*.java</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/ant-launcher/classes</outputDirectory>
<testOutputDirectory>../../../../target/ant-launcher/testcases</testOutputDirectory>
<directory>../../../../target/ant-launcher</directory>
</build>
</project>
--- NEW FILE ant-netrexx-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-netrexx</artifactId>
<version>1.7.1</version>
<description>NetRexxC task
dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.ibm.netrexx</groupId>
<artifactId>netrexx</artifactId>
<version>2.0.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/NetRexxC*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-nodeps-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.7.1</version>
<description>contains all the optional tasks and types which do not have particular dependencies</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<!-- the implementation jar of the xerces jar will be used by ant to parse
XML files, particularly the build files, if the JDK does not provide a parser
xercesImpl.jar is provided with ant -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.0</version>
<optional>true</optional>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- xml-apis contains the org.w3c.dom package
since ant is using DOM APIS to parse the XML build file and do other XML related activities
xml-apis is a compile time dependency
a version of xml-apis.jar is delivered with ant -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant/taskdefs/optional/**</include>
<include>org/apache/tools/ant/types/optional/**</include>
<include>org/apache/tools/ant/util/depend/*</include>
<include>org/apache/tools/ant/util/optional/**</include>
<include>org/apache/tools/ant/util/java15/**</include>
<include>org/apache/tools/ant/util/regexp/Jdk14Regexp*</include>
</includes>
<excludes>
<exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/junit/**</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/perforce/**</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
<exclude>org/apache/tools/ant/util/optional/Script*</exclude>
<exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/StyleBook*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ejb/Ejbc*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ejb/DDCreator*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ejb/WLRun*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ejb/WLStop*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/Telnet*</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/scm/AntStarTeam*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/starteam/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/sound/*</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/jdepend/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/splash/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/ant-nodeps/classes</outputDirectory>
<testOutputDirectory>../../../../target/ant-nodeps/testcases</testOutputDirectory>
<directory>../../../../target/ant-nodeps</directory>
</build>
</project>
--- NEW FILE ant-parent-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<version>1.7.1</version>
<packaging>pom</packaging>
<description>master POM</description>
<name>Apache Ant</name>
<url>http://ant.apache.org/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>Apache Software Foundation</name>
</organization>
<distributionManagement>
<!-- Null out inherited apache distribution repo by default -->
<repository>
<id>dummy</id>
<name>Dummy to avoid accidental deploys</name>
<url></url>
</repository>
</distributionManagement>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/ant/core/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jant/core/trunk</developerConnection>
<url>http://svn.apache.org/repos/asf/ant/core/trunk</url>
</scm>
<mailingLists>
<mailingList>
<name>Ant Developers List</name>
<subscribe>dev-subscribe at ant.apache.org</subscribe>
<unsubscribe>dev-unsubscribe at ant.apache.org</unsubscribe>
<post>dev at ant.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
</mailingList>
<mailingList>
<name>Ant Users List</name>
<subscribe>user-subscribe at ant.apache.org</subscribe>
<unsubscribe>user-unsubscribe at ant.apache.org</unsubscribe>
<post>user at ant.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/ant-user</archive>
</mailingList>
</mailingLists>
<issueManagement>
<system>bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<modules>
<module>ant</module>
<module>ant-antlr</module>
<module>ant-apache-bcel</module>
<module>ant-apache-bsf</module>
<module>ant-apache-log4j</module>
<module>ant-apache-oro</module>
<module>ant-apache-regexp</module>
<module>ant-apache-resolver</module>
<module>ant-commons-logging</module>
<module>ant-commons-net</module>
<module>ant-jai</module>
<module>ant-javamail</module>
<module>ant-jdepend</module>
<module>ant-jmf</module>
<module>ant-jsch</module>
<module>ant-junit</module>
<module>ant-launcher</module>
<module>ant-netrexx</module>
<module>ant-nodeps</module>
<module>ant-starteam</module>
<module>ant-stylebook</module>
<module>ant-swing</module>
<module>ant-testutil</module>
<module>ant-trax</module>
<module>ant-weblogic</module>
</modules>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>../../../src/main</sourceDirectory>
<testSourceDirectory>../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../target/classes</outputDirectory>
<testOutputDirectory>../../../target/testcases</testOutputDirectory>
</build>
</project>
--- NEW FILE ant-starteam-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-starteam</artifactId>
<description>Starteam SDK tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.starteam</groupId>
<artifactId>starteam-sdk</artifactId>
<version>5.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/scm/AntStarTeam*</include>
<include>org/apache/tools/ant//taskdefs/optional/scm/starteam/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-stylebook-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-stylebook</artifactId>
<version>1.7.1</version>
<description>executes the Apache Stylebook document generator. Deprecated since Ant 1.7</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>stylebook</groupId>
<artifactId>stylebook</artifactId>
<version>1.0-b2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/StyleBook*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-swing-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-swing</artifactId>
<version>1.7.1</version>
<description>a listener and a splash task based on Swing</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/splash/*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-trax-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-trax</artifactId>
<version>1.7.1</version>
<description>contains particularly one class necessary for the execution of the xslt task</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<!-- the implementation jar of the xerces jar will be used by ant to parse
XML files, particularly the build files, if the JDK does not provide a parser
xercesImpl.jar is provided with ant -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.0</version>
<optional>true</optional>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- xml-apis contains the org.w3c.dom package
since ant is using DOM APIS to parse the XML build file and do other XML related activities
xml-apis is a compile time dependency
a version of xml-apis.jar is delivered with ant -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
<dependency>
<!-- xalan contains a TRAX compliant implementation -->
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.0</version>
<optional>true</optional>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/TraXLiaison*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
--- NEW FILE ant-weblogic-1.7.1.pom ---
<?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.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-weblogic</artifactId>
<version>1.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.bea</groupId>
<artifactId>weblogicclasses</artifactId>
<version>5.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.bea</groupId>
<artifactId>weblogic</artifactId>
<version>8.1.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<includes>
<include>org/apache/tools/ant//taskdefs/optional/ejb/Ejbc*</include>
<include>org/apache/tools/ant//taskdefs/optional/ejb/DDCreator*</include>
<include>org/apache/tools/ant//taskdefs/optional/ejb/WLRun*</include>
<include>org/apache/tools/ant//taskdefs/optional/ejb/WLStop*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>
apache-ant-class-path-in-manifest.patch:
--- NEW FILE apache-ant-class-path-in-manifest.patch ---
--- 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 @@
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
</metainf>
- <manifest>
+ <!-- <manifest>
<attribute name="Class-Path"
value="ant.jar xml-apis.jar xercesImpl.jar xalan.jar"/>
- </manifest>
+ </manifest> -->
</jar>
<jar destfile="${build.lib}/ant-nodeps.jar"
apache-ant-gnu-classpath.patch:
--- NEW FILE apache-ant-gnu-classpath.patch ---
--- apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig 2008-06-27 01:05:20.000000000 -0400
+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2008-07-10 17:08:05.793449901 -0400
@@ -134,7 +134,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
--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig 2008-06-27 01:05:20.000000000 -0400
+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2008-07-10 17:08:05.801530455 -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");
--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java.orig 2008-06-27 01:05:21.000000000 -0400
+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java 2008-07-10 17:10:47.081449425 -0400
@@ -32,9 +32,7 @@
// sorted by newest Kaffe version first
private static final String[] N2A_CLASSNAMES = new String[] {
- "gnu.classpath.tools.native2ascii.Native2Ascii",
- // pre Kaffe 1.1.5
- "kaffe.tools.native2ascii.Native2Ascii",
+ "gnu.classpath.tools.native2ascii.Native2ASCII",
};
/**
apache-ant-no-test-jar.patch:
--- NEW FILE apache-ant-no-test-jar.patch ---
--- 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 @@
===================================================================
-->
<target name="dist-lite"
- depends="jars,test-jar"
+ depends="jars"
description="--> creates a minimum distribution to run Apache Ant">
<mkdir dir="${dist.dir}"/>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 20 Jul 2007 20:57:49 -0000 1.16
+++ .cvsignore 26 Sep 2008 14:56:45 -0000 1.17
@@ -1 +1 @@
-apache-ant-1.7.0-src.tar.gz
+apache-ant-1.7.1-src.tar.bz2
Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ant.spec 9 Jul 2008 17:00:49 -0000 1.93
+++ ant.spec 26 Sep 2008 14:56:45 -0000 1.94
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2007, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,33 +28,32 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-%define with_manifest_only 0
+%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+
+%bcond_with bootstrap
+
+%if %with bootstrap
+%define build_javadoc 0
+%else
+%define build_javadoc 1
+%endif
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-# Bootstrap sequence is
-# 1) rpmbuild ant --with bootstrap1 and install
-# 2) build xml-commons-apis and install
-# 3) build some jaxp_parser_impl (crimson) and install
-# 4) rpmbuild ant --with bootstrap2 and force update
-# 5) build rest of full ant BRs and install them
-# 6) rpmbuild ant (no special option) and force update
-
-# build while still no jaxp_parser_impl nor xml-commons-apis available
-%define bootstrap1 %{?_with_bootstrap1:1}%{!?_with_bootstrap1:%{?_without_bootstrap1:0}%{!?_without_bootstrap1:%{?_bootstrap1:%{_bootstrap1}}%{!?_bootstrap1:0}}}
-# build core packages when xml-commons-apis and some jaxp_parser_impl available
-%define bootstrap2 %{?_with_bootstrap2:1}%{!?_with_bootstrap2:%{?_without_bootstrap2:0}%{!?_without_bootstrap2:%{?_bootstrap2:%{_bootstrap2}}%{!?_bootstrap2:0}}}
+%define with_manifest_only 0
%define ant_home %{_datadir}/ant
%define section free
%define major_version 1.7
-%define cvs_version 1.7.0
+%define cvs_version 1.7.1
Name: ant
-Version: 1.7.0
-Release: 2%{?dist}
+Version: 1.7.1
+Release: 7%{?dist}
Epoch: 0
Summary: Ant build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -62,57 +61,84 @@
License: ASL 2.0
URL: http://ant.apache.org/
Group: Development/Build Tools
-Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz
+Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
Source2: apache-ant-%{major_version}.ant.conf
-# javah: BZ 157750
-# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
-# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
-# Message-ID: <432A8E37.8050101 at zarb.org>
-Patch2: apache-ant-1.7.0-javah.patch
+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
-Patch4: apache-ant-jars.patch
-Patch5: apache-ant-bz163689.patch
-Patch6: apache-ant-r529855.patch
-
-Requires: jaxp_parser_impl
-Requires: jpackage-utils >= 0:1.6
-Requires(pre): jpackage-utils >= 0:1.6
-Requires(postun): jpackage-utils >= 0:1.6
-Requires: java-devel
-%if ! %{bootstrap1}
-Requires: xerces-j2
-Requires: xml-commons-apis
+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
+
+BuildRequires: jpackage-utils >= 0:1.7.5
+BuildRequires: java-devel >= 0:1.5.0
+BuildRequires: jaxp_transform_impl
+%if %without bootstrap
+BuildRequires: ant
+BuildRequires: junit
+BuildRequires: xml-commons-jaxp-1.3-apis
+BuildRequires: xerces-j2
%endif
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: java-devel >= 0:1.5
-BuildRequires: coreutils
-%if ! %{bootstrap1}
-BuildRequires: jaxp_parser_impl
-BuildRequires: xml-commons-apis
+
+Requires: jpackage-utils >= 0:1.7.5
+Requires: java-devel >= 0:1.5.0
+%if %without bootstrap
+Requires: xerces-j2
+Requires: xml-commons-jaxp-1.3-apis
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: ant-optional < %{epoch}:%{version}-%{release}
+Provides: ant-optional = %{epoch}:%{version}-%{release}
Obsoletes: ant-optional-full < %{epoch}:%{version}-%{release}
-# Allow subpackages not in Fedora to be installed from JPackage
+Provides: ant-optional-full = %{epoch}:%{version}-%{release}
+# Allow subpackages not in RHEL to be installed from JPackage
Provides: %{name} = %{epoch}:%{version}-%{release}
+# RHUG
+Obsoletes: ant-devel < %{epoch}:%{version}-%{release}
+Provides: ant-devel = %{epoch}:%{version}-%{release}
+# Mandriva
+Conflicts: j2sdk-ant
# RHEL3 and FC2
-Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
+Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
Provides: %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-core < %{epoch}:%{version}-%{release}
Provides: %{name}-core = %{epoch}:%{version}-%{release}
-# FC4
-Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc
-Provides: %{name}-jmf = %{epoch}:%{version}-%{release}
-
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
%endif
+Requires(post): jpackage-utils >= 0:1.7.5
+Requires(postun): jpackage-utils >= 0:1.7.5
+
%description
Ant is a platform-independent build tool for java. It's used by apache
jakarta and xml projects.
@@ -127,11 +153,67 @@
Allo stato attuale viene utilizzato dai progetti apache jakarta ed
apache xml.
+%package jmf
+Summary: Optional jmf tasks for %{name}
+Group: Development/Build Tools
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
+Provides: ant-jmf = %{epoch}:%{version}-%{release}
+
+%description jmf
+Optional jmf tasks for %{name}.
+
+%description jmf -l fr
+Taches jmf optionelles pour %{name}.
+
+%package nodeps
+Summary: Optional tasks for %{name}
+Group: Development/Build Tools
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: ant-nodeps = %{epoch}:%{version}-%{release}
+
+%description nodeps
+Optional tasks for %{name}.
+
+%description nodeps -l fr
+Taches optionelles pour %{name}.
+
+%package swing
+Summary: Optional swing tasks for %{name}
+Group: Development/Build Tools
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: ant-swing = %{epoch}:%{version}-%{release}
+
+%description swing
+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
Summary: Manifest-only jars for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Provides: %{name}-icontract = %{epoch}:%{version}-%{release}
Provides: %{name}-netrexx = %{epoch}:%{version}-%{release}
Provides: %{name}-starteam = %{epoch}:%{version}-%{release}
@@ -141,130 +223,84 @@
Provides: %{name}-xalan1 = %{epoch}:%{version}-%{release}
Provides: %{name}-xslp = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description manifest-only
Manifest-only jars for %{name}.
%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package antlr
Summary: Optional antlr tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: antlr
BuildRequires: antlr
Provides: ant-antlr = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description antlr
Optional antlr tasks for %{name}.
%description antlr -l fr
Taches antlr optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-bsf
Summary: Optional apache bsf tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: bsf
BuildRequires: bsf
Provides: ant-apache-bsf = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description apache-bsf
Optional apache bsf tasks for %{name}.
%description apache-bsf -l fr
Taches apache bsf optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-resolver
Summary: Optional apache resolver tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: xml-commons-resolver
BuildRequires: xml-commons-resolver
Provides: ant-apache-resolver = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description apache-resolver
Optional apache resolver tasks for %{name}.
%description apache-resolver -l fr
Taches apache resolver optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package commons-logging
Summary: Optional commons logging tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: jakarta-commons-logging
BuildRequires: jakarta-commons-logging
Provides: ant-commons-logging = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description commons-logging
Optional commons logging tasks for %{name}.
%description commons-logging -l fr
Taches commons logging optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package commons-net
Summary: Optional commons net tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: jakarta-commons-net
BuildRequires: jakarta-commons-net
Provides: ant-commons-net = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description commons-net
Optional commons net tasks for %{name}.
%description commons-net -l fr
Taches commons net optionelles pour %{name}.
-%endif
# Disable because we don't ship the dependencies
%if 0
@@ -272,16 +308,10 @@
Summary: Optional jai tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: jai
BuildRequires: jai
Provides: ant-jai = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description jai
Optional jai tasks for %{name}.
@@ -290,286 +320,142 @@
Taches jai optionelles pour %{name}.
%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-bcel
Summary: Optional apache bcel tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: bcel
BuildRequires: bcel
Provides: ant-apache-bcel = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-bcel < %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description apache-bcel
Optional apache bcel tasks for %{name}.
%description apache-bcel -l fr
Taches apache bcel optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-log4j
Summary: Optional apache log4j tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: log4j
BuildRequires: log4j
Provides: ant-apache-log4j = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-log4j < %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description apache-log4j
Optional apache log4j tasks for %{name}.
%description apache-log4j -l fr
Taches apache log4j optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-oro
Summary: Optional apache oro tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: oro
BuildRequires: oro
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-oro < %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description apache-oro
Optional apache oro tasks for %{name}.
%description apache-oro -l fr
Taches apache oro optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-regexp
Summary: Optional apache regexp 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-regexp = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-regexp < %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description apache-regexp
Optional apache regexp tasks for %{name}.
%description apache-regexp -l fr
Taches apache regexp optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package javamail
Summary: Optional javamail tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: javamail >= 0:1.2-5jpp
Requires: jaf >= 0:1.0.1-5jpp
BuildRequires: javamail >= 0:1.2-5jpp
BuildRequires: jaf >= 0:1.0.1-5jpp
Provides: ant-javamail = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description javamail
Optional javamail tasks for %{name}.
%description javamail -l fr
Taches javamail optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package jdepend
Summary: Optional jdepend tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: jdepend
BuildRequires: jdepend
Provides: ant-jdepend = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description jdepend
Optional jdepend tasks for %{name}.
%description jdepend -l fr
Taches jdepend optionelles pour %{name}.
-%endif
-
-%package jmf
-Summary: Optional jmf tasks for %{name}
-Group: Development/Build Tools
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: ant-jmf = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-%description jmf
-Optional jmf tasks for %{name}.
-
-%description jmf -l fr
-Taches jmf optionelles pour %{name}.
-
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package jsch
Summary: Optional jsch tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: jsch
BuildRequires: jsch
Provides: ant-jsch = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description jsch
Optional jsch tasks for %{name}.
%description jsch -l fr
Taches jsch optionelles pour %{name}.
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%package junit
Summary: Optional junit tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: junit
-BuildRequires: junit
Provides: ant-junit = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description junit
Optional junit tasks for %{name}.
%description junit -l fr
Taches junit optionelles pour %{name}.
-%endif
-
-%package nodeps
-Summary: Optional tasks for %{name}
-Group: Development/Build Tools
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: ant-nodeps = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-%description nodeps
-Optional tasks for %{name}.
-
-%description nodeps -l fr
-Taches optionelles pour %{name}.
-
-%package swing
-Summary: Optional swing tasks for %{name}
-Group: Development/Build Tools
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: ant-swing = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-%description swing
-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
-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}
-Conflicts: ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-%description trax
-Optional trax tasks for %{name}.
-
-%description trax -l fr
-Taches trax optionelles pour %{name}.
%package scripts
Summary: Additional scripts for %{name}
Group: Development/Build Tools
AutoReqProv: no
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: /usr/bin/python
+Requires: %{_bindir}/perl
+Requires: %{_bindir}/python
%description scripts
Additional Perl and Python scripts for %{name}.
@@ -599,45 +485,51 @@
%description javadoc -l fr
Javadoc pour %{name}.
+%endif
# -----------------------------------------------------------------------------
%prep
%setup -q -n apache-ant-%{cvs_version}
-# #157750: make the javah task work with java-gcj-compat
-%patch2 -p0
+# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
+%ifarch ppc64 s390x
+%patch1 -p1
+%endif
-# Fix some places where copies of classes are included in the wrong jarfiles
-%patch4 -p1 -b .orig
+# Update ant to work with recent versions of GNU Classpath
+%patch2 -p1
-# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
-#%ifarch ppc64 s390x
-#%patch5 -p1 -b .orig
-#%endif
+# When bootstrapping, we don't have junit
+%patch3 -p1
-# Patch to make Java 6's javac understand -source 1.2
-%patch6 -p0
+# Fix class-path-in-manifest rpmlint warning
+%patch4 -p0
# clean jar files
-find . -name "*.jar" -exec rm -f {} \;
+find . -name "*.jar" | %{_bindir}/xargs -t rm
+
+# Fix file-not-utf8 rpmlint warning
+iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
+mv KEYS.utf8 KEYS
+iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8
+mv LICENSE.utf8 LICENSE
# -----------------------------------------------------------------------------
%build
-# classpath selects optional components to build
-#export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jsch bsf xml-commons-resolver)
-
-# perform bootstrap and build without jjp or user configs,
-# (except JAVA_HOME as required by build script)
-[ -n "$JAVA_HOME" ] && unset JAVA_HOME
-[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
-[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-export JAVA_HOME
-export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=/tmp"
-sh build.sh --noconfig jars javadocs
-unset GCJ_PROPERTIES
+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}
+%{ant} javadocs
+%endif
+%else
+export JAVA_HOME=%{java_home}
+export CLASSPATH=$JAVA_HOME/lib/tools.jar
+sh ./build.sh --noconfig jars
+%endif
# -----------------------------------------------------------------------------
@@ -648,46 +540,99 @@
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc}
# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar
+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
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+%if %without bootstrap
%if %{with_manifest_only}
-cp -p build/lib/%{name}-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar
-cp -p build/lib/%{name}-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
-cp -p build/lib/%{name}-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar
-cp -p build/lib/%{name}-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar
-cp -p build/lib/%{name}-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar
-cp -p build/lib/%{name}-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar
-cp -p build/lib/%{name}-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
-cp -p build/lib/%{name}-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
-cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
-cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
-cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
-cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
-#cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
-cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
-cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
-cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
-cp -p build/lib/%{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
-cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
+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
-cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
-cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
-cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
-cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
-%endif
-cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-cp -p build/lib/%{name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.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 ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@@ -699,17 +644,14 @@
# XSLs
cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
-%if %{bootstrap1} || %{bootstrap2}
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend-frames.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-frames.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-noframes.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/maudit-frames.xsl
-%endif
# install everything else
mkdir -p $RPM_BUILD_ROOT%{_bindir}
+%if %without bootstrap
cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
+%else
+cp -p src/script/ant{,Run} $RPM_BUILD_ROOT%{_bindir}
+%endif
# default ant.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -717,9 +659,14 @@
# OPT_JAR_LIST fragments
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
-%if ! %{bootstrap1} && ! %{bootstrap2}
+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
+echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai
@@ -731,21 +678,29 @@
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
-echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
%endif
-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" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax
+%if %{build_javadoc}
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%endif
# fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
+%if %with bootstrap
+find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
+ -a ! -name ant-update.xsl \
+ -a ! -name changelog.xsl \
+ -a ! -name coverage-frames.xsl \
+ -a ! -name junit-frames-xalan1.xsl \
+ -a ! -name log.xsl \
+ -a ! -name mmetrics-frames.xsl \
+ -a ! -name tagdiff.xsl \
+ | xargs -t rm
+%endif
+
# -----------------------------------------------------------------------------
%if %{gcj_support}
@@ -757,16 +712,18 @@
# -----------------------------------------------------------------------------
-%if %{gcj_support}
%post
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{gcj_support}
%postun
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -774,7 +731,7 @@
%endif
%if %{gcj_support}
-%post commons-net
+%post jmf
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -782,17 +739,15 @@
%endif
%if %{gcj_support}
-%postun commons-net
+%postun jmf
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-# We do not ship dependencies for these, so they are disabled.
-%if 0
%if %{gcj_support}
-%post jai
+%post nodeps
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -800,16 +755,15 @@
%endif
%if %{gcj_support}
-%postun jai
+%postun nodeps
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%endif
%if %{gcj_support}
-%post antlr
+%post swing
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -817,7 +771,7 @@
%endif
%if %{gcj_support}
-%postun antlr
+%postun swing
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -825,7 +779,7 @@
%endif
%if %{gcj_support}
-%post apache-bcel
+%post trax
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -833,15 +787,16 @@
%endif
%if %{gcj_support}
-%postun apache-bcel
+%postun trax
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
+%if %without bootstrap
%if %{gcj_support}
-%post jmf
+%post commons-net
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -849,15 +804,17 @@
%endif
%if %{gcj_support}
-%postun jmf
+%postun commons-net
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
+# We do not ship dependencies for these, so they are disabled.
+%if 0
%if %{gcj_support}
-%post trax
+%post jai
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -865,15 +822,16 @@
%endif
%if %{gcj_support}
-%postun trax
+%postun jai
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
+%endif
%if %{gcj_support}
-%post apache-log4j
+%post antlr
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -881,7 +839,7 @@
%endif
%if %{gcj_support}
-%postun apache-log4j
+%postun antlr
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -889,7 +847,7 @@
%endif
%if %{gcj_support}
-%post swing
+%post apache-bcel
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -897,7 +855,7 @@
%endif
%if %{gcj_support}
-%postun swing
+%postun apache-bcel
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -905,7 +863,7 @@
%endif
%if %{gcj_support}
-%post nodeps
+%post apache-log4j
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -913,7 +871,7 @@
%endif
%if %{gcj_support}
-%postun nodeps
+%postun apache-log4j
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -1063,6 +1021,7 @@
%{_bindir}/rebuild-gcj-db
fi
%endif
+%endif
%files
%defattr(0644,root,root,0755)
@@ -1071,9 +1030,11 @@
%attr(0755,root,root) %{_bindir}/ant
%attr(0755,root,root) %{_bindir}/antRun
%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-launcher.jar
%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}-launcher.jar
%{_javadir}/%{name}-launcher-%{version}.jar
+%{_javadir}/%{name}-bootstrap.jar
+%{_javadir}/%{name}-bootstrap-%{version}.jar
%dir %{_javadir}/%{name}
%dir %{ant_home}
%dir %{ant_home}/etc
@@ -1082,16 +1043,58 @@
%{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
+%endif
%dir %{ant_home}/lib
%dir %{_sysconfdir}/%{name}.d
-
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-%{version}.jar.*
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-launcher-%{version}.jar.*
%endif
+%files jmf
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-jmf.jar
+%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
+%endif
+
+%files nodeps
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-nodeps.jar
+%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
+%endif
+
+%files swing
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-swing.jar
+%{_javadir}/%{name}/%{name}-swing-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/swing
+%if %{gcj_support}
+%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
+%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
%defattr(0644,root,root,0755)
@@ -1113,70 +1116,50 @@
%{_javadir}/%{name}/ant-xslp.jar
%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files antlr
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-antlr.jar
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/antlr
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-bsf
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bsf.jar
%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-resolver
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-resolver.jar
%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files commons-logging
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-commons-logging.jar
%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files commons-net
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-commons-net.jar
%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-%{version}.jar.*
%endif
-%endif
# Disable as we dont ship the dependencies
%if 0
@@ -1185,42 +1168,31 @@
%{_javadir}/%{name}/%{name}-jai.jar
%{_javadir}/%{name}/%{name}-jai-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jai
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-%{version}.jar.*
%endif
%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-bcel
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bcel.jar
%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-log4j
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-log4j.jar
%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-oro
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-oro.jar
@@ -1228,41 +1200,29 @@
%{_javadir}/%{name}/%{name}-jakarta-oro.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
%{ant_home}/etc/maudit-frames.xsl
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-regexp
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-regexp.jar
%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files javamail
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-javamail.jar
%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/javamail
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files jdepend
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jdepend.jar
@@ -1270,38 +1230,19 @@
%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
%{ant_home}/etc/jdepend.xsl
%{ant_home}/etc/jdepend-frames.xsl
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-%{version}.jar.*
%endif
-%endif
-
-%files jmf
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jmf.jar
-%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files jsch
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jsch.jar
%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-%{version}.jar.*
%endif
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
%files junit
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-junit.jar
@@ -1309,47 +1250,9 @@
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
%{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl
-
%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-%{version}.jar.*
%endif
-%endif
-
-%files nodeps
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-nodeps.jar
-%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
-%endif
-
-%files swing
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-swing.jar
-%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/swing
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%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
-%config(noreplace) %{_sysconfdir}/%{name}.d/trax
-%{ant_home}/etc/mmetrics-frames.xsl
-%{ant_home}/etc/coverage-frames.xsl
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-%{version}.jar.*
-%endif
%files scripts
%defattr(0755,root,root,0755)
@@ -1360,106 +1263,77 @@
%defattr(0644,root,root,0755)
%doc docs/*
+%if %{build_javadoc}
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%endif
+%endif
# -----------------------------------------------------------------------------
%changelog
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.0-2
-- drop repotag
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.7.0-1jpp.4
-- Autorebuild for GCC 4.3
-
-* Wed Jan 09 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.3
-- make Java 6's javac understand -source 1.1 as well (patch from bodewig
- on the ant mailing list)
+* Tue Sep 23 2008 Permaine Cheung <pcheung at redhat.com> 0:1.7.1-7
+- Update to 1.7.1
+- Fix some rpmlint issues
-* Tue Aug 14 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.2
-- Enable building commons-net subpackage
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-7
+- enable non-bootstrap
-* Fri Jul 27 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp.1
-- Merge with upstream for upgrade
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-6
+- add ant-bootstrap jar if bootstrap is enabled
+- enable jmf, swing, trax if bootstrap is enabled
+- BuildRequires: jaxp_transform_impl
+- BuildRequires: junit for non-bootstrap
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-5
+- enable ant-nodeps in bootstrap mode
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-4
+- remove junit for bootstrap
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-3
+- build as bootstrap
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-2
+- set rpm_mode=false by default
+
+* Thu Jul 10 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-1
+- 1.7.1
+- update maven pom files
+- rediff apache-ant-jars.patch
+- rediff apache-ant-bz163689.patch
+- add apache-ant-gnu-classpath.patch
+- set rpm_mode=true in conf since the ant script handles the rest
+
+* Thu Jul 10 2008 David Walluck <dwalluck at redhat.com> 0:1.7.0-3
+- add bootstrap mode
+- replace some alternatives/virtual requires by explicit requires
+- remove javadoc scriptlets
+- fix GCJ support
+- add workaround for xalan-j2 in %%{_sysconfdir}/%%{name}.d/trax
+- version Obsoletes and add Provides
+- remove Conflicts
+- mark files in %%{_sysconfdir} as %%config(noreplace)
+
+* Thu Jul 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.7.0-2.jpp5
+- Add poms and depmap frags
+- (B)R jpackage-utils >= 0:1.7.5
+- BR java-devel = 0:1.5.0
+- R java >= 0:1.5.0
* Wed Jun 20 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp
- Upgrade to the final 1.7.0
-* Wed Apr 25 2007 Permaine Cheung <pcheung at redhat.com> 0:1.6.5-4jpp.3
-- Update spec file as per fedora review.
-
-* Mon Mar 19 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-4jpp.2
-- Get rid of the Provides for ant-optional and ant-optional-full.
-
-* Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-4jpp.1
-- Merge with upstream, get rid of the endorsed patch
-
-* Tue Feb 20 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-2jpp.3
-- Add endorsed dir and create symlinks for xml-commons-apis and
- jaxp_parser_impl there, and add the option when running ant.
-- Add missing BR
-- Fix some rpmlint issues
-
-* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-4jpp
-- Must skip release 3 because Youri::Bugzilla::_add_version doesn't
- distinguish between JPP-1.6 and JPP-1.7 and we have 1.6.5-3 in 1.6
-
-* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-3jpp
-- Added option "bootstrap1" for building core while no jaxp_parser_impl
- nor xml-commons-apis available
-- Added option "bootstrap2" for building core when some jaxp_parser_impl
- and xml-commons-apis available
-
* Thu Sep 21 2006 Will Tatam <will.tatam at red61.com> - 0:1.7.0-0.Beta1.1jpp
- Upgraded to 1.7.0Beta1
- removed the apache-ant-1.6.5-jvm1.5-detect.patch as merged upstream
-* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 1.6.5-2jpp.2
-- Re-enabling style and xmlvalidate task on ppc64 and s390x.
-
-* Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-2jpp.1
+* Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-2jpp
- Added conditional native compilation
-- Add missing requirements
-- Synch with JPackage spec
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.5-1jpp_11fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_10fc
-- rebuild
-
-* Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_9fc
-- actually apply the patch added in 8fc!
-
-* Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_8fc
- Added patch to fix jvm version detection
-
-* Mon Mar 6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.6.5-1jpp_7fc
-- stop scriptlet spew
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_6fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_5fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Feb 2 2006 Archit Shah <ashah at redhat.com> - 0:1.6.5-1jpp_4fc
-- build ant without using native code
-
-* Mon Jan 9 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_3fc
-- bump again for another gcj fix
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_2fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Fri Dec 9 2005 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_1fc
-- rebuild for gcc-4.1.0-0.6
+- Add missing requirements
+- Synch with Fedora spec
* Wed Nov 09 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.6.5-1jpp
- Upgrade to 1.6.5
@@ -1474,97 +1348,9 @@
- Add manifest-only package (mainly for eclipse)
- Add conflicts on j2sdk for Mandriva
-* Tue Nov 8 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-0jpp_1fc
-- Converted from ISO-8859-1 to UTF-8. (The correct encoding was
- somehow lost in going from version 1.58 to 1.59.)
-
-* Thu Nov 3 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-0jpp_1fc
-- Changed the Release from 2fc to 0jpp_1fc on the assumption that we
- are going to want to resync this package with JPackage if/when the
- latter releases ant-1.6.5-1jpp.
-
-* Tue Nov 1 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-2fc
-- Removed .jar files from upstream source
-
-* Mon Oct 31 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-1fc
-- Upgraded to 1.6.5
-- Removed apache-ant-1.6.2.patch. It was no longer relevant due to the
- following change upstream:
- src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v1.41.2.8
-- Updated apache-ant-1.6.2-rpm.patch to apache-ant-1.6.5-rpm.patch
-- Replaced apache-ant-bz157750.patch with apache-ant-1.6.5-javah.patch
-- Converted this spec file from iso-8859-1 to utf-8. (#159586)
-
-* Wed Aug 3 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_14fc
-- Allow subpackages not in Fedora to be installed from JPackage.
-- Obsolete the jmf subpackage (#164389).
-
-* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_13fc
-- Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
-
-* Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_12fc
-- Built on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm (also BC-compiles subpackages).
-- Remove the jmf subpackage since it wasn't being built anyway.
-
-* Fri Jul 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_11fc
-- Bootstrap onto ia64, ppc64, s390 and s390x.
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_10fc
-- Add the bsf subpackage since we now ship bsf.
-- Remove gcj workaround (not correct, so assume not necessary).
-- Remove jarfiles from the tarball.
-
-* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
-- Make the javah task fall back to executing javah if
- com.sun.tools.javah.Main cannot be found.
-
-* Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_8fc
-- Use absolute paths for rebuild-gcj-db.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_7fc
-- Build the javah task (#157750).
-- Add alpha to the list of build architectures (#157522).
-
-* Thu May 5 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_6fc
-- Add dependencies for post and postun scriptlets (#156901).
-
-* Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_5fc
-- BC-compile the two core jars.
-- Own /usr/share/java/ant.
-
-* Fri Apr 08 2005 Andrew Overholt <overholt at redhat.com> 0:1.6.2-3jpp_4fc
-- Replace gcj workarounds removed in previous commit.
-
-* Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
-- Add NOTICE file as per Apache License version 2.0.
-- Remove some now unnecessary gcj workarounds.
-- Add the jsch subpackage since we now ship jsch.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_2fc
-- Use jdtcore.jar instead of ecj.jar when running under libgcj.
-
-* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_1fc
-- Upgrade to latest version.
-
-* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_7fc
-- Explicitly require java-devel to make beehive play nice.
-
* Mon Nov 8 2004 Gary Benson <gbenson at redhat.com> - 0:1.6.2-3jpp
- Build OPT_JAR_LIST from files in /etc/ant.d.
-* Thu Nov 4 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_6fc
-- Build into Fedora.
-
-* Mon Nov 1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_5fc
-- Explicitly require xerces-j2 to make beehive play nice.
-
-* Mon Nov 1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_4fc
-- Bootstrap into Fedora.
-
* Mon Sep 06 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-2jpp
- Fix to backward compatibility symbolic links.
@@ -1583,7 +1369,7 @@
* Tue Mar 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-1jpp
- Update to Ant 1.6.1
- Change ant launch script to source instead of patch
-- Move optional components to ant subdirectory: {_javadir}/{name}
+- Move optional components to ant subdirectory: %%{_javadir}/%%{name}
- Remove os/2 scripts and set JAVA_HOME for build
* Wed Feb 11 2004 Randy Watler <rwatler at finali.com> - 0:1.6.0-1jpp
@@ -1728,7 +1514,7 @@
matching package
- added jdepend 2.2
- remove require oro, since ant could works without it
-- ant lib is now in {_javadir}/{name}, put external jars here
+- ant lib is now in %%{_javadir}/%%{name}, put external jars here
* Tue May 07 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.4.1-12jpp
- hardcoded distribution and vendor tag
@@ -1869,3 +1655,4 @@
* Wed Dec 20 2000 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-1mdk
- first Mandrake release
- used SRPMS from Henri Gomez <hgomez at users.sourceforge.net>
+
Index: apache-ant-1.7.ant.conf
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-1.7.ant.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-ant-1.7.ant.conf 20 Jul 2007 20:57:49 -0000 1.1
+++ apache-ant-1.7.ant.conf 26 Sep 2008 14:56:45 -0000 1.2
@@ -1,7 +1,5 @@
-#
-# ant.conf (Ant 1.6.x)
+# ant.conf (Ant 1.7.x)
# JPackage Project <http://www.jpackage.org/>
-#
# Validate --noconfig setting in case being invoked
# from pre Ant 1.6.x environment
apache-ant-bz163689.patch:
Index: apache-ant-bz163689.patch
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-bz163689.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-ant-bz163689.patch 21 Jul 2005 17:13:26 -0000 1.1
+++ apache-ant-bz163689.patch 26 Sep 2008 14:56:45 -0000 1.2
@@ -1,87 +1,100 @@
---- apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java~ 2004-07-16 08:57:36.000000000 +0100
-+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java 2005-07-21 17:05:18.000000000 +0100
-@@ -119,39 +119,12 @@
- }
-
- public void transform(File infile, File outfile) throws Exception {
-- if (transformer == null) {
-- createTransformer();
-- }
--
-- InputStream fis = null;
-- OutputStream fos = null;
-- try {
-- fis = new BufferedInputStream(new FileInputStream(infile));
-- fos = new BufferedOutputStream(new FileOutputStream(outfile));
-- StreamResult res = new StreamResult(fos);
-- // not sure what could be the need of this...
-- res.setSystemId(JAXPUtils.getSystemId(outfile));
-- Source src = getSource(fis, infile);
-- transformer.transform(src, res);
-- } finally {
-- // make sure to close all handles, otherwise the garbage
-- // collector will close them...whenever possible and
-- // Windows may complain about not being able to delete files.
-- try {
-- if (fis != null) {
-- fis.close();
-- }
-- } catch (IOException ignored) {
-- // ignore
-- }
-- try {
-- if (fos != null) {
-- fos.close();
-- }
-- } catch (IOException ignored) {
-- // ignore
-- }
-+ if (logger != null) {
-+ logger.log("The style task is disabled on this platform");
-+ logger.log(
-+ "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
- }
-+ new FileOutputStream(outfile).close();
- }
-
- /**
---- apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java~ 2004-07-16 08:57:36.000000000 +0100
-+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java 2005-07-21 17:37:23.000000000 +0100
-@@ -272,35 +272,8 @@
- "Specify at least one source - " + "a file or a fileset.");
- }
-
-- initValidator();
--
-- if (file != null) {
-- if (file.exists() && file.canRead() && file.isFile()) {
-- doValidate(file);
-- fileProcessed++;
-- } else {
-- String errorMsg = "File " + file + " cannot be read";
-- if (failOnError) {
-- throw new BuildException(errorMsg);
-- } else {
-- log(errorMsg, Project.MSG_ERR);
-- }
-- }
-- }
--
-- for (int i = 0; i < filesets.size(); i++) {
--
-- FileSet fs = (FileSet) filesets.elementAt(i);
-- DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-- String[] files = ds.getIncludedFiles();
--
-- for (int j = 0; j < files.length; j++) {
-- File srcFile = new File(fs.getDir(getProject()), files[j]);
-- doValidate(srcFile);
-- fileProcessed++;
-- }
-- }
-- log(fileProcessed + " file(s) have been successfully validated.");
-+ log("The xmlvalidate task is disabled on this platform");
-+ log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
- }
-
- /**
+--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java.orig 2008-06-27 01:05:16.000000000 -0400
++++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java 2008-07-10 16:41:47.456449617 -0400
+@@ -166,44 +166,12 @@
+ * @throws Exception on error
+ */
+ public void transform(File infile, File outfile) throws Exception {
+- if (transformer == null) {
+- createTransformer();
+- }
+-
+- InputStream fis = null;
+- OutputStream fos = null;
+- try {
+- fis = new BufferedInputStream(new FileInputStream(infile));
+- fos = new BufferedOutputStream(new FileOutputStream(outfile));
+- StreamResult res = new StreamResult(fos);
+- // not sure what could be the need of this...
+- res.setSystemId(JAXPUtils.getSystemId(outfile));
+- Source src = getSource(fis, infile);
+-
+- // set parameters on each transformation, maybe something has changed
+- //(e.g. value of file name parameter)
+- setTransformationParameters();
+-
+- transformer.transform(src, res);
+- } finally {
+- // make sure to close all handles, otherwise the garbage
+- // collector will close them...whenever possible and
+- // Windows may complain about not being able to delete files.
+- try {
+- if (fis != null) {
+- fis.close();
+- }
+- } catch (IOException ignored) {
+- // ignore
+- }
+- try {
+- if (fos != null) {
+- fos.close();
+- }
+- } catch (IOException ignored) {
+- // ignore
+- }
+- }
++ if (logger != null) {
++ logger.log("The style task is disabled on this platform");
++ logger.log(
++ "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
++ }
++ new FileOutputStream(outfile).close();
+ }
+
+ /**
+--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java.orig 2008-06-27 01:05:22.000000000 -0400
++++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java 2008-07-10 16:42:09.270573847 -0400
+@@ -285,42 +285,8 @@
+ * @throws BuildException if <code>failonerror</code> is true and an error happens
+ */
+ public void execute() throws BuildException {
+-
+- int fileProcessed = 0;
+- if (file == null && (filesets.size() == 0)) {
+- throw new BuildException(
+- "Specify at least one source - " + "a file or a fileset.");
+- }
+-
+-
+-
+- if (file != null) {
+- if (file.exists() && file.canRead() && file.isFile()) {
+- doValidate(file);
+- fileProcessed++;
+- } else {
+- String errorMsg = "File " + file + " cannot be read";
+- if (failOnError) {
+- throw new BuildException(errorMsg);
+- } else {
+- log(errorMsg, Project.MSG_ERR);
+- }
+- }
+- }
+-
+- for (int i = 0; i < filesets.size(); i++) {
+-
+- FileSet fs = (FileSet) filesets.elementAt(i);
+- DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+- String[] files = ds.getIncludedFiles();
+-
+- for (int j = 0; j < files.length; j++) {
+- File srcFile = new File(fs.getDir(getProject()), files[j]);
+- doValidate(srcFile);
+- fileProcessed++;
+- }
+- }
+- onSuccessfulValidation(fileProcessed);
++ log("The xmlvalidate task is disabled on this platform");
++ log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
+ }
+
+ /**
apache-ant-jars.patch:
Index: apache-ant-jars.patch
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-jars.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apache-ant-jars.patch 20 Jul 2007 20:57:49 -0000 1.2
+++ apache-ant-jars.patch 26 Sep 2008 14:56:45 -0000 1.3
@@ -1,6 +1,6 @@
---- apache-ant-1.7.0/build.xml.orig 2007-06-20 14:17:16.000000000 -0400
-+++ apache-ant-1.7.0/build.xml 2007-06-20 14:17:39.000000000 -0400
-@@ -769,6 +769,7 @@
+--- apache-ant-1.7.1/build.xml.orig 2008-06-27 01:05:23.000000000 -0400
++++ apache-ant-1.7.1/build.xml 2008-07-10 16:40:11.318448411 -0400
+@@ -770,6 +770,7 @@
<selector refid="needs.jdk1.5+"/>
<selector refid="needs.javamail"/>
<selector refid="ant.launcher"/>
@@ -8,7 +8,7 @@
</or>
</selector>
</not>
-@@ -848,6 +849,7 @@
+@@ -849,6 +850,7 @@
<selector refid="needs.jdepend"/>
<selector refid="needs.swing"/>
<selector refid="needs.jsch"/>
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 20 Jul 2007 20:57:49 -0000 1.14
+++ sources 26 Sep 2008 14:56:45 -0000 1.15
@@ -1 +1 @@
-769e022280e6bb1c9615adf336366e9f apache-ant-1.7.0-src.tar.gz
+0d68db4a1ada5c91bcbf53cefd0c2fd7 apache-ant-1.7.1-src.tar.bz2
More information about the fedora-extras-commits
mailing list