You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2017/07/02 14:54:33 UTC
ant-ivy git commit: Sort entries in .gitignore;
adjust indentation in build.xml
Repository: ant-ivy
Updated Branches:
refs/heads/master fcf4109d8 -> 87cd5df6f
Sort entries in .gitignore; adjust indentation in build.xml
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/87cd5df6
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/87cd5df6
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/87cd5df6
Branch: refs/heads/master
Commit: 87cd5df6f3d0abf414b972af878c3934999c0836
Parents: fcf4109
Author: twogee <g....@gmail.com>
Authored: Thu Jun 29 10:46:12 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Sun Jul 2 12:35:44 2017 +0200
----------------------------------------------------------------------
.gitignore | 19 ++++----
build-release.xml | 33 ++++++++------
build.xml | 116 ++++++++++++++++++++++++-------------------------
3 files changed, 85 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/87cd5df6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 40f8e72..5645641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,21 @@
.classpath
+.DS_Store
.idea
*.iml
.ivy2
+*~
+asciidoc/tutorial/log
bin
build
doc/style/.svn
doc/xooki/.svn
+doc/samples/target-platform/bundles
+doc/samples/target-platform/cache
lib
test/jar-repos
+test/repositories/checkmodified/ivy-1.0.xml
+test/repositories/checkmodified/mod1.1-1.0.jar
+test/repositories/norevision/ivy-mod1.1.xml
+test/repositories/norevision/mod1.1.jar
test/test-repo/bundlerepo/*.jar
test/test-repo/ivyrepo/org.apache.ivy.osgi
-.DS_Store
-doc/samples/target-platform/bundles
-doc/samples/target-platform/cache
-*~
-/test/repositories/checkmodified/ivy-1.0.xml
-/test/repositories/checkmodified/mod1.1-1.0.jar
-/test/repositories/norevision/ivy-mod1.1.xml
-/test/repositories/norevision/mod1.1.jar
-asciidoc/tutorial/log
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/87cd5df6/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 84bd0e2..4d5e15b 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -17,10 +17,11 @@
under the License.
-->
<project name="IvyRelease" default="snapshot"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ivy2="antlib:org.apache.ivy.ant_2"
- xmlns:asciidoctor="antlib:org.asciidoctor.ant"
- xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ivy2="antlib:org.apache.ivy.ant_2"
+ xmlns:asciidoctor="antlib:org.asciidoctor.ant"
+ xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+
<import file="build.xml"/>
<macrodef name="run-tutorial">
@@ -183,7 +184,7 @@
sourceHighlighter="highlightjs">
<attribute key="basedir" value="${doc.src.dir}"/>
<attribute key="imagesdir" value=""/>
- <attribute key="version" value="${build.version}" />
+ <attribute key="version" value="${build.version}"/>
</asciidoctor:convert>
</target>
@@ -314,7 +315,7 @@
<zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar"/>
</zip>
<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
- compression="gzip" longfile="gnu">
+ compression="gzip" longfile="gnu">
<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
</tar>
</target>
@@ -336,14 +337,14 @@
<mapping conf="test" scope="test"/>
</ivy:makepom>
<copy file="${artifacts.build.dir}/jars/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}.jar"/>
+ tofile="${m2.distrib.dir}/ivy-${build.version}.jar"/>
<!-- jar javadocs -->
<jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
<fileset dir="${javadoc.build.dir}"/>
</jar>
<!-- copy sources jar -->
<copy file="${artifacts.build.dir}/sources/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar"/>
+ tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar"/>
<checksum algorithm="md5">
<fileset dir="${m2.distrib.dir}">
@@ -412,18 +413,18 @@
<ivy2:settings id="sign.settingsId" file="ivysettings-release.xml"/>
<ivy2:cachepath organisation="org.apache.commons" settingsRef="sign.settingsId" transitive="false" log="download-only"
- module="commons-openpgp" revision="1.0-SNAPSHOT" inline="true" pathid="openpgp.classpath"/>
+ module="commons-openpgp" revision="1.0-SNAPSHOT" inline="true" pathid="openpgp.classpath"/>
<ivy2:cachepath organisation="org.bouncycastle" settingsRef="sign.settingsId" log="download-only"
- module="bcprov-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcprov.classpath"/>
+ module="bcprov-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcprov.classpath"/>
<ivy2:cachepath organisation="org.bouncycastle" settingsRef="sign.settingsId" transitive="false" log="download-only"
- module="bcpg-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcpg.classpath"/>
+ module="bcpg-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcpg.classpath"/>
<!--
For some reason, if we use the openpgp:signer task here directly, the bouncycastle security
provider cannot be loaded. If we launch it as a forked process everything works fine !?!
-->
<java classname="org.apache.tools.ant.launch.Launcher"
- fork="true">
+ fork="true">
<classpath>
<fileset dir="${ant.home}" includes="**/*.jar"/>
<path refid="bouncycastle.bcprov.classpath"/>
@@ -535,10 +536,14 @@
</target>
<target name="prepare-snapshot"
- depends="/localivy, clean-ivy-home, clean, clean-lib, snapshot-version, install, clean-examples, test-report" />
+ depends="/localivy,clean-ivy-home,clean,clean-lib,snapshot-version,install,clean-examples,test-report"/>
+
<target name="snapshot"
depends="prepare-snapshot,snapshot-src,snapshot-bin,snapshot-maven2,snapshot-checksums"
description="used for nightly and integration builds"/>
- <target name="release" depends="release-version,/localivy,clean-ivy-home,clean,clean-lib,rat,snapshot" description="make a new release of Ivy"/>
+
+ <target name="release"
+ depends="release-version,/localivy,clean-ivy-home,clean,clean-lib,rat,snapshot"
+ description="make a new release of Ivy"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/87cd5df6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5f35c06..834123f 100644
--- a/build.xml
+++ b/build.xml
@@ -39,7 +39,7 @@
<target name="init-ivy" depends="compile-bootstrap,init-ivy-home">
<taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant">
+ uri="antlib:org.apache.ivy.ant">
<classpath>
<pathelement location="${core.classes.build.dir}"/>
<pathelement location="${bootstrap.classes.build.dir}"/>
@@ -50,7 +50,7 @@
</target>
<target name="install" depends="jar"
- description="build Ivy and install it in Ivy user home for builds using Ivy user home to load Ivy jar">
+ description="build Ivy and install it in Ivy user home for builds using Ivy user home to load Ivy jar">
<property name="ivy.jar.file" value="${ivy.home}/jars/ivy.jar"/>
<copy file="${artifacts.build.dir}/jars/${final.name}" tofile="${ivy.jar.file}"/>
</target>
@@ -95,8 +95,6 @@
<include name="*.jar"/>
<exclude name="ant.jar"/>
<exclude name="ant-launcher.jar"/>
- <exclude name="ant-nodeps.jar"/>
- <exclude name="ant-trax.jar"/>
</fileset>
<pathelement location="${core.classes.build.dir}"/>
<pathelement location="${ant.classes.build.dir}"/>
@@ -185,13 +183,13 @@
</target>
<target name="compile-core" depends="prepare">
- <javac srcdir="${src.dir}"
- destdir="${core.classes.build.dir}"
- sourcepath=""
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no">
+ <javac srcdir="${src.dir}"
+ destdir="${core.classes.build.dir}"
+ sourcepath=""
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no">
<excludesfile name="ant.patterns"/>
<excludesfile name="optional.patterns"/>
</javac>
@@ -220,14 +218,14 @@
<!-- Build the Ant tasks with the current Ant runtime -->
<target name="compile-bootstrap" depends="compile-core">
- <javac srcdir="${src.dir}"
- destdir="${bootstrap.classes.build.dir}"
- sourcepath=""
- classpathref="build.bootstrap.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="yes">
+ <javac srcdir="${src.dir}"
+ destdir="${bootstrap.classes.build.dir}"
+ sourcepath=""
+ classpathref="build.bootstrap.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="yes">
<includesfile name="ant.patterns"/>
</javac>
<copy todir="${bootstrap.classes.build.dir}" includeEmptyDirs="false">
@@ -240,14 +238,14 @@
<!-- Build the Ant tasks with the minimal Ant runtime -->
<target name="compile-ant" depends="compile-core,resolve">
- <javac srcdir="${src.dir}"
- destdir="${ant.classes.build.dir}"
- sourcepath=""
- classpathref="build.ant.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no">
+ <javac srcdir="${src.dir}"
+ destdir="${ant.classes.build.dir}"
+ sourcepath=""
+ classpathref="build.ant.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no">
<includesfile name="ant.patterns"/>
</javac>
<copy todir="${ant.classes.build.dir}" includeEmptyDirs="false">
@@ -263,14 +261,14 @@
</target>
<target name="compile-optional" depends="compile-ant">
- <javac srcdir="${src.dir}"
- destdir="${optional.classes.build.dir}"
- sourcepath=""
- classpathref="build.optional.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no">
+ <javac srcdir="${src.dir}"
+ destdir="${optional.classes.build.dir}"
+ sourcepath=""
+ classpathref="build.optional.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no">
<includesfile name="optional.patterns"/>
<includesfile name="ant.patterns"/>
</javac>
@@ -310,7 +308,7 @@
</copy>
<jar destfile="${artifacts.build.dir}/jars/${final.name}"
- manifest="${artifacts.build.dir}/MANIFEST.MF">
+ manifest="${artifacts.build.dir}/MANIFEST.MF">
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
<manifest>
<attribute name="Specification-Title" value="Apache Ivy with Ant tasks"/>
@@ -346,14 +344,14 @@
TESTS
================================================================= -->
<target name="build-test" depends="jar">
- <javac srcdir="${test.dir}"
- destdir="${test.build.dir}"
- classpathref="run.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- encoding="UTF-8"
- includeantruntime="no"/>
+ <javac srcdir="${test.dir}"
+ destdir="${test.build.dir}"
+ classpathref="run.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ encoding="UTF-8"
+ includeantruntime="no"/>
<copy todir="${test.build.dir}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -363,15 +361,15 @@
<target name="build-custom-resolver-jar" depends="jar">
<mkdir dir="${build.dir}/custom-classpath"/>
- <javac srcdir="${basedir}/test/custom-classpath"
- destdir="${build.dir}/custom-classpath"
- classpathref="run.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no"/>
- <jar destfile="${test.dir}/org/apache/ivy/core/settings/custom-resolver.jar"
- basedir="${build.dir}/custom-classpath"/>
+ <javac srcdir="${basedir}/test/custom-classpath"
+ destdir="${build.dir}/custom-classpath"
+ classpathref="run.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no"/>
+ <jar destfile="${test.dir}/org/apache/ivy/core/settings/custom-resolver.jar"
+ basedir="${build.dir}/custom-classpath"/>
</target>
<target name="init-tests-offline" if="offline">
@@ -551,7 +549,7 @@
<target name="init-checkstyle" depends="jar">
<ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="7.8.1"
- inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
+ inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
<taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml" classpathref="checkstyle.classpath"/>
</target>
@@ -560,8 +558,8 @@
<target name="checkstyle-internal" depends="init-checkstyle">
<mkdir dir="${checkstyle.report.dir}"/>
<cs:checkstyle xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"
- config="${checkstyle.src.dir}/checkstyle-config"
- failOnViolation="false" failureProperty="checkstyle.failed">
+ config="${checkstyle.src.dir}/checkstyle-config"
+ failOnViolation="false" failureProperty="checkstyle.failed">
<classpath>
<path refid="run.classpath"/>
</classpath>
@@ -576,7 +574,7 @@
</target>
<target name="checkstyle" depends="checkstyle-internal"
- description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config">
+ description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config">
<fail if="checkstyle.failed"
message="Checkstyle has errors. See report in ${checkstyle.report.dir}"/>
</target>
@@ -584,8 +582,8 @@
<target name="checkstyle-report" depends="checkstyle-internal">
<property name="checkstyle.basedir" location="${src.dir}"/>
<xslt in="${checkstyle.report.dir}/checkstyle.xml"
- style="${checkstyle.src.dir}/checkstyle-frames.xsl"
- out="${checkstyle.report.dir}/output.txt">
+ style="${checkstyle.src.dir}/checkstyle-frames.xsl"
+ out="${checkstyle.report.dir}/output.txt">
<param name="basedir" expression="${checkstyle.basedir}"/>
<param name="output.dir" expression="${checkstyle.report.dir}"/>
</xslt>