You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2017/06/06 12:25:59 UTC
[1/5] ant-ivy git commit: Whitespace cleanup
Repository: ant-ivy
Updated Branches:
refs/heads/master 147fe0eb2 -> 4c6450f45
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/multi-project/common/common.xml
----------------------------------------------------------------------
diff --git a/src/example/multi-project/common/common.xml b/src/example/multi-project/common/common.xml
index 89cd508..cdbd0da 100644
--- a/src/example/multi-project/common/common.xml
+++ b/src/example/multi-project/common/common.xml
@@ -14,192 +14,187 @@
"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.
+ under the License.
-->
-<project name="common"
- xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- a sample common ant build file, used for ivy multi-project tutorial
- feel free to copy and adapt it to your own needs
- Note that the only targets specific to ivy are:
- load-ivy
- resolve
- report
- ivy-new-version
- publish
- publish-local
-
- All other targets are usual ant based targets, which could have been written
- in a build not depending at all on ivy:
- resolve constructs a lib directory based upon ivy dependencies, and then the lib dir
- is used as in any classical ant build
- -->
-
- <property file="${common.dir}/build.properties"/>
-
- <property name="ivy.jar.dir" value="${user.home}/.ivy2/jars" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
- <!-- =================================
- target: load-ivy
- this target is not necessary if you put ivy.jar in your ant lib directory
- if you already have ivy 2.0 in your ant lib, you can simply remove this
- target
+<project name="common" xmlns:ivy="antlib:org.apache.ivy.ant">
+ <!-- a sample common ant build file, used for ivy multi-project tutorial
+ feel free to copy and adapt it to your own needs
+ Note that the only targets specific to ivy are:
+ load-ivy
+ resolve
+ report
+ ivy-new-version
+ publish
+ publish-local
+
+ All other targets are usual ant based targets, which could have been written
+ in a build not depending at all on ivy:
+ resolve constructs a lib directory based upon ivy dependencies, and then the lib dir
+ is used as in any classical ant build
+ -->
+
+ <property file="${common.dir}/build.properties"/>
+
+ <property name="ivy.jar.dir" value="${user.home}/.ivy2/jars"/>
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+
+ <!-- =================================
+ target: load-ivy
+ this target is not necessary if you put ivy.jar in your ant lib directory
+ if you already have ivy 2.0 in your ant lib, you can simply remove this
+ target
================================= -->
<target name="load-ivy">
- <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
- it into ant's lib dir (note that the latter copy will always take precedence).
- We will not fail as long as ivy home lib dir exists (it may be empty) and
- ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
- <mkdir dir="${ivy.jar.dir}" />
- <path id="ivy.lib.path">
- <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
- </target>
+ <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as ivy home lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
+ <mkdir dir="${ivy.jar.dir}"/>
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
<path id="lib.path.id">
- <fileset dir="${lib.dir}" />
+ <fileset dir="${lib.dir}"/>
</path>
<path id="run.path.id">
- <path refid="lib.path.id" />
- <path location="${classes.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${classes.dir}"/>
</path>
-
- <!-- setup ivy default configuration with some custom info -->
- <property name="ivy.local.default.root" value="${repository.dir}/local"/>
- <property name="ivy.shared.default.root" value="${repository.dir}/shared"/>
+ <!-- setup ivy default configuration with some custom info -->
+ <property name="ivy.local.default.root" value="${repository.dir}/local"/>
+ <property name="ivy.shared.default.root" value="${repository.dir}/shared"/>
- <!-- here is how we would have configured ivy if we had our own ivysettings file
- <ivy:settings file="${common.dir}/ivysettings.xml" />
+ <!-- here is how we would have configured ivy if we had our own ivysettings file
+ <ivy:settings file="${common.dir}/ivysettings.xml"/>
-->
-
- <!-- =================================
- target: resolve
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" depends="clean-lib, load-ivy" description="--> resolve and retrieve dependencies with ivy">
<mkdir dir="${lib.dir}"/> <!-- not usually necessary, ivy creates the directory IF there are dependencies -->
-
- <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't -->
- <ivy:resolve file="${ivy.file}"/>
- <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" />
+
+ <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't -->
+ <ivy:resolve file="${ivy.file}"/>
+ <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]"/>
</target>
-
- <!-- =================================
- target: report
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
-
- <!-- =================================
- target: compile
+
+ <!-- =================================
+ target: compile
================================= -->
<target name="compile" depends="resolve" description="--> compile the project">
- <mkdir dir="${classes.dir}" />
+ <mkdir dir="${classes.dir}"/>
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.path.id" debug="true" includeAntRuntime="false"/>
</target>
-
- <!-- =================================
- target: run
+
+ <!-- =================================
+ target: run
================================= -->
<target name="run" depends="version, compile" description="--> compile and run the project">
<java classpathref="run.path.id" classname="${main.class.name}"/>
</target>
- <target name="ivy-new-version" depends="load-ivy" unless="ivy.new.revision">
- <!-- default module version prefix value -->
- <property name="module.version.prefix" value="${module.version.target}-dev-b" />
-
- <!-- asks to ivy an available version number -->
- <ivy:info file="${ivy.file}" />
- <ivy:buildnumber
- organisation="${ivy.organisation}" module="${ivy.module}"
- revision="${module.version.prefix}" defaultBuildNumber="1" revSep=""/>
- </target>
-
- <target name="local-version">
- <tstamp>
- <format property="now" pattern="yyyyMMddHHmmss"/>
- </tstamp>
- <property name="ivy.new.revision" value="${module.version.target}-local-${now}"/>
- </target>
-
- <target name="version" depends="ivy-new-version">
- <!-- create version file in classpath for later inclusion in jar -->
- <mkdir dir="${classes.dir}"/>
- <echo message="version=${ivy.new.revision}" file="${classes.dir}/${ant.project.name}.properties" append="false" />
-
- <!-- load generated version properties file -->
- <property file="${classes.dir}/${ant.project.name}.properties" />
- </target>
-
- <!-- =================================
- target: jar
- ================================= -->
- <target name="jar" depends="version, compile" description="--> make a jar file for this project">
- <jar destfile="${jar.file}">
- <fileset dir="${classes.dir}" />
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Build-Version" value="${version}" />
- </manifest>
- </jar>
- </target>
-
- <!-- =================================
- target: publish
- ================================= -->
- <target name="publish" depends="clean-build, jar" description="--> publish this project in the ivy repository">
- <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
- resolver="shared"
- pubrevision="${version}"
- status="release"
- />
- <echo message="project ${ant.project.name} released with version ${version}" />
- </target>
-
- <!-- =================================
- target: publish-local
- ================================= -->
- <target name="publish-local" depends="local-version, jar" description="--> publish this project in the local ivy repository">
- <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
- resolver="local"
- pubrevision="${version}"
- pubdate="${now}"
- status="integration"
- forcedeliver="true"
- />
- <echo message="project ${ant.project.name} published locally with version ${version}" />
- </target>
-
- <!-- =================================
- target: clean-local
- ================================= -->
- <target name="clean-local" depends="load-ivy"
- description="--> cleans the local repository for the current module">
- <ivy:info file="${ivy.file}" />
- <delete dir="${ivy.local.default.root}/${ivy.organisation}/${ivy.module}"/>
- </target>
-
- <!-- =================================
- target: clean-lib
- ================================= -->
- <target name="clean-lib" description="--> clean the project libraries directory (dependencies)">
- <delete includeemptydirs="true" dir="${lib.dir}"/>
- </target>
-
- <!-- =================================
- target: clean-build
- ================================= -->
- <target name="clean-build" description="--> clean the project built files">
- <delete includeemptydirs="true" dir="${build.dir}"/>
- </target>
-
- <!-- =================================
- target: clean
- ================================= -->
- <target name="clean" depends="clean-build, clean-lib" description="--> clean the project" />
+ <target name="ivy-new-version" depends="load-ivy" unless="ivy.new.revision">
+ <!-- default module version prefix value -->
+ <property name="module.version.prefix" value="${module.version.target}-dev-b"/>
+
+ <!-- asks to ivy an available version number -->
+ <ivy:info file="${ivy.file}"/>
+ <ivy:buildnumber
+ organisation="${ivy.organisation}" module="${ivy.module}"
+ revision="${module.version.prefix}" defaultBuildNumber="1" revSep=""/>
+ </target>
+
+ <target name="local-version">
+ <tstamp>
+ <format property="now" pattern="yyyyMMddHHmmss"/>
+ </tstamp>
+ <property name="ivy.new.revision" value="${module.version.target}-local-${now}"/>
+ </target>
+
+ <target name="version" depends="ivy-new-version">
+ <!-- create version file in classpath for later inclusion in jar -->
+ <mkdir dir="${classes.dir}"/>
+ <echo message="version=${ivy.new.revision}" file="${classes.dir}/${ant.project.name}.properties" append="false"/>
+
+ <!-- load generated version properties file -->
+ <property file="${classes.dir}/${ant.project.name}.properties"/>
+ </target>
+
+ <!-- =================================
+ target: jar
+ ================================= -->
+ <target name="jar" depends="version, compile" description="--> make a jar file for this project">
+ <jar destfile="${jar.file}">
+ <fileset dir="${classes.dir}"/>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Build-Version" value="${version}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- =================================
+ target: publish
+ ================================= -->
+ <target name="publish" depends="clean-build, jar" description="--> publish this project in the ivy repository">
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ resolver="shared"
+ pubrevision="${version}"
+ status="release"/>
+ <echo message="project ${ant.project.name} released with version ${version}"/>
+ </target>
+
+ <!-- =================================
+ target: publish-local
+ ================================= -->
+ <target name="publish-local" depends="local-version, jar" description="--> publish this project in the local ivy repository">
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="${version}"
+ pubdate="${now}"
+ status="integration"
+ forcedeliver="true"/>
+ <echo message="project ${ant.project.name} published locally with version ${version}"/>
+ </target>
+
+ <!-- =================================
+ target: clean-local
+ ================================= -->
+ <target name="clean-local" depends="load-ivy"
+ description="--> cleans the local repository for the current module">
+ <ivy:info file="${ivy.file}"/>
+ <delete dir="${ivy.local.default.root}/${ivy.organisation}/${ivy.module}"/>
+ </target>
+
+ <!-- =================================
+ target: clean-lib
+ ================================= -->
+ <target name="clean-lib" description="--> clean the project libraries directory (dependencies)">
+ <delete includeemptydirs="true" dir="${lib.dir}"/>
+ </target>
+
+ <!-- =================================
+ target: clean-build
+ ================================= -->
+ <target name="clean-build" description="--> clean the project built files">
+ <delete includeemptydirs="true" dir="${build.dir}"/>
+ </target>
+
+ <!-- =================================
+ target: clean
+ ================================= -->
+ <target name="clean" depends="clean-build,clean-lib" description="--> clean the project"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/java/org/apache/ivy/ant/antlib.xml
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/antlib.xml b/src/java/org/apache/ivy/ant/antlib.xml
index 0111f78..c93be30 100644
--- a/src/java/org/apache/ivy/ant/antlib.xml
+++ b/src/java/org/apache/ivy/ant/antlib.xml
@@ -18,8 +18,8 @@
under the License.
-->
<antlib xmlns:current="ant:current">
- <typedef name="settings" classname="org.apache.ivy.ant.IvyAntSettings"/>
- <typedef name="resources" classname="org.apache.ivy.ant.IvyResources" onerror="report"/>
+ <typedef name="settings" classname="org.apache.ivy.ant.IvyAntSettings"/>
+ <typedef name="resources" classname="org.apache.ivy.ant.IvyResources" onerror="report"/>
<taskdef name="configure" classname="org.apache.ivy.ant.IvyConfigure"/>
<taskdef name="resolve" classname="org.apache.ivy.ant.IvyResolve"/>
<taskdef name="retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
@@ -44,10 +44,10 @@
<taskdef name="findrevision" classname="org.apache.ivy.ant.IvyFindRevision"/>
<taskdef name="buildnumber" classname="org.apache.ivy.ant.IvyBuildNumber"/>
<taskdef name="cleancache" classname="org.apache.ivy.ant.IvyCleanCache"/>
- <taskdef name="buildobr" classname="org.apache.ivy.ant.BuildOBRTask" />
- <taskdef name="convertmanifest" classname="org.apache.ivy.ant.ConvertManifestTask" />
- <taskdef name="fixdeps" classname="org.apache.ivy.ant.FixDepsTask" />
- <taskdef name="dependencytree" classname="org.apache.ivy.ant.IvyDependencyTree"/>
- <taskdef name="checkdepsupdate" classname="org.apache.ivy.ant.IvyDependencyUpdateChecker"/>
- <typedef name="workspaceresolver" classname="org.apache.ivy.ant.AntWorkspaceResolver" />
+ <taskdef name="buildobr" classname="org.apache.ivy.ant.BuildOBRTask"/>
+ <taskdef name="convertmanifest" classname="org.apache.ivy.ant.ConvertManifestTask"/>
+ <taskdef name="fixdeps" classname="org.apache.ivy.ant.FixDepsTask"/>
+ <taskdef name="dependencytree" classname="org.apache.ivy.ant.IvyDependencyTree"/>
+ <taskdef name="checkdepsupdate" classname="org.apache.ivy.ant.IvyDependencyUpdateChecker"/>
+ <typedef name="workspaceresolver" classname="org.apache.ivy.ant.AntWorkspaceResolver"/>
</antlib>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/test/java/org/apache/ivy/TestHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java
index 72d216b..7963407 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -131,7 +131,7 @@ public class TestHelper {
}
/**
- * Parses a string represenation of a module descriptor in micro ivy format.
+ * Parses a string representation of a module descriptor in micro ivy format.
* <p>
* Examples:
*
[4/5] ant-ivy git commit: Remove main() in tests,
optimise target dependencies in build.xml and address diverse
Checkstyle warnings
Posted by jh...@apache.org.
Remove main() in tests, optimise target dependencies in build.xml and address diverse Checkstyle warnings
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/a9880a18
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/a9880a18
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/a9880a18
Branch: refs/heads/master
Commit: a9880a18fe1c30ede7b409093dbc4b5c24042d33
Parents: 7d45286
Author: twogee <g....@gmail.com>
Authored: Mon Jun 5 23:05:35 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Mon Jun 5 23:05:35 2017 +0200
----------------------------------------------------------------------
build.xml | 13 +++++++++----
.../org/apache/ivy/plugins/lock/DeleteOnExitHook.java | 2 +-
src/java/org/apache/ivy/util/DateUtil.java | 2 +-
src/java/org/apache/ivy/util/EncryptedProperties.java | 1 +
src/java/org/apache/ivy/util/EncrytedProperties.java | 2 +-
test/java/org/apache/ivy/core/TestPerformance.java | 7 -------
.../descriptor/DefaultDependencyDescriptorTest.java | 5 -----
.../ivy/core/settings/XmlSettingsParserTest.java | 9 +++++----
8 files changed, 18 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1f14e05..4529899 100644
--- a/build.xml
+++ b/build.xml
@@ -49,13 +49,13 @@
<ivy:configure override="true"/>
</target>
- <target name="install" depends="init-ivy-home,jar"
+ <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">
<property name="ivy.jar.file" value="${ivy.home}/jars/ivy.jar"/>
<copy file="${artifacts.build.dir}/jars/${final.name}" tofile="${ivy.jar.file}"/>
</target>
- <target name="install-ant" depends="init-ivy-home,jar"
+ <target name="install-ant" depends="jar"
description="build Ivy and install it in Ant home lib">
<condition property="ant.home" value="${env.ANT_HOME}">
<isset property="env.ANT_HOME"/>
@@ -262,7 +262,7 @@
todir="${ant.classes.build.dir}/fr/jayasoft/ivy/ant"/>
</target>
- <target name="compile-optional" depends="compile-ant,resolve">
+ <target name="compile-optional" depends="compile-ant">
<javac srcdir="${src.dir}"
destdir="${optional.classes.build.dir}"
sourcepath=""
@@ -456,6 +456,11 @@
message="At least one test has failed. See logs (in ${test.xml.dir}) for details (use the target test-report to run the test with a report)"/>
</target>
+ <target name="check-ibiblio" depends="build-test">
+ <java classname="org.apache.ivy.plugins.resolver.IBiblioHelper"
+ classpathref="test.classpath"/>
+ </target>
+
<!-- =================================================================
REPORTS AND DOCUMENTATION
================================================================= -->
@@ -550,7 +555,7 @@
<taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml" classpathref="checkstyle.classpath"/>
</target>
-
+
<!-- Checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config -->
<target name="checkstyle-internal" depends="init-checkstyle">
<mkdir dir="${checkstyle.report.dir}"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java b/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
index bb86970..ea3fe40 100644
--- a/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
+++ b/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
@@ -21,7 +21,7 @@ import java.io.File;
import java.util.Iterator;
import java.util.LinkedHashSet;
-class DeleteOnExitHook {
+final class DeleteOnExitHook {
static {
Runtime.getRuntime().addShutdownHook(new Thread() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/util/DateUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/DateUtil.java b/src/java/org/apache/ivy/util/DateUtil.java
index fe66e1d..1190b6b 100644
--- a/src/java/org/apache/ivy/util/DateUtil.java
+++ b/src/java/org/apache/ivy/util/DateUtil.java
@@ -21,7 +21,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-public class DateUtil {
+public final class DateUtil {
private DateUtil() {
// Utility class
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/util/EncryptedProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/EncryptedProperties.java b/src/java/org/apache/ivy/util/EncryptedProperties.java
index cbed952..2644372 100644
--- a/src/java/org/apache/ivy/util/EncryptedProperties.java
+++ b/src/java/org/apache/ivy/util/EncryptedProperties.java
@@ -29,6 +29,7 @@ import java.util.Properties;
* putAll puts given values without encrypting them. It this thus recommended to void using them,
* use setProperty and getProperty instead.
*/
+@SuppressWarnings("serial")
public class EncryptedProperties extends Properties {
public EncryptedProperties() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/util/EncrytedProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/EncrytedProperties.java b/src/java/org/apache/ivy/util/EncrytedProperties.java
index 3242de5..a2a998d 100644
--- a/src/java/org/apache/ivy/util/EncrytedProperties.java
+++ b/src/java/org/apache/ivy/util/EncrytedProperties.java
@@ -17,10 +17,10 @@
*/
package org.apache.ivy.util;
-
/**
* Deprecated because of renaming due spell check.
*/
+@SuppressWarnings("serial")
@Deprecated
public class EncrytedProperties extends EncryptedProperties {
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/test/java/org/apache/ivy/core/TestPerformance.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/TestPerformance.java b/test/java/org/apache/ivy/core/TestPerformance.java
index 29a9176..64ea1df 100644
--- a/test/java/org/apache/ivy/core/TestPerformance.java
+++ b/test/java/org/apache/ivy/core/TestPerformance.java
@@ -140,11 +140,4 @@ public class TestPerformance {
private ResolveOptions getResolveOptions(String[] confs) {
return new ResolveOptions().setConfs(confs);
}
-
- public static void main(String[] args) throws Exception {
- TestPerformance t = new TestPerformance();
- t.setUp();
- t.testPerfs();
- t.tearDown();
- }
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java b/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
index d89813d..099d996 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
@@ -19,17 +19,12 @@
package org.apache.ivy.core.module.descriptor;
import org.junit.Test;
-import org.junit.runner.JUnitCore;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
public class DefaultDependencyDescriptorTest {
- public static void main(String[] args) {
- JUnitCore.runClasses(DefaultDependencyDescriptorTest.class);
- }
-
/*
* Test method for
* 'org.apache.ivy.DefaultDependencyDescriptor.replaceSelfFallbackPattern(String, String)'
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
index 6bbd885..e3db042 100644
--- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
+++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
@@ -17,13 +17,17 @@
*/
package org.apache.ivy.core.settings;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.List;
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
-import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.cache.ResolutionCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.id.ModuleId;
@@ -47,13 +51,10 @@ import org.apache.ivy.plugins.resolver.packager.PackagerResolver;
import org.apache.ivy.plugins.version.ChainVersionMatcher;
import org.apache.ivy.plugins.version.MockVersionMatcher;
import org.apache.ivy.plugins.version.VersionMatcher;
-
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.junit.Assert.*;
-
/**
* TODO write javadoc
*/
[2/5] ant-ivy git commit: Whitespace cleanup
Posted by jh...@apache.org.
Whitespace cleanup
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/a2fdfe67
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/a2fdfe67
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/a2fdfe67
Branch: refs/heads/master
Commit: a2fdfe6737e67935779ea26bbf2d4650e5d77dc4
Parents: 147fe0e
Author: twogee <g....@gmail.com>
Authored: Mon Jun 5 22:37:14 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Mon Jun 5 22:37:14 2017 +0200
----------------------------------------------------------------------
build-for-bin-distrib.xml | 29 +-
build-release.xml | 60 ++--
src/example/bintray/build.xml | 6 +-
src/example/build-a-ivy-repository/build.xml | 118 +++----
src/example/chained-resolvers/build.xml | 30 +-
.../chainedresolvers-project/build.xml | 74 ++---
.../configurations/jdbc-example/build.xml | 101 +++---
.../multi-projects/filter-framework/build.xml | 195 ++++++------
.../multi-projects/myapp/build.xml | 87 +++---
src/example/dependence/build.xml | 32 +-
src/example/dependence/dependee/build.xml | 98 +++---
src/example/dependence/depender/build.xml | 82 ++---
src/example/dual/build.xml | 30 +-
src/example/dual/project/build.xml | 74 ++---
src/example/go-ivy/build.xml | 171 +++++-----
src/example/hello-ivy/build.xml | 70 ++---
src/example/multi-project/build.xml | 89 +++---
src/example/multi-project/common/common.xml | 313 +++++++++----------
src/java/org/apache/ivy/ant/antlib.xml | 16 +-
test/java/org/apache/ivy/TestHelper.java | 2 +-
20 files changed, 835 insertions(+), 842 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/build-for-bin-distrib.xml
----------------------------------------------------------------------
diff --git a/build-for-bin-distrib.xml b/build-for-bin-distrib.xml
index efac7b2..e6a5f23 100644
--- a/build-for-bin-distrib.xml
+++ b/build-for-bin-distrib.xml
@@ -14,22 +14,19 @@
"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.
+ under the License.
-->
-<project name="retrieve-ivy-deps" default="retrieve-all"
+<project name="retrieve-ivy-deps" default="retrieve-all"
xmlns:ivy="antlib:org.apache.ivy.ant">
<target name="init-ivy">
<taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant">
- <classpath>
- <pathelement location="ivy.jar" />
- </classpath>
- </taskdef>
+ uri="antlib:org.apache.ivy.ant"
+ classpath="ivy.jar"/>
</target>
-
+
<target name="report">
- <ivy:report graph="false" todir="report" />
+ <ivy:report graph="false" todir="report"/>
<echo>
=======================================================================
Dependencies retrieved in lib directory
@@ -37,22 +34,22 @@ Dependency report generated in report directory
=======================================================================
</echo>
</target>
-
+
<target name="retrieve-conf" depends="init-ivy"
description="--> Retrieves a set of configuration (get only dependencies needed).">
- <ivy:info file="ivy.xml" />
+ <ivy:info file="ivy.xml"/>
<echo>
=======================================================================
Please enter configuration (or comma separated list of configurations).
Available configurations are: ${ivy.configurations}</echo>
<input message="Configuration(s):" addproperty="ivy.confs"/>
<ivy:retrieve conf="${ivy.confs}"/>
- <antcall target="report" inheritRefs="true" />
+ <antcall target="report" inheritRefs="true"/>
</target>
-
+
<target name="retrieve-all" depends="init-ivy"
description="--> Retrieves all Ivy dependencies into the lib directory">
- <ivy:retrieve />
- <antcall target="report" inheritRefs="true" />
+ <ivy:retrieve/>
+ <antcall target="report" inheritRefs="true"/>
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 379655f..2364091 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -17,10 +17,10 @@
under the License.
-->
<project name="IvyRelease" default="snapshot"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ivy2="antlib:org.apache.ivy.ant_2"
- xmlns:xooki="antlib:xooki"
- xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ivy2="antlib:org.apache.ivy.ant_2"
+ xmlns:xooki="antlib:xooki"
+ xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
<import file="build.xml"/>
<macrodef name="run-tutorial">
@@ -63,7 +63,7 @@
</sequential>
</macrodef>
- <target name="generate-tutorial-output" depends="jar, generate-doc-init">
+ <target name="generate-tutorial-output" depends="jar,generate-doc-init">
<property name="output.dir" value="${build.dir}/output"/>
<delete dir="${output.dir}"/>
<mkdir dir="${output.dir}"/>
@@ -176,12 +176,12 @@
<copy todir="${doc.tmp.dir}" preservelastmodified="true" overwrite="true">
<fileset dir="${doc.src.dir}"/>
<filterset>
- <filter token="version" value="${build.version}"/>
+ <filter token="version" value="${build.version}"/>
</filterset>
</copy>
</target>
- <target name="generate-doc" depends="generate-doc-init, generate-tutorial-output">
+ <target name="generate-doc" depends="generate-doc-init,generate-tutorial-output">
<copy todir="${doc.build.dir}">
<fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd"/>
<fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt"/>
@@ -216,13 +216,13 @@
xookidir="${doc.src.dir}/xooki"/>
</target>
- <target name="all-doc" depends="javadoc, generate-doc"/>
+ <target name="all-doc" depends="javadoc,generate-doc"/>
<target name="init-snapshot" depends="default-version">
<property name="snapshot.full.name" value="apache-ivy-${build.version}"/>
</target>
- <target name="snapshot-metadata" depends="init-snapshot, resolve">
+ <target name="snapshot-metadata" depends="init-snapshot,resolve">
<mkdir dir="${artifacts.build.dir}"/>
<ivy:deliver
deliverpattern="${artifacts.build.dir}/ivy.xml"
@@ -244,12 +244,12 @@
<zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}"/>
</zip>
<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
- compression="gzip" longfile="gnu">
+ compression="gzip" longfile="gnu">
<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip"/>
</tar>
</target>
- <target name="snapshot-bin-without-dependencies" depends="snapshot-metadata, jar, all-doc">
+ <target name="snapshot-bin-without-dependencies" depends="snapshot-metadata,jar,all-doc">
<mkdir dir="${distrib.dir}/dist/${build.version}"/>
<zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip">
<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
@@ -266,12 +266,12 @@
<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
</zip>
<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.tar.gz"
- compression="gzip" longfile="gnu">
+ compression="gzip" longfile="gnu">
<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip"/>
</tar>
</target>
- <target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
+ <target name="snapshot-bin-with-dependencies" depends="snapshot-metadata,jar,all-doc">
<mkdir dir="${distrib.dir}/dist/${build.version}"/>
<delete dir="${build.dir}/lib"/>
<ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]"/>
@@ -297,15 +297,14 @@
</target>
<target name="snapshot-bin"
- depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies"/>
+ depends="snapshot-bin-with-dependencies,snapshot-bin-without-dependencies"/>
<target name="release-xsd" depends="init-snapshot">
<!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
<copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}"/>
</target>
-
- <target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
+ <target name="snapshot-maven2" depends="init-snapshot,snapshot-metadata,jar,sources,javadoc">
<property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}"/>
<ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml"
pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
@@ -337,7 +336,6 @@
</checksum>
</target>
-
<target name="snapshot-checksums">
<checksum algorithm="md5">
<fileset dir="${distrib.dir}/dist/${build.version}">
@@ -382,7 +380,7 @@
<ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]"/>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant_2">
+ uri="antlib:org.apache.ivy.ant_2">
<classpath>
<fileset dir="${artifacts.build.dir}/jars" includes="${final.name}"/>
<fileset dir="${build.dir}/lib" excludes="ant-*.jar"/>
@@ -473,11 +471,11 @@
</fail>
</target>
- <target name="upload-nexus" depends="release-version, init-ivy, jar">
+ <target name="upload-nexus" depends="release-version,init-ivy,jar">
<ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]"/>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant_2">
+ uri="antlib:org.apache.ivy.ant_2">
<classpath>
<fileset dir="${artifacts.build.dir}/jars" includes="${final.name}"/>
<fileset dir="${build.dir}/lib" excludes="ant-*.jar"/>
@@ -494,14 +492,14 @@
<ivy2:settings id="upload.settingsId" file="ivysettings-release.xml"/>
<ivy2:resolve file="${basedir}/build/artifact/ivy.xml" transitive="false"/>
<ivy2:publish organisation="org.apache.ivy"
- module="ivy"
- revision="${build.version}"
- srcivypattern="${basedir}/build/artifact/ivy.xml"
- artifactspattern="${basedir}/build/distrib/maven2/[revision]/[artifact]-[revision](-[classifier]).[ext]"
- publishivy="false"
- conf="core"
- settingsRef="upload.settingsId"
- resolver="nexus">
+ module="ivy"
+ revision="${build.version}"
+ srcivypattern="${basedir}/build/artifact/ivy.xml"
+ artifactspattern="${basedir}/build/distrib/maven2/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+ publishivy="false"
+ conf="core"
+ settingsRef="upload.settingsId"
+ resolver="nexus">
<!-- The standard maven2 artifacts -->
<artifact name="ivy" ext="pom" type="ivy"/>
<artifact name="ivy" ext="jar" type="sources" classifier="sources"/>
@@ -510,10 +508,10 @@
</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"
+ 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/a2fdfe67/src/example/bintray/build.xml
----------------------------------------------------------------------
diff --git a/src/example/bintray/build.xml b/src/example/bintray/build.xml
index c82359e..6fdff4c 100644
--- a/src/example/bintray/build.xml
+++ b/src/example/bintray/build.xml
@@ -18,6 +18,10 @@
-->
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="ivy-bintray-example" default="retrieve">
<target name="retrieve">
- <ivy:retrieve />
+ <ivy:retrieve/>
+ </target>
+
+ <target name="clean">
+ <echo>Nothing to clean here.</echo>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/build-a-ivy-repository/build.xml
----------------------------------------------------------------------
diff --git a/src/example/build-a-ivy-repository/build.xml b/src/example/build-a-ivy-repository/build.xml
index ce83957..e09f5d7 100644
--- a/src/example/build-a-ivy-repository/build.xml
+++ b/src/example/build-a-ivy-repository/build.xml
@@ -15,106 +15,108 @@
"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.
+ under the License.
-->
-<!-- ======================================================================
+<!-- ======================================================================
This is a sample project to build our own ivy repository.
====================================================================== -->
<project name="ivy-repository" default="maven2" xmlns:ivy="antlib:org.apache.ivy.ant">
- <property name="settings.dir" value="settings"/>
- <property name="from.resolver" value="libraries"/>
- <property name="to.resolver" value="my-repository"/>
-
- <property name="ivy.cache.dir" value="${basedir}/cache" />
- <property name="dest.repo.dir" value="${basedir}/myrepository" />
+ <property name="settings.dir" value="settings"/>
+ <property name="from.resolver" value="libraries"/>
+ <property name="to.resolver" value="my-repository"/>
- <property name="ivy.jar.dir" value="${user.home}/.ivy2/jars" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+ <property name="ivy.cache.dir" value="${basedir}/cache"/>
+ <property name="dest.repo.dir" value="${basedir}/myrepository"/>
- <!-- =================================
- target: load-ivy
- this target is not necessary if you put ivy.jar in your ant lib directory
- if you already have ivy 1.4 in your ant lib, you can simply remove this
- target
+ <property name="ivy.jar.dir" value="${user.home}/.ivy2/jars"/>
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+
+ <!-- =================================
+ target: load-ivy
+ this target is not necessary if you put ivy.jar in your ant lib directory
+ if you already have ivy 1.4 in your ant lib, you can simply remove this
+ target
================================= -->
<target name="load-ivy">
- <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
- it into ant's lib dir (note that the latter copy will always take precedence).
- We will not fail as long as ivy home lib dir exists (it may be empty) and
- ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
- <path id="ivy.lib.path">
- <pathelement location="${ivy.jar.file}"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
- </target>
+ <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as ivy home lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
+ <path id="ivy.lib.path">
+ <pathelement location="${ivy.jar.file}"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
- <!-- - - - - - - - - - - - - - - - - -
- target: init-ivy
+ <!-- - - - - - - - - - - - - - - - - -
+ target: init-ivy
- - - - - - - - - - - - - - - - - -->
<target name="init-ivy" depends="load-ivy">
- <ivy:settings id="basic.settings" file="${settings.dir}/ivysettings-basic.xml"/>
- <ivy:settings id="advanced.settings" file="${settings.dir}/ivysettings-advanced.xml"/>
+ <ivy:settings id="basic.settings" file="${settings.dir}/ivysettings-basic.xml"/>
+ <ivy:settings id="advanced.settings" file="${settings.dir}/ivysettings-advanced.xml"/>
</target>
-
- <!-- =================================
+
+ <!-- =================================
target: maven2
maven 2 no namespace and no dependencies
================================= -->
<target name="maven2" depends="init-ivy"
- description="--> install module from maven 2 repository">
- <ivy:install settingsRef="basic.settings"
- organisation="commons-lang" module="commons-lang" revision="1.0"
- from="${from.resolver}" to="${to.resolver}" />
+ description="--> install module from maven 2 repository">
+ <ivy:install settingsRef="basic.settings"
+ organisation="commons-lang" module="commons-lang" revision="1.0"
+ from="${from.resolver}" to="${to.resolver}"/>
</target>
- <!-- =================================
+ <!-- =================================
target: maven2-deps
maven 2 no namespace with dependencies
================================= -->
- <target name="maven2-deps" depends="init-ivy"
- description="--> install module from maven 2 repository with dependencies">
- <ivy:install settingsRef="basic.settings"
- organisation="org.hibernate" module="hibernate" revision="3.2.5.ga"
- from="${from.resolver}" to="${to.resolver}" transitive="true" />
+ <target name="maven2-deps" depends="init-ivy"
+ description="--> install module from maven 2 repository with dependencies">
+ <ivy:install settingsRef="basic.settings"
+ organisation="org.hibernate" module="hibernate" revision="3.2.5.ga"
+ from="${from.resolver}" to="${to.resolver}" transitive="true"/>
</target>
- <!-- =================================
+ <!-- =================================
target: maven2-namespace
maven 2 with namespace no dependencies
================================= -->
- <target name="maven2-namespace" depends="init-ivy"
- description="--> install module from maven 2 using namespaces">
- <ivy:install settingsRef="advanced.settings"
- organisation="apache" module="commons-lang" revision="1.0"
- from="${from.resolver}" to="${to.resolver}" />
+ <target name="maven2-namespace" depends="init-ivy"
+ description="--> install module from maven 2 using namespaces">
+ <ivy:install settingsRef="advanced.settings"
+ organisation="apache" module="commons-lang" revision="1.0"
+ from="${from.resolver}" to="${to.resolver}"/>
</target>
- <!-- =================================
+ <!-- =================================
target: maven2-namespace-deps
maven 2 with namespace and dependencies
================================= -->
<target name="maven2-namespace-deps" depends="init-ivy"
- description="--> install module with dependencies from maven2 repo using namespaces">
- <ivy:install settingsRef="advanced.settings"
- organisation="hibernate" module="hibernate" revision="3.2.5.ga"
- from="${from.resolver}" to="${to.resolver}" transitive="true" />
+ description="--> install module with dependencies from maven2 repo using namespaces">
+ <ivy:install settingsRef="advanced.settings"
+ organisation="hibernate" module="hibernate" revision="3.2.5.ga"
+ from="${from.resolver}" to="${to.resolver}" transitive="true"/>
</target>
- <!-- =================================
+ <!-- =================================
target: clean-cache
================================= -->
<target name="clean-cache" depends="init-ivy" description="--> clean the cache">
- <ivy:cleancache settingsRef="basic.settings" />
- <ivy:cleancache settingsRef="advanced.settings" />
- <delete dir="${ivy.cache.dir}" failonerror="true" />
+ <ivy:cleancache settingsRef="basic.settings"/>
+ <ivy:cleancache settingsRef="advanced.settings"/>
+ <delete dir="${ivy.cache.dir}" failonerror="true"/>
</target>
- <!-- =================================
+ <!-- =================================
target: clean-repo
================================= -->
<target name="clean-repo" description="--> clean the destination repository">
- <delete dir="${dest.repo.dir}" failonerror="true" />
+ <delete dir="${dest.repo.dir}" failonerror="true"/>
</target>
+
+ <target name="clean" depends="clean-repo"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/chained-resolvers/build.xml
----------------------------------------------------------------------
diff --git a/src/example/chained-resolvers/build.xml b/src/example/chained-resolvers/build.xml
index b8e0122..9c03292 100644
--- a/src/example/chained-resolvers/build.xml
+++ b/src/example/chained-resolvers/build.xml
@@ -14,25 +14,25 @@
"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.
+ under the License.
-->
<project default="clean-all" xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean directories">
- <ant dir="chainedresolvers-project" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false" />
+ <ant dir="chainedresolvers-project" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false"/>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <property name="ivy.settings.dir" value="settings" />
- <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
- <ivy:cleancache />
- </target>
-
- <target name="clean-all" depends="clean, clean-cache" description="--> clean directories and ivy cache"/>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <property name="ivy.settings.dir" value="settings"/>
+ <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
+ <ivy:cleancache/>
+ </target>
+
+ <target name="clean-all" depends="clean,clean-cache" description="--> clean directories and ivy cache"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/chained-resolvers/chainedresolvers-project/build.xml
----------------------------------------------------------------------
diff --git a/src/example/chained-resolvers/chainedresolvers-project/build.xml b/src/example/chained-resolvers/chainedresolvers-project/build.xml
index 53dcaee..e5ad13b 100644
--- a/src/example/chained-resolvers/chainedresolvers-project/build.xml
+++ b/src/example/chained-resolvers/chainedresolvers-project/build.xml
@@ -14,68 +14,68 @@
"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.
+ under the License.
-->
<project name="chainedresolvers-project" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="${basedir}/lib" />
- <property name="build.dir" value="${basedir}/build" />
- <property name="src.dir" value="${basedir}/src" />
-
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="src.dir" value="${basedir}/src"/>
+
<!-- ivy properties used -->
- <property name="ivy.settings.dir" value="../settings" />
+ <property name="ivy.settings.dir" value="../settings"/>
- <!-- paths used for compilation and run -->
+ <!-- paths used for compilation and run -->
<path id="lib.path.id">
- <fileset dir="${lib.dir}" />
- </path>
+ <fileset dir="${lib.dir}"/>
+ </path>
<path id="run.path.id">
- <path refid="lib.path.id" />
- <path location="${build.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${build.dir}"/>
</path>
-
- <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
-
- <!-- =================================
- target: resolve
+
+ <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> resolve and retrieve dependencies with ivy">
<ivy:retrieve/>
</target>
-
- <!-- =================================
- target: report
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
-
- <!-- =================================
+
+ <!-- =================================
target: run
================================= -->
<target name="run" depends="resolve" description="--> compile and run the project">
- <mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" />
+ <mkdir dir="${build.dir}"/>
+ <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id"/>
<java classpathref="run.path.id" classname="example.Hello"/>
</target>
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ </fileset>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/configurations/jdbc-example/build.xml
----------------------------------------------------------------------
diff --git a/src/example/configurations/jdbc-example/build.xml b/src/example/configurations/jdbc-example/build.xml
index df5eaca..a173e65 100644
--- a/src/example/configurations/jdbc-example/build.xml
+++ b/src/example/configurations/jdbc-example/build.xml
@@ -14,84 +14,85 @@
"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.
+ under the License.
-->
<project name="configurations" default="run.dev" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="lib" />
- <property name="build.dir" value="build" />
- <property name="src.dir" value="src" />
-
+ <property name="lib.dir" value="lib"/>
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="src"/>
+
<!-- paths used for compilation and run -->
<path id="compile.path.id">
- <fileset dir="${lib.dir}/compile" />
- </path>
+ <fileset dir="${lib.dir}/compile"/>
+ </path>
<path id="lib.run.dev.id">
- <path location="${build.dir}" />
- <fileset dir="${lib.dir}/rundev" />
- </path>
- <path id="lib.run.prod.id">
- <path location="${build.dir}" />
- <fileset dir="${lib.dir}/runprod" />
+ <path location="${build.dir}"/>
+ <fileset dir="${lib.dir}/rundev"/>
+ </path>
+ <path id="lib.run.prod.id">
+ <path location="${build.dir}"/>
+ <fileset dir="${lib.dir}/runprod"/>
</path>
-
- <!-- =================================
- target: resolve
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> retreive dependencies with ivy">
- <!-- conf="*" will copie artifacts defined for each conf in a dir matching conf name -->
- <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]"/>
- </target>
-
- <!-- =================================
- target: report
+ <!-- conf="*" will copy artifacts defined for each conf in a dir matching conf name -->
+ <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]"/>
+ </target>
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
- <!-- =================================
- target: run.dev
+ <!-- =================================
+ target: run.dev
================================= -->
<target name="run.dev" depends="resolve" description="--> compile and run the project">
- <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.run.dev.id" includeAntRuntime="false"/>
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}" includes="**/*.properties"></fileset>
- </copy>
+ <copy todir="${build.dir}">
+ <fileset dir="${src.dir}" includes="**/*.properties"></fileset>
+ </copy>
<java classpathref="lib.run.dev.id" classname="example.ConfigurationsExample" fork="true">
- <arg value="--dev"/>
+ <arg value="--dev"/>
</java>
</target>
-
- <!-- =================================
- target: run.prod
+
+ <!-- =================================
+ target: run.prod
================================= -->
<target name="run.prod" depends="resolve" description="--> compile and run the project">
- <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.run.prod.id" includeAntRuntime="false"/>
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}" includes="**/*.properties"></fileset>
- </copy>
- <java classpathref="lib.run.prod.id" classname="example.ConfigurationsExample" fork="true" />
+ <copy todir="${build.dir}">
+ <fileset dir="${src.dir}" includes="**/*.properties"></fileset>
+ </copy>
+ <java classpathref="lib.run.prod.id" classname="example.ConfigurationsExample" fork="true"/>
</target>
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ </fileset>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/configurations/multi-projects/filter-framework/build.xml
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/build.xml b/src/example/configurations/multi-projects/filter-framework/build.xml
index 566f011..d8818ca 100644
--- a/src/example/configurations/multi-projects/filter-framework/build.xml
+++ b/src/example/configurations/multi-projects/filter-framework/build.xml
@@ -14,125 +14,126 @@
"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.
+ under the License.
-->
<project name="filter-framework" default="publish" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="lib" />
- <property name="build.dir" value="build" />
- <property name="distrib.dir" location="distrib" />
- <property name="src.dir" value="src" />
- <property name="test.dir" value="test" />
- <property name="build.test.dir" value="${build.dir}/test-classes" />
- <property name="report.test.dir" value="${build.dir}/test-report" />
- <property name="revision" value="1.3" />
-
- <property name="ivy.local.default.root" location="${user.home}/.ivy2/local"/>
-
+ <property name="lib.dir" value="lib"/>
+ <property name="build.dir" value="build"/>
+ <property name="distrib.dir" location="distrib"/>
+ <property name="src.dir" value="src"/>
+ <property name="test.dir" value="test"/>
+ <property name="build.test.dir" value="${build.dir}/test-classes"/>
+ <property name="report.test.dir" value="${build.dir}/test-report"/>
+ <property name="revision" value="1.3"/>
+
+ <property name="ivy.local.default.root" location="${user.home}/.ivy2/local"/>
+
<!-- paths used for compilation and run -->
<path id="compile.path.id">
- <fileset dir="${lib.dir}/cc-impl" />
- </path>
-
+ <fileset dir="${lib.dir}/cc-impl"/>
+ </path>
+
<path id="test.path.id">
- <path location="${build.dir}" />
- <path location="${build.test.dir}" />
- <fileset dir="${lib.dir}/test" />
- </path>
-
- <!-- =================================
- target: resolve
+ <path location="${build.dir}"/>
+ <path location="${build.test.dir}"/>
+ <fileset dir="${lib.dir}/test"/>
+ </path>
+
+ <!-- =================================
+ target: resolve
================================= -->
- <target name="resolve" description="--> retreive dependencies with ivy">
- <!-- conf="*" will copie artifacts defined for each conf in a dir matching conf name -->
- <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]"/>
+ <target name="resolve" description="--> retrieve dependencies with ivy">
+ <!-- conf="*" will copie artifacts defined for each conf in a dir matching conf name -->
+ <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]"/>
</target>
-
- <!-- =================================
- target: build
+
+ <!-- =================================
+ target: build
================================= -->
<target name="build" depends="clean, resolve" description="--> compile and jar project">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${distrib.dir}"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${distrib.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="compile.path.id" includeAntRuntime="false"/>
- <jar destfile="${distrib.dir}/filter-api.jar" >
- <fileset dir="${build.dir}">
- <include name="filter/*.class"/>
- </fileset>
- </jar>
- <jar destfile="${distrib.dir}/filter-hmimpl.jar" >
- <fileset dir="${build.dir}">
- <include name="filter/hmimpl/*.class"/>
- </fileset>
- </jar>
- <jar destfile="${distrib.dir}/filter-ccimpl.jar" >
- <fileset dir="${build.dir}">
- <include name="filter/ccimpl/*.class"/>
- </fileset>
- </jar>
+ <jar destfile="${distrib.dir}/filter-api.jar" >
+ <fileset dir="${build.dir}">
+ <include name="filter/*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${distrib.dir}/filter-hmimpl.jar" >
+ <fileset dir="${build.dir}">
+ <include name="filter/hmimpl/*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${distrib.dir}/filter-ccimpl.jar" >
+ <fileset dir="${build.dir}">
+ <include name="filter/ccimpl/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- =================================
+ target: test
+ ================================= -->
+ <target name="test" depends="build" description="--> compile and test the project">
+ <mkdir dir="${report.test.dir}"/>
+ <mkdir dir="${build.test.dir}"/>
+
+ <javac srcdir="${test.dir}" destdir="${build.test.dir}" classpathref="test.path.id"/>
+ <junit printsummary="yes" fork="yes" haltonfailure="yes" >
+ <classpath refid="test.path.id"/>
+ <formatter type="plain"/>
+ <batchtest todir="${report.test.dir}" >
+ <fileset dir="${build.test.dir}">
+ <include name="**/**Test.*"/>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
-
- <!-- =================================
- target: test
- ================================= -->
- <target name="test" depends="build" description="--> compile and test the project">
- <mkdir dir="${report.test.dir}"/>
- <mkdir dir="${build.test.dir}"/>
-
- <javac srcdir="${test.dir}" destdir="${build.test.dir}" classpathref="test.path.id"/>
- <junit printsummary="yes" fork="yes" haltonfailure="yes" >
- <classpath refid="test.path.id"/>
- <formatter type="plain"/>
- <batchtest todir="${report.test.dir}" >
- <fileset dir="${build.test.dir}">
- <include name="**/**Test.*"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <!-- =================================
- target: publish
- ================================= -->
+
+ <!-- =================================
+ target: publish
+ ================================= -->
<target name="publish" depends="test" description="--> compile test and publish this project in the local ivy repository">
<property name="revision" value="${revision}"/>
- <ivy:publish artifactspattern="${distrib.dir}/[artifact].[ext]"
- resolver="local"
- pubrevision="${revision}"
- status="release"/>
- <echo message="project ${ant.project.name} released with version ${revision}" />
- </target>
- <!-- =================================
- target: clean
+ <ivy:publish artifactspattern="${distrib.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="${revision}"
+ status="release"/>
+ <echo message="project ${ant.project.name} released with version ${revision}"/>
+ </target>
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="test/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- <exclude name=".*" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="test/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ <exclude name=".*"/>
+ </fileset>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
- <!-- =================================
- target: clean-local
- ================================= -->
- <target name="clean-local" description="--> clean the local user repository">
- <delete dir="${ivy.local.default.root}"/>
- </target>
+ <!-- =================================
+ target: clean-local
+ ================================= -->
+ <target name="clean-local" description="--> clean the local user repository">
+ <delete dir="${ivy.local.default.root}"/>
+ </target>
-
- <!-- =================================
- target: report
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/configurations/multi-projects/myapp/build.xml
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/myapp/build.xml b/src/example/configurations/multi-projects/myapp/build.xml
index 460cd43..f5e49e6 100644
--- a/src/example/configurations/multi-projects/myapp/build.xml
+++ b/src/example/configurations/multi-projects/myapp/build.xml
@@ -14,80 +14,81 @@
"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.
+ under the License.
-->
<project name="myapp" default="run-cc" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="lib" />
- <property name="build.dir" value="build" />
- <property name="src.dir" value="src" />
-
+ <property name="lib.dir" value="lib"/>
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="src"/>
+
<!-- paths used for compilation and run -->
<path id="lib.path.id">
- <fileset dir="${lib.dir}/build" />
- </path>
+ <fileset dir="${lib.dir}/build"/>
+ </path>
<path id="run.hm.path.id">
- <path location="${build.dir}" />
- <fileset dir="${lib.dir}/noexternaljar" />
+ <path location="${build.dir}"/>
+ <fileset dir="${lib.dir}/noexternaljar"/>
</path>
<path id="run.cc.path.id">
- <path location="${build.dir}" />
- <fileset dir="${lib.dir}/withexternaljar" />
+ <path location="${build.dir}"/>
+ <fileset dir="${lib.dir}/withexternaljar"/>
</path>
- <!-- =================================
- target: resolve
+
+ <!-- =================================
+ target: resolve
================================= -->
- <target name="resolve" description="--> retreive dependencies with ivy">
- <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact].[ext]"/>
- </target>
-
- <!-- =================================
- target: report
+ <target name="resolve" description="--> retrieve dependencies with ivy">
+ <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact].[ext]"/>
+ </target>
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
-
- <!-- =================================
- target: build
+
+ <!-- =================================
+ target: build
================================= -->
<target name="build" depends="resolve" description="--> compile the project">
- <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
</target>
-
- <!-- =================================
- target: run with home made implementation
+
+ <!-- =================================
+ target: run with home made implementation
================================= -->
<target name="run-hm" depends="build" description="--> run the project with ome made implementation">
<java classpathref="run.hm.path.id" classname="myapp.Main" fork="true"/>
</target>
- <!-- =================================
- target: run with ext lib implementation
+ <!-- =================================
+ target: run with ext lib implementation
================================= -->
<target name="run-cc" depends="build" description="--> run the project with ext lib implementation">
<java classpathref="run.cc.path.id" classname="myapp.Main" fork="true"/>
</target>
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- <exclude name=".*" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ <exclude name=".*"/>
+ </fileset>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/dependence/build.xml
----------------------------------------------------------------------
diff --git a/src/example/dependence/build.xml b/src/example/dependence/build.xml
index 5c94a53..9c41292 100644
--- a/src/example/dependence/build.xml
+++ b/src/example/dependence/build.xml
@@ -14,29 +14,29 @@
"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.
+ under the License.
-->
<project default="clean">
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean directories">
- <delete includeemptydirs="true">
- <fileset dir="settings" excludes="ivysettings.*" />
- </delete>
- <ant dir="dependee" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false" />
- <ant dir="depender" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false" />
+ <delete includeemptydirs="true">
+ <fileset dir="settings" excludes="ivysettings.*"/>
+ </delete>
+ <ant dir="dependee" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false"/>
+ <ant dir="depender" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false"/>
</target>
- <!-- =================================
- target: all
+ <!-- =================================
+ target: all
================================= -->
<target name="all" depends="clean" description="--> make the whole example of dependency">
- <ant dir="dependee" antfile="build.xml" target="publish" inheritall="false" inheritrefs="false" />
- <ant dir="depender" antfile="build.xml" inheritall="false" inheritrefs="false" />
- <ant dir="dependee" antfile="build.xml" target="publish" inheritall="false" inheritrefs="false" />
- <ant dir="depender" antfile="build.xml" inheritall="false" inheritrefs="false" />
+ <ant dir="dependee" antfile="build.xml" target="publish" inheritall="false" inheritrefs="false"/>
+ <ant dir="depender" antfile="build.xml" inheritall="false" inheritrefs="false"/>
+ <ant dir="dependee" antfile="build.xml" target="publish" inheritall="false" inheritrefs="false"/>
+ <ant dir="depender" antfile="build.xml" inheritall="false" inheritrefs="false"/>
</target>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/dependence/dependee/build.xml
----------------------------------------------------------------------
diff --git a/src/example/dependence/dependee/build.xml b/src/example/dependence/dependee/build.xml
index d45c22d..dbf05e9 100644
--- a/src/example/dependence/dependee/build.xml
+++ b/src/example/dependence/dependee/build.xml
@@ -14,97 +14,95 @@
"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.
+ under the License.
-->
<project name="dependee" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="${basedir}/lib" />
- <property name="build.dir" value="${basedir}/build" />
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="src.dir" value="${basedir}/src" />
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="src.dir" value="${basedir}/src"/>
<!-- ivy properties used -->
- <property name="ivy.settings.dir" value="../settings" />
- <property file="${ivy.settings.dir}/ivysettings.properties" />
-
+ <property name="ivy.settings.dir" value="../settings"/>
+ <property file="${ivy.settings.dir}/ivysettings.properties"/>
+
<!-- paths used for compilation and run -->
<path id="lib.path.id">
- <fileset dir="${lib.dir}" />
- </path>
+ <fileset dir="${lib.dir}"/>
+ </path>
<path id="run.path.id">
- <path refid="lib.path.id" />
- <path location="${classes.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${classes.dir}"/>
</path>
-
- <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
-
- <!-- =================================
- target: resolve
+
+ <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> resolve and retrieve dependencies with ivy">
- <ivy:retrieve />
+ <ivy:retrieve/>
</target>
-
- <!-- =================================
- target: report
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
-
- <!-- =================================
- target: compile
+
+ <!-- =================================
+ target: compile
================================= -->
<target name="compile" depends="resolve" description="--> description">
- <mkdir dir="${classes.dir}" />
+ <mkdir dir="${classes.dir}"/>
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
</target>
-
- <!-- =================================
+
+ <!-- =================================
target: run
================================= -->
<target name="run" depends="compile" description="--> compile and run the project">
<java classpathref="run.path.id" classname="standalone.Main"/>
</target>
-
- <!-- =================================
- target: jar
+
+ <!-- =================================
+ target: jar
================================= -->
<target name="jar" depends="compile" description="--> make a jar file for this project">
<propertyfile file="${classes.dir}/version.properties">
- <entry key="version" type="int" operation="+" default="0" />
- </propertyfile>
- <property file="${classes.dir}/version.properties" />
+ <entry key="version" type="int" operation="+" default="0"/>
+ </propertyfile>
+ <property file="${classes.dir}/version.properties"/>
<jar destfile="${build.dir}/${ant.project.name}.jar">
- <fileset dir="${classes.dir}" />
+ <fileset dir="${classes.dir}"/>
</jar>
</target>
- <!-- =================================
- target: publish
+ <!-- =================================
+ target: publish
================================= -->
<target name="publish" depends="jar" description="--> publish this project in the ivy repository">
<property name="revision" value="${version}"/>
<delete file="${build.dir}/ivy.xml"/>
- <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
- resolver="projects"
- pubrevision="${revision}"
- status="release"
- />
- <echo message="project ${ant.project.name} released with version ${revision}" />
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ resolver="projects"
+ pubrevision="${revision}"
+ status="release"/>
+ <echo message="project ${ant.project.name} released with version ${revision}"/>
</target>
-
- <!-- =================================
- target: clean
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ </fileset>
+ </delete>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/dependence/depender/build.xml
----------------------------------------------------------------------
diff --git a/src/example/dependence/depender/build.xml b/src/example/dependence/depender/build.xml
index 2cf9249..250414d 100644
--- a/src/example/dependence/depender/build.xml
+++ b/src/example/dependence/depender/build.xml
@@ -14,80 +14,80 @@
"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.
+ under the License.
-->
<project name="depender" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="${basedir}/lib" />
- <property name="build.dir" value="${basedir}/build" />
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="src.dir" value="${basedir}/src" />
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="src.dir" value="${basedir}/src"/>
<!-- ivy properties used -->
- <property name="ivy.settings.dir" value="../settings" />
- <property file="${ivy.settings.dir}/ivysettings.properties" />
-
+ <property name="ivy.settings.dir" value="../settings"/>
+ <property file="${ivy.settings.dir}/ivysettings.properties"/>
+
<!-- paths used for compilation and run -->
<path id="lib.path.id">
- <fileset dir="${lib.dir}" />
- </path>
+ <fileset dir="${lib.dir}"/>
+ </path>
<path id="run.path.id">
- <path refid="lib.path.id" />
- <path location="${classes.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${classes.dir}"/>
</path>
- <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
-
- <!-- =================================
- target: resolve
+ <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> resolve and retrieve dependencies with ivy">
- <ivy:retrieve />
+ <ivy:retrieve/>
</target>
-
- <!-- =================================
- target: report
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}" dot="true"/>
</target>
-
- <!-- =================================
+
+ <!-- =================================
target: gen-graph
================================= -->
<target name="gen-graph" depends="report" description="--> generates a graph of dependencies (requires dot in your path - see http://www.graphviz.org/)">
- <property name="dot.file" value="${build.dir}/apache-depending-default.dot" />
- <property name="ivygraph.output.file" value="${build.dir}/graph.png" />
- <exec executable="dot">
- <arg line="-T png -o ${ivygraph.output.file} ${dot.file}" />
- </exec>
+ <property name="dot.file" value="${build.dir}/apache-depending-default.dot"/>
+ <property name="ivygraph.output.file" value="${build.dir}/graph.png"/>
+ <exec executable="dot">
+ <arg line="-T png -o ${ivygraph.output.file} ${dot.file}"/>
+ </exec>
</target>
-
- <!-- =================================
- target: compile
+
+ <!-- =================================
+ target: compile
================================= -->
<target name="compile" depends="resolve" description="--> description">
- <mkdir dir="${classes.dir}" />
+ <mkdir dir="${classes.dir}"/>
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
</target>
-
- <!-- =================================
+
+ <!-- =================================
target: run
================================= -->
<target name="run" depends="clean, compile" description="--> compile and run the project">
<java classpathref="run.path.id" classname="depending.Main"/>
</target>
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ </fileset>
+ </delete>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/dual/build.xml
----------------------------------------------------------------------
diff --git a/src/example/dual/build.xml b/src/example/dual/build.xml
index 56f281f..04c9d8e 100644
--- a/src/example/dual/build.xml
+++ b/src/example/dual/build.xml
@@ -14,25 +14,25 @@
"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.
+ under the License.
-->
<project default="clean-all" xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean directories">
- <ant dir="project" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false" />
+ <ant dir="project" antfile="build.xml" target="clean" inheritall="false" inheritrefs="false"/>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <property name="ivy.settings.dir" value="settings" />
- <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
- <ivy:cleancache />
- </target>
-
- <target name="clean-all" depends="clean, clean-cache" description="--> clean directories and ivy cache"/>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <property name="ivy.settings.dir" value="settings"/>
+ <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
+ <ivy:cleancache/>
+ </target>
+
+ <target name="clean-all" depends="clean,clean-cache" description="--> clean directories and ivy cache"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/dual/project/build.xml
----------------------------------------------------------------------
diff --git a/src/example/dual/project/build.xml b/src/example/dual/project/build.xml
index bf550f3..6ef4b91 100644
--- a/src/example/dual/project/build.xml
+++ b/src/example/dual/project/build.xml
@@ -14,68 +14,68 @@
"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.
+ under the License.
-->
<project name="dual-ivy" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="${basedir}/lib" />
- <property name="build.dir" value="${basedir}/build" />
- <property name="src.dir" value="${basedir}/src" />
-
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="src.dir" value="${basedir}/src"/>
+
<!-- ivy properties used -->
- <property name="ivy.settings.dir" value="../settings" />
+ <property name="ivy.settings.dir" value="../settings"/>
- <!-- paths used for compilation and run -->
+ <!-- paths used for compilation and run -->
<path id="lib.path.id">
- <fileset dir="${lib.dir}" />
- </path>
+ <fileset dir="${lib.dir}"/>
+ </path>
<path id="run.path.id">
- <path refid="lib.path.id" />
- <path location="${build.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${build.dir}"/>
</path>
-
- <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
-
- <!-- =================================
- target: resolve
+
+ <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> resolve and retrieve dependencies with ivy">
- <ivy:retrieve />
+ <ivy:retrieve/>
</target>
-
- <!-- =================================
- target: report
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
-
- <!-- =================================
+
+ <!-- =================================
target: run
================================= -->
<target name="run" depends="resolve" description="--> compile and run the project">
- <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
<java classpathref="run.path.id" classname="example.Hello"/>
</target>
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ </fileset>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/go-ivy/build.xml
----------------------------------------------------------------------
diff --git a/src/example/go-ivy/build.xml b/src/example/go-ivy/build.xml
index d92b11f..cd7ec17 100644
--- a/src/example/go-ivy/build.xml
+++ b/src/example/go-ivy/build.xml
@@ -14,100 +14,99 @@
"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.
+ under the License.
-->
<project name="go-ivy" default="go" xmlns:ivy="antlib:org.apache.ivy.ant">
- <!--
- this build file is a self contained project: it doesn't require anything else
+ <!--
+ this build file is a self contained project: it doesn't require anything else
that ant 1.6.2 or greater and java 1.4 or greater properly installed.
-
+
It is used to showcase how easy and straightforward it can be to use Ivy.
-
+
This is not an example of the best pratice to use in a project, especially
for the java source code "generation" :-) (see generate-src target)
-
+
To run copy this file in an empty directory, open a shell or a command window
- in this directory and run "ant". It will download ivy and then use it to resolve
+ in this directory and run "ant". It will download ivy and then use it to resolve
the dependency of the class which is itself "contained" in this build script.
-
+
After a successful build run "ant" again and you will see the build will be
much faster.
-
+
More information can be found at http://ant.apache.org/ivy/
-->
-
- <!-- here is the version of ivy we will use. change this property to try a newer
+
+ <!-- here is the version of ivy we will use. change this property to try a newer
version if you want -->
- <property name="ivy.install.version" value="2.0.0-beta1" />
- <property name="ivy.jar.dir" value="${basedir}/ivy" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
- <property name="build.dir" value="build" />
- <property name="src.dir" value="src" />
-
-
+ <property name="ivy.install.version" value="2.0.0-beta1"/>
+ <property name="ivy.jar.dir" value="${basedir}/ivy"/>
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="src"/>
+
<target name="download-ivy" unless="skip.download">
- <mkdir dir="${ivy.jar.dir}"/>
- <!-- download Ivy from web site so that it can be used even without any special installation -->
- <echo message="installing ivy..."/>
- <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
- dest="${ivy.jar.file}" usetimestamp="true"/>
+ <mkdir dir="${ivy.jar.dir}"/>
+ <!-- download Ivy from web site so that it can be used even without any special installation -->
+ <echo message="installing ivy..."/>
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
-
- <!-- =================================
- target: install-ivy
- this target is not necessary if you put ivy.jar in your ant lib directory
- if you already have ivy in your ant lib, you can simply remove this
- target and the dependency the 'go' target has on it
- ================================= -->
+
+ <!-- =================================
+ target: install-ivy
+ this target is not necessary if you put ivy.jar in your ant lib directory
+ if you already have ivy in your ant lib, you can simply remove this
+ target and the dependency the 'go' target has on it
+ ================================= -->
<target name="install-ivy" depends="download-ivy" description="--> install ivy">
- <!-- try to load ivy here from local ivy dir, in case the user has not already dropped
- it into ant's lib dir (note that the latter copy will always take precedence).
- We will not fail as long as the ivy jar is in at least one of ant's lib dir or
- the local lib dir. -->
- <path id="ivy.lib.path">
- <pathelement location="${ivy.jar.file}"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
- </target>
-
- <!-- =================================
- target: go
- Go ivy, go!
+ <!-- try to load ivy here from local ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as the ivy jar is in at least one of ant's lib dir or
+ the local lib dir. -->
+ <path id="ivy.lib.path">
+ <pathelement location="${ivy.jar.file}"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+ <!-- =================================
+ target: go
+ Go ivy, go!
================================= -->
- <target name="go" depends="install-ivy, generate-src"
+ <target name="go" depends="install-ivy, generate-src"
description="--> resolve dependencies, compile and run the project">
- <echo message="using ivy to resolve commons-lang 2.1..."/>
- <!-- here comes the magic line: asks ivy to resolve a dependency on
+ <echo message="using ivy to resolve commons-lang 2.1..."/>
+ <!-- here comes the magic line: asks ivy to resolve a dependency on
commons-lang 2.1 and to build an ant path with it from its cache -->
- <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
+ <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
pathid="lib.path.id" inline="true"/>
-
- <echo message="compiling..."/>
- <mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
-
- <echo>
+
+ <echo message="compiling..."/>
+ <mkdir dir="${build.dir}"/>
+ <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
+
+ <echo>
We are now ready to execute our simple program with its dependency on commons-lang.
Let's go!
- </echo>
- <java classname="example.Hello">
+ </echo>
+ <java classname="example.Hello">
<classpath>
- <path refid="lib.path.id" />
- <path location="${build.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${build.dir}"/>
</classpath>
- </java>
+ </java>
</target>
- <!-- =================================
- target: generate-src
- 'Generates' the class source. It actually just echo a simple java
- source code to a file. In real life this file would already be
- present on your file system, and this target wouldn't be necessary.
+ <!-- =================================
+ target: generate-src
+ 'Generates' the class source. It actually just echo a simple java
+ source code to a file. In real life this file would already be
+ present on your file system, and this target wouldn't be necessary.
================================= -->
<target name="generate-src">
- <mkdir dir="${src.dir}/example" />
+ <mkdir dir="${src.dir}/example"/>
<echo file="${src.dir}/example/Hello.java">
package example;
@@ -117,35 +116,35 @@ public class Hello {
public static void main(String[] args) {
String message = "hello ivy !";
System.out.println("standard message : " + message);
- System.out.println("capitalized by " + WordUtils.class.getName()
+ System.out.println("capitalized by " + WordUtils.class.getName()
+ " : " + WordUtils.capitalizeFully(message));
}
}
</echo>
</target>
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true" quiet="true">
- <fileset dir="${src.dir}" />
- <fileset dir="${build.dir}" />
- </delete>
+ <fileset dir="${src.dir}"/>
+ <fileset dir="${build.dir}"/>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-ivy
+
+ <!-- =================================
+ target: clean-ivy
================================= -->
- <target name="clean-ivy" description="--> clean the ivy installation">
- <delete dir="${ivy.jar.dir}"/>
- </target>
-
- <!-- =================================
- target: clean-cache
+ <target name="clean-ivy" description="--> clean the ivy installation">
+ <delete dir="${ivy.jar.dir}"/>
+ </target>
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" depends="install-ivy"
- description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" depends="install-ivy"
+ description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/hello-ivy/build.xml
----------------------------------------------------------------------
diff --git a/src/example/hello-ivy/build.xml b/src/example/hello-ivy/build.xml
index 1e94ea4..64a5743 100644
--- a/src/example/hello-ivy/build.xml
+++ b/src/example/hello-ivy/build.xml
@@ -14,67 +14,67 @@
"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.
+ under the License.
-->
<project name="hello-ivy" default="run" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- some variables used -->
- <property name="lib.dir" value="lib" />
- <property name="build.dir" value="build" />
- <property name="src.dir" value="src" />
-
+ <property name="lib.dir" value="lib"/>
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="src"/>
+
<!-- paths used for compilation and run -->
<path id="lib.path.id">
- <fileset dir="${lib.dir}" />
- </path>
+ <fileset dir="${lib.dir}"/>
+ </path>
<path id="run.path.id">
- <path refid="lib.path.id" />
- <path location="${build.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${build.dir}"/>
</path>
-
- <!-- =================================
- target: resolve
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> retreive dependencies with ivy">
<ivy:retrieve/>
- </target>
-
- <!-- =================================
- target: report
+ </target>
+
+ <!-- =================================
+ target: report
================================= -->
<target name="report" depends="resolve" description="--> generates a report of dependencies">
<ivy:report todir="${build.dir}"/>
</target>
- <!-- =================================
+ <!-- =================================
target: run
================================= -->
<target name="run" depends="resolve" description="--> compile and run the project">
- <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
- <property name="msg" value="hello ivy !"/>
+ <property name="msg" value="hello ivy !"/>
<java classpathref="run.path.id" classname="example.Hello">
- <arg value="-message"/>
- <arg value="${msg}"/>
- </java>
+ <arg value="-message"/>
+ <arg value="${msg}"/>
+ </java>
</target>
- <!-- =================================
- target: clean
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true">
<fileset dir="${basedir}">
- <exclude name="src/**" />
- <exclude name="build.xml" />
- <exclude name="ivy.xml" />
- </fileset>
- </delete>
+ <exclude name="src/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ </fileset>
+ </delete>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
- </target>
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/multi-project/build.xml
----------------------------------------------------------------------
diff --git a/src/example/multi-project/build.xml b/src/example/multi-project/build.xml
index 200a439..1b24813 100644
--- a/src/example/multi-project/build.xml
+++ b/src/example/multi-project/build.xml
@@ -14,56 +14,53 @@
"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.
+ under the License.
-->
-<project name="all"
- xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <property name="ivy.jar.dir" value="${user.home}/.ivy2/jars" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+<project name="all" xmlns:ivy="antlib:org.apache.ivy.ant">
- <property name="build.dir" value="build" />
- <property name="src.dir" value="src" />
-
-
- <!-- =================================
- target: load-ivy
- this target is not necessary if you put ivy.jar in your ant lib directory
- if you already have ivy 1.4 in your ant lib, you can simply remove this
- target
+ <property name="ivy.jar.dir" value="${user.home}/.ivy2/jars"/>
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="src"/>
+
+
+ <!-- =================================
+ target: load-ivy
+ this target is not necessary if you put ivy.jar in your ant lib directory
+ if you already have ivy 1.4 in your ant lib, you can simply remove this
+ target
================================= -->
<target name="load-ivy">
- <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
- it into ant's lib dir (note that the latter copy will always take precedence).
- We will not fail as long as ivy home lib dir exists (it may be empty) and
- ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
- <path id="ivy.lib.path">
- <pathelement location="${ivy.jar.file}"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
- </target>
-
- <target name="buildlist" depends="load-ivy">
- <ivy:buildlist reference="build-path">
- <fileset dir="projects" includes="**/build.xml"/>
- </ivy:buildlist>
- </target>
-
- <target name="publish-all" depends="buildlist"
- description="compile, jar and publish all projects in the right order">
- <subant target="publish" buildpathref="build-path" />
- </target>
+ <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as ivy home lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
+ <path id="ivy.lib.path">
+ <pathelement location="${ivy.jar.file}"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
- <target name="clean-all" depends="buildlist" description="clean all projects">
- <subant target="clean" buildpathref="build-path" />
- </target>
-
- <target name="clean" depends="clean-all, load-ivy"
- description="clean tutorial: delete repository, ivy cache, and all projects">
- <delete dir="repository"/>
- <ivy:cleancache />
+ <target name="buildlist" depends="load-ivy">
+ <ivy:buildlist reference="build-path">
+ <fileset dir="projects" includes="**/build.xml"/>
+ </ivy:buildlist>
+ </target>
+
+ <target name="publish-all" depends="buildlist"
+ description="compile, jar and publish all projects in the right order">
+ <subant target="publish" buildpathref="build-path"/>
+ </target>
+
+ <target name="clean-all" depends="buildlist" description="clean all projects">
+ <subant target="clean" buildpathref="build-path"/>
+ </target>
+
+ <target name="clean" depends="clean-all, load-ivy"
+ description="clean tutorial: delete repository, ivy cache, and all projects">
+ <delete dir="repository"/>
+ <ivy:cleancache/>
</target>
-
-
</project>
[5/5] ant-ivy git commit: Upgrade Checkstyle to 7.8.1
Posted by jh...@apache.org.
Upgrade Checkstyle to 7.8.1
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/4c6450f4
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/4c6450f4
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/4c6450f4
Branch: refs/heads/master
Commit: 4c6450f4582763c81aec93f69a2d485f469da25a
Parents: a9880a1
Author: twogee <g....@gmail.com>
Authored: Mon Jun 5 23:18:12 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Mon Jun 5 23:18:12 2017 +0200
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c6450f4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4529899..4c2b198 100644
--- a/build.xml
+++ b/build.xml
@@ -550,7 +550,7 @@
</target>
<target name="init-checkstyle" depends="jar">
- <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="7.8"
+ <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="7.8.1"
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"/>
[3/5] ant-ivy git commit: Adjust Eclipse settings for Java 7
Posted by jh...@apache.org.
Adjust Eclipse settings for Java 7
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/7d452863
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/7d452863
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/7d452863
Branch: refs/heads/master
Commit: 7d4528639ca56fa2e9eb826d5ba3118261c86d22
Parents: a2fdfe6
Author: twogee <g....@gmail.com>
Authored: Mon Jun 5 22:37:39 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Mon Jun 5 22:37:39 2017 +0200
----------------------------------------------------------------------
.settings/org.eclipse.jdt.core.prefs | 49 +++++++++++++++++++++++++++++--
.settings/org.eclipse.jdt.ui.prefs | 11 +++++--
2 files changed, 55 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7d452863/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 767786f..1c8ff0a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -19,17 +19,19 @@
# ***************************************************************
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
@@ -40,15 +42,18 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=1
@@ -58,6 +63,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -67,21 +73,33 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
org.eclipse.jdt.core.formatter.comment.line_length=100
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
@@ -93,7 +111,15 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -141,6 +167,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -159,12 +186,14 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
@@ -188,6 +217,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invoc
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
@@ -215,6 +245,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -243,14 +274,17 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invoc
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -260,14 +294,23 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7d452863/.settings/org.eclipse.jdt.ui.prefs
----------------------------------------------------------------------
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index dcf0b99..64b14a7 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -19,9 +19,10 @@
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_Ivy Conventions
-formatter_settings_version=10
+formatter_settings_version=12
internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomm
ent_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" conte
xt\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\r\n * Licensed to the Apache Software Foundation (ASF) under one or more\r\n * contributor license agreements. See the NOTICE file distributed with\r\n * this work for additional information regarding copyright ownership.\r\n * The ASF licenses this file to Y
ou under the Apache License, Version 2.0\r\n * (the "License"); you may not use this file except in compliance with\r\n * the License. You may obtain a copy of the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\r\n */\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="C
ode in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in
created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context"
deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" de
leted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the
"License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codet
emplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody
" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
@@ -35,10 +36,12 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -54,6 +57,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -67,10 +71,13 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false