You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2017/09/25 17:57:40 UTC
commons-collections git commit: Drop Ant build
Repository: commons-collections
Updated Branches:
refs/heads/master 10ad95330 -> afebe421e
Drop Ant build
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/afebe421
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/afebe421
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/afebe421
Branch: refs/heads/master
Commit: afebe421ea7317f084c2bfe19145c0d640e1dcd8
Parents: 10ad953
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon Sep 25 19:57:30 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon Sep 25 19:57:30 2017 +0200
----------------------------------------------------------------------
build.properties.sample | 27 -----
build.xml | 257 -------------------------------------------
default.properties | 87 ---------------
src/assembly/src.xml | 3 -
4 files changed, 374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/afebe421/build.properties.sample
----------------------------------------------------------------------
diff --git a/build.properties.sample b/build.properties.sample
deleted file mode 100644
index 41c8aa2..0000000
--- a/build.properties.sample
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-##########################################################################
-# Sample Ant build.properties file
-#
-# This setup assumes dependent jars are in a local maven 2 repository.
-# However the jars are located, the properties ending in ".jar" need
-# expand to full paths to the jars.
-##########################################################################
-
-# Repository base path - unnecessary if full jar paths are provided below
-repository=${user.home}/.m2/repository
-junit.home=${repository}/junit/junit/4.11/
-hamcrest.home=${repository}/org/hamcrest/hamcrest-core/1.3/
-easymock.home=${repository}/org/easymock/easymock/3.2/
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/afebe421/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 22e4a54..0000000
--- a/build.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<!--
-/*
- * 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.
- */
- -->
-<!--
- "Collections" component of the Apache Commons Subproject
- $Id$
--->
-<project name="Collections" default="compile" basedir=".">
-
- <!-- ========== Initialize Properties ===================================== -->
- <property file="${user.home}/${component.name}.build.properties"/>
- <property file="${user.home}/build.properties"/>
- <property file="${basedir}/build.properties"/>
- <property file="${basedir}/default.properties"/>
- <property name="jdk.javadoc" value="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-
- <!-- ========== Construct compile classpath =============================== -->
- <path id="compile.classpath">
- <pathelement location="${build.home}/classes"/>
- </path>
-
- <!-- ========== Construct unit test classpath ============================= -->
- <path id="test.classpath">
- <pathelement location="${build.home}/classes"/>
- <pathelement location="${build.home}/tests"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${hamcrest.jar}"/>
- <pathelement location="${easymock.jar}"/>
- </path>
-
- <!-- ========== Executable Targets ======================================== -->
- <target name="init" description="Initialize and evaluate conditionals">
- <echo message="-------- ${component.name} ${component.version} --------"/>
- <filter token="name" value="${component.name}"/>
- <filter token="package" value="${component.package}"/>
- <filter token="version" value="${component.version}"/>
- <filter token="compile.source" value="${compile.source}"/>
- <filter token="compile.target" value="${compile.target}"/>
- <mkdir dir="${build.home}"/>
- </target>
-
- <!-- ========== Compile Targets ========================================= -->
- <target name="compile" depends="init" description="Compile shareable components">
- <mkdir dir="${build.home}/classes"/>
- <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}">
- <classpath refid="compile.classpath"/>
- </javac>
- <copy todir="${build.home}/classes" filtering="on">
- <fileset dir="${source.home}" excludes="**/*.java,**/*.html"/>
- </copy>
- </target>
-
- <target name="compile.tests" depends="compile" description="Compile unit test cases">
- <mkdir dir="${build.home}/tests"/>
- <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/tests" filtering="on">
- <fileset dir="${test.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
- <!-- ========== Unit Tests ========================================= -->
- <target name="test" depends="compile.tests" description="Run all unit test cases">
- <echo message="Running unit tests ..."/>
- <mkdir dir="${build.home}/test-reports"/>
- <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
- <classpath refid="test.classpath"/>
- <formatter type="plain" usefile="true" />
- <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
- <test name="${test.entry}" todir="${build.home}/test-reports" if="test.entry"/>
- <batchtest fork="yes" todir="${build.home}/test-reports" unless="test.entry">
- <fileset dir="${test.home}">
- <include name="**/*Test.java"/>
- <exclude name="**/*$*"/>
- <exclude name="**/TestUtils.java"/>
- <exclude name="**/Abstract*.java"/>
- <exclude name="**/BulkTest.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="clean" description="Clean build and distribution directories">
- <delete dir="${build.home}"/>
- </target>
-
- <target name="all" depends="clean,test,compile" description="Clean and compile all components"/>
-
- <!-- ========== JavaDocs ========================================= -->
- <target name="javadoc" depends="compile" description="Create component Javadoc documentation">
- <mkdir dir="${build.home}"/>
- <mkdir dir="${build.home}/apidocs"/>
- <tstamp>
- <format property="current.year" pattern="yyyy"/>
- </tstamp>
- <javadoc sourcepath="${source.home}"
- destdir="${build.home}/apidocs"
- overview="${source.home}/org/apache/commons/collections4/overview.html"
- packagenames="org.apache.commons.*"
- excludepackagenames="${javadoc.excludepackagenames}"
- author="false"
- version="true"
- doctitle="<h1>Commons Lang ${component.version}</h1>"
- windowtitle="Lang ${component.version}"
- bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation"
- use="true"
- encoding="${compile.encoding}"
- source="${compile.source}">
- <classpath refid="compile.classpath"/>
- <link href="${jdk.javadoc}"/>
- <link href="${collections.javadoc}"/>
- </javadoc>
- </target>
-
- <!-- ========== Jar Targets ========================================= -->
- <target name="jar" depends="compile" description="Create jar">
- <mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${build.home}/${final.name}.jar">
- <manifest>
- <attribute name="Specification-Title" value="Commons Collections"/>
- <attribute name="Specification-Version" value="${component.version}"/>
- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Title" value="Commons Collections"/>
- <attribute name="Implementation-Version" value="${component.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Vendor-Id" value="org.apache"/>
- <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
- <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
- </manifest>
- <fileset dir="${build.home}/classes">
- <include name="**/*.class"/>
- <include name="**/LICENSE.txt"/>
- <include name="**/NOTICE.txt"/>
- </fileset>
- </jar>
- </target>
-
- <target name="javadoc-jar" depends="javadoc" description="Create JavaDoc jar">
- <jar jarfile="${build.home}/${final.name}-javadoc.jar">
- <manifest>
- <attribute name="Specification-Title" value="Commons Collections API"/>
- <attribute name="Specification-Version" value="${component.version}"/>
- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Title" value="Commons Collections API"/>
- <attribute name="Implementation-Version" value="${component.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Vendor-Id" value="org.apache"/>
- </manifest>
- <fileset dir="${build.home}/apidocs"/>
- <fileset dir="${basedir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </jar>
- </target>
-
- <target name="source-jar" depends="init" description="Create Source jar">
- <jar jarfile="${build.home}/${final.name}-sources.jar">
- <manifest>
- <attribute name="Specification-Title" value="Commons Collections Source"/>
- <attribute name="Specification-Version" value="${component.version}"/>
- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Title" value="Commons Collections Source"/>
- <attribute name="Implementation-Version" value="${component.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Vendor-Id" value="org.apache"/>
- </manifest>
- <fileset dir="${source.home}">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </jar>
- </target>
-
- <target name="test-jar" depends="init" description="Create Testframework jar">
- <jar jarfile="${build.home}/${final.name}-tests.jar">
- <manifest>
- <attribute name="Specification-Title" value="Commons Collections Testframework"/>
- <attribute name="Specification-Version" value="${component.version}"/>
- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Title" value="Commons Collections Testframework"/>
- <attribute name="Implementation-Version" value="${component.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-Vendor-Id" value="org.apache"/>
- </manifest>
- <fileset dir="${test.home}">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </jar>
- </target>
-
- <!-- ========== Distribution ========================================= -->
- <target name="dist" depends="clean,jar,source-jar,javadoc-jar,test-jar" description="Create binary distribution">
-
- <!-- binary distro -->
- <zip destfile="${build.home}/${final.name}.zip">
- <zipfileset dir="${basedir}" prefix="${final.name}"
- includes="LICENSE.txt,
- NOTICE.txt,
- RELEASE-NOTES.txt"
- />
- <zipfileset dir="${build.home}" includes="*.jar," prefix="${final.name}"/>
- <zipfileset dir="${build.home}/apidocs" prefix="${final.name}/apidocs"/>
- </zip>
- <tar destfile="${build.home}/${final.name}.tar.gz" compression="gzip">
- <zipfileset src="${build.home}/${final.name}.zip"/>
- </tar>
-
- <!-- source distro -->
- <zip destfile="${build.home}/${final.name}-src.zip">
- <zipfileset dir="${basedir}" prefix="${final.name}-src"
- includes="build.xml,
- default.properties,
- build.properties.sample,
- DEVELOPERS-GUIDE.html,
- PROPOSAL.html,
- LICENSE.txt,
- NOTICE.txt,
- README.txt,
- pom.xml,
- RELEASE-NOTES.txt"
- />
- <zipfileset dir="${basedir}/src" prefix="${final.name}-src/src"/>
- </zip>
- <tar destfile="${build.home}/${final.name}-src.tar.gz" compression="gzip">
- <zipfileset src="${build.home}/${final.name}-src.zip"/>
- </tar>
-
- </target>
-</project>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/afebe421/default.properties
----------------------------------------------------------------------
diff --git a/default.properties b/default.properties
deleted file mode 100644
index 7b5d217..0000000
--- a/default.properties
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# 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.
-#
-
-# $Id$
-
-# The location of the "junit.jar" JAR file
-junit.jar = ${junit.home}/junit-4.11.jar
-
-# The location of the "junit.jar" JAR file
-hamcrest.jar = ${hamcrest.home}/hamcrest-core-1.3.jar
-
-# The location of the Easymock jar
-easymock.jar = ${easymock.home}/easymock-3.2.jar
-
-# Whether or not to fork tests
-junit.fork = true
-
-# The name of this component
-component.name = commons-collections4
-
-# The primary package name of this component
-component.package = org.apache.commons.collections4
-
-# The title of this component
-component.title = Commons Collections
-
-# The current version number of this component
-component.version = 4.2-SNAPSHOT
-
-# The name that is used to create the jar file
-final.name = ${component.name}-${component.version}
-
-# The base directory for compilation targets
-build.home = target
-
-# The base directory for component configuration files
-conf.home = src/conf
-
-# The base directory for component sources
-source.home = src/main/java
-
-# The base directory for unit test sources
-test.home = src/test/java
-
-# Should Java compilations set the 'debug' compiler option?
-compile.debug = true
-
-# Should Java compilations set the 'deprecation' compiler option?
-compile.deprecation = true
-
-# Should Java compilations set the 'optimize' compiler option?
-compile.optimize = true
-
-# Generate class files for specific VM version (e.g., 1.1 or 1.2).
-# Note that the default value depends on the JVM that is running Ant.
-# In particular, if you use JDK 1.4+ the generated classes will not be usable
-# for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1
-# (which is the default value for JDK 1.1 to 1.3).
-compile.target = 1.6
-
-# Specifies the source version for the Java compiler.
-# Corresponds to the source attribute for the ant javac task.
-# Valid values are 1.3, 1.4, 1.5.
-compile.source = 1.6
-
-# Specifies the source encoding.
-compile.encoding = ISO-8859-1
-
-# Should all tests fail if one does?
-test.failonerror = true
-
-# The test runner to execute
-test.runner = junit.textui.TestRunner
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/afebe421/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index b3e98a6..da7c0a9 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -24,9 +24,6 @@
<fileSets>
<fileSet>
<includes>
- <include>build.xml</include>
- <include>default.properties</include>
- <include>build.properties.sample</include>
<include>DEVELOPERS-GUIDE.html</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>