You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/03/14 05:57:36 UTC
ant-ivy git commit: Revise grammar and/or Java versions
Repository: ant-ivy
Updated Branches:
refs/heads/master b77d46456 -> d278094ea
Revise grammar and/or Java versions
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/d278094e
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/d278094e
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/d278094e
Branch: refs/heads/master
Commit: d278094eadbf5ef3db639ea2b2c0e43a352c7f39
Parents: b77d464
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Mar 14 06:57:59 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Mar 14 06:57:59 2018 +0100
----------------------------------------------------------------------
asciidoc/ant.adoc | 2 +-
asciidoc/dev.adoc | 4 ++--
asciidoc/dev/apache-proposal.adoc | 2 +-
asciidoc/samples/build.xml | 2 +-
asciidoc/standalone.adoc | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d278094e/asciidoc/ant.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ant.adoc b/asciidoc/ant.adoc
index 02c3260..ea42b14 100644
--- a/asciidoc/ant.adoc
+++ b/asciidoc/ant.adoc
@@ -75,7 +75,7 @@ This calls Ivy with default values, which might be ok in several projects. In fa
Those 3 tasks follow the 3 main steps of the Ivy retrieving dependencies process:
-* First the configure task tells it how it can find dependencies giving it a path to an link:settings{outfilesuffix}[settings XML file].
+* First the configure task tells it how it can find dependencies giving it a path to a link:settings{outfilesuffix}[settings XML file].
* Then the resolve task actually resolves dependencies described by an link:ivyfile{outfilesuffix}[Ivy file], and puts those dependencies in the Ivy cache (a directory configured in the settings file).
* Finally the retrieve task copies dependencies from the cache to anywhere you want in your file system. You can then use those dependencies to make your classpath with standard Ant paths.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d278094e/asciidoc/dev.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/dev.adoc b/asciidoc/dev.adoc
index 645e9b7..f3df972 100644
--- a/asciidoc/dev.adoc
+++ b/asciidoc/dev.adoc
@@ -25,7 +25,7 @@ To build Ivy from source it's really easy.
All you need is
-* an link:https://git-scm.com/downloads[Git] client +
+* a link:https://git-scm.com/downloads[Git] client +
_to check out Ivy sources from Apache Git, not required if you build from sources packaged in a release_
* link:https://ant.apache.org/[Apache Ant] 1.9.0 or greater +
@@ -74,7 +74,7 @@ http://www.oracle.com/technetwork/java/javase/documentation/codeconvtoc-136057.h
This is a work in progress though (see link:https://issues.apache.org/jira/browse/IVY-511[IVY-511]), but patches helping migration to these conventions are welcome.
-== Developing with eclipse
+== Developing with Eclipse
Even though you can develop Ivy with your IDE of choice, we support Eclipse development by providing ad hoc metadata.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d278094e/asciidoc/dev/apache-proposal.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/dev/apache-proposal.adoc b/asciidoc/dev/apache-proposal.adoc
index fc8cedb..d592eab 100644
--- a/asciidoc/dev/apache-proposal.adoc
+++ b/asciidoc/dev/apache-proposal.adoc
@@ -40,7 +40,7 @@ Maarten Coene has joined the committer team in May 2006. He has an experience of
=== Alignment ===
-Ivy has no mandatory dependencies except Java 1.4. However, it is strongly recommended to be used with Ant. Ivy uses also other Apache projects, especially from Jakarta Commons.
+Ivy has no mandatory dependencies except Java 7. However, it is strongly recommended to be used with Ant. Ivy uses also other Apache projects, especially from Jakarta Commons.
== Known risks ==
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d278094e/asciidoc/samples/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/build.xml b/asciidoc/samples/build.xml
index 0700e48..2f2fa48 100644
--- a/asciidoc/samples/build.xml
+++ b/asciidoc/samples/build.xml
@@ -19,7 +19,7 @@
<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
- that Ant 1.8 or greater and Java 1.5 or greater properly installed.
+ that Ant 1.8 or greater and Java 5 or greater properly installed.
It is used to showcase how easy and straightforward it can be to use Ivy.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d278094e/asciidoc/standalone.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/standalone.adoc b/asciidoc/standalone.adoc
index 043f9d2..c86f9ec 100644
--- a/asciidoc/standalone.adoc
+++ b/asciidoc/standalone.adoc
@@ -19,7 +19,7 @@
= Using standalone
-Ivy can be used as a standalone program very easily. All you need is a Java 1.7+ runtime environment (JRE)!
+Ivy can be used as a standalone program very easily. All you need is a Java 7+ runtime environment (JRE)!
Then here is how to call it: