You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/02/20 16:58:59 UTC
[09/12] ant git commit: accepted the PR too late for 1.10.1
accepted the PR too late for 1.10.1
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fd4ff012
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fd4ff012
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fd4ff012
Branch: refs/heads/master
Commit: fd4ff0120ab95c38554c071ee193a64141d1c987
Parents: 166ce26
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Feb 20 17:48:01 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Feb 20 17:48:01 2017 +0100
----------------------------------------------------------------------
manual/Tasks/conditions.html | 2 +-
manual/Tasks/script.html | 2 +-
manual/Tasks/scriptdef.html | 4 ++--
manual/Types/filterchain.html | 2 +-
manual/Types/mapper.html | 2 +-
manual/Types/selectors.html | 2 +-
.../apache/tools/ant/taskdefs/optional/script/ScriptDef.java | 4 ++--
src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 6 +++---
src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java | 6 +++---
9 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/manual/Tasks/conditions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index 895da54..b1c1c31 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -538,7 +538,7 @@ an explanation of scripts and dependencies.
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script source. <em>since Ant 1.10.1.</em></td>
+ <td valign="top">The encoding of the script source. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/manual/Tasks/script.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index 7a56eec..d111124 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -104,7 +104,7 @@ different location values.</p>
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
+ <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index de601a5..f593e61 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -117,7 +117,7 @@ more information on writing scripts, please refer to the
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
+ <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
@@ -126,7 +126,7 @@ more information on writing scripts, please refer to the
evaluation for faster multiple executions, on the condition that the <em>manager</em> is "javax" and the
target engine implements <code>javax.script.Compilable</code>.
Note that the <code>bsf</code> manager may automatically compiles the script.
- <em>since Ant 1.10.1.</em></td>
+ <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to false</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/manual/Types/filterchain.html
----------------------------------------------------------------------
diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html
index 1496816..4c5f94e 100644
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@ -1567,7 +1567,7 @@ Must be a supported Apache BSF or JSR 223 language</td>
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
+ <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/manual/Types/mapper.html
----------------------------------------------------------------------
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index f6bc76d..1da85dc 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -807,7 +807,7 @@ an explanation of scripts and dependencies.
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
+ <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/manual/Types/selectors.html
----------------------------------------------------------------------
diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html
index 6a080cb..db2ec48 100644
--- a/manual/Types/selectors.html
+++ b/manual/Types/selectors.html
@@ -1109,7 +1109,7 @@
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
+ <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
index 7a410e0..7e62549 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
@@ -375,7 +375,7 @@ public class ScriptDef extends DefBase {
* Defines the compilation feature ; optional.
*
* @param compiled enables the script compilation if available.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
*/
public void setCompiled(boolean compiled) {
helper.setCompiled(compiled);
@@ -394,7 +394,7 @@ public class ScriptDef extends DefBase {
* Sets the encoding of the script from an external file ; optional.
*
* @param encoding the encoding of the file containing the script source.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
*/
public void setEncoding(String encoding) {
helper.setEncoding(encoding);
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
index c738999..f78ee23 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
@@ -196,7 +196,7 @@ public abstract class ScriptRunnerBase {
/**
* Whether to use script compilation if available.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
* @param compiled if true, compile the script if possible.
*/
public final void setCompiled(boolean compiled) {
@@ -205,7 +205,7 @@ public abstract class ScriptRunnerBase {
/**
* Get the compiled attribute.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
* @return the attribute.
*/
public final boolean getCompiled() {
@@ -214,7 +214,7 @@ public abstract class ScriptRunnerBase {
/**
* Set encoding of the script from an external file; optional.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
* @param encoding encoding of the external file containing the script source.
*/
public void setEncoding(String encoding) {
http://git-wip-us.apache.org/repos/asf/ant/blob/fd4ff012/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java b/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
index eda0421..fc1be2a 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
@@ -118,7 +118,7 @@ public class ScriptRunnerHelper {
/**
* Get the external script file ; optional.
* @return the file containing the script source.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
*/
public File getSrc() {
return srcFile;
@@ -128,7 +128,7 @@ public class ScriptRunnerHelper {
* Set the encoding of the script from an external file ; optional.
*
* @param encoding the encoding of the file containing the script source.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
*/
public void setEncoding(String encoding) {
this.encoding = encoding;
@@ -137,7 +137,7 @@ public class ScriptRunnerHelper {
/**
* Get the external file encoding.
* @return the encoding of the file containing the script source.
- * @since Ant 1.10.1
+ * @since Ant 1.10.2
*/
public String getEncoding() {
return encoding;