Repository: commons-lang Updated Branches: refs/heads/master 69e97c8b4 -> 242e1f549
LANG-1175: removed ant-based build Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/c3e250ab Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/c3e250ab Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/c3e250ab Branch: refs/heads/master Commit: c3e250abb364187bd2193318d972a0df89c5861c Parents: c9cae60 Author: Sergio Fernández <wik...@apache.org> Authored: Mon Oct 19 16:44:42 2015 +0200 Committer: Sergio Fernández <wik...@apache.org> Committed: Mon Oct 19 16:44:42 2015 +0200 ---------------------------------------------------------------------- .gitignore | 3 +- build.properties.sample | 28 ------ build.xml | 233 ------------------------------------------- src/assembly/src.xml | 1 - src/changes/changes.xml | 1 + 5 files changed, 3 insertions(+), 263 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/c3e250ab/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 8f8fd6a..b9493d7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ target maven-eclipse.xml build.properties site-content +*~ # IntelliJ IDEA files .idea @@ -15,4 +16,4 @@ site-content .settings .classpath .project -.externalToolBuilders \ No newline at end of file +.externalToolBuilders http://git-wip-us.apache.org/repos/asf/commons-lang/blob/c3e250ab/build.properties.sample ---------------------------------------------------------------------- diff --git a/build.properties.sample b/build.properties.sample deleted file mode 100644 index 8a55597..0000000 --- a/build.properties.sample +++ /dev/null @@ -1,28 +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.12/ -hamcrest.home=${repository}/org/hamcrest/hamcrest-all/1.3/ -commons-io.home=${repository}/commons-io/commons-io/2.4/ -easymock.home=${repository}/org/easymock/easymock/3.3.1/ http://git-wip-us.apache.org/repos/asf/commons-lang/blob/c3e250ab/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml deleted file mode 100644 index b493e47..0000000 --- a/build.xml +++ /dev/null @@ -1,233 +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. - */ - --> -<!-- - "Lang" component of the Apache Commons Subproject - $Id$ ---> -<project name="Lang" 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://docs.oracle.com/javase/6/docs/api/"/> - <property name="collections.javadoc" value="http://commons.apache.org/collections/api-release/"/> - - <!-- ========== 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="${easymock.jar}"/> - <pathelement location="${commons-io.jar}"/> - <pathelement location="${hamcrest.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="**/Abstract*Test.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/lang3/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 Lang"/> - <attribute name="Specification-Version" value="${component.version}"/> - <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> - <attribute name="Implementation-Title" value="Commons Lang"/> - <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 Lang API"/> - <attribute name="Specification-Version" value="${component.version}"/> - <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> - <attribute name="Implementation-Title" value="Commons Lang 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 JavaDoc jar"> - <jar jarfile="${build.home}/${final.name}-sources.jar"> - <manifest> - <attribute name="Specification-Title" value="Commons Lang Source"/> - <attribute name="Specification-Version" value="${component.version}"/> - <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> - <attribute name="Implementation-Title" value="Commons Lang 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> - - <!-- ========== Distribution ========================================= --> - <target name="dist" depends="clean,jar,source-jar,javadoc-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, - build.xml, - checkstyle.xml, - default.properties, - LICENSE.txt, - NOTICE.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-lang/blob/c3e250ab/src/assembly/src.xml ---------------------------------------------------------------------- diff --git a/src/assembly/src.xml b/src/assembly/src.xml index 8646974..6b9315f 100644 --- a/src/assembly/src.xml +++ b/src/assembly/src.xml @@ -32,7 +32,6 @@ <include>pom.xml</include> <include>PROPOSAL.html</include> <include>RELEASE-NOTES.txt</include> - <include>build.xml</include> <include>default.properties</include> <include>build.properties.sample</include> <include>README.md</include> http://git-wip-us.apache.org/repos/asf/commons-lang/blob/c3e250ab/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 4a5c143..f5ab117 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -22,6 +22,7 @@ <body> <release version="3.5" date="tba" description="tba"> + <action issue="LANG-1175" type="fix" dev="wikier" dute-to="Benedikt Ritter">Remove Ant-based build</action> <action issue="LANG-1174" type="add" dev="britter" dute-to="Punkratz312">Add sugar to RandomUtils</action> <action issue="LANG-1057" type="update" dev="chas" dute-to="Otávio Santana">Replace StringBuilder with String concatenation for better optimization</action> <action issue="LANG-1075" type="update" dev="chas">Deprecate SystemUtils.FILE_SEPARATOR and SystemUtils.PATH_SEPARATOR</action>
