You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/03/01 11:34:40 UTC

[1/3] ant git commit: BZ-62147 Add a test case to make sure 1.9.x isn't affected by the issue reported in 62147 where StringResource value was being property replaced when used within a Token

Repository: ant
Updated Branches:
  refs/heads/master 5d167c2f4 -> 3b2587d76


BZ-62147 Add a test case to make sure 1.9.x isn't affected by the issue reported in 62147 where StringResource value was being property replaced when used within a Token


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/cd32b65a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/cd32b65a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/cd32b65a

Branch: refs/heads/master
Commit: cd32b65ace69e25cd5a775e21ea978fc84a4519f
Parents: 6c97661
Author: Jaikiran Pai <ja...@apache.org>
Authored: Thu Mar 1 16:53:00 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Thu Mar 1 16:53:00 2018 +0530

----------------------------------------------------------------------
 src/tests/antunit/types/resources/tokens-test.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/cd32b65a/src/tests/antunit/types/resources/tokens-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/types/resources/tokens-test.xml b/src/tests/antunit/types/resources/tokens-test.xml
index c09d604..26a300d 100644
--- a/src/tests/antunit/types/resources/tokens-test.xml
+++ b/src/tests/antunit/types/resources/tokens-test.xml
@@ -44,6 +44,22 @@
     </au:assertTrue>
   </target>
 
+  <target name="testPropReplacement" description="bz-62147 - tests that string resource tokens aren't replaced with property values">
+    <property name="bz-62147-four" value="four"/>
+    <au:assertTrue>
+      <resourcecount count="0">
+        <difference>
+          <tokens>
+            <string>one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}</string>
+          </tokens>
+          <resources>
+            <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}" />
+          </resources>
+        </difference>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
   <target name="testExplicitLines">
     <au:assertTrue>
       <resourcecount count="0">

[3/3] ant git commit: Merge 1.9.x branch into master

Posted by ja...@apache.org.
Merge 1.9.x branch into master


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3b2587d7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3b2587d7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3b2587d7

Branch: refs/heads/master
Commit: 3b2587d76601a684097bff2786149f8aa7a1730a
Parents: 61d469c cd32b65
Author: Jaikiran Pai <ja...@apache.org>
Authored: Thu Mar 1 17:03:49 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Thu Mar 1 17:03:49 2018 +0530

----------------------------------------------------------------------

----------------------------------------------------------------------

[2/3] ant git commit: Update WHATSNEW for 62147

Posted by ja...@apache.org.
Update WHATSNEW for 62147


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/61d469c3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/61d469c3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/61d469c3

Branch: refs/heads/master
Commit: 61d469c3bada86cbeafaaeaea7cbbeee0b85cf42
Parents: 5d167c2
Author: Jaikiran Pai <ja...@apache.org>
Authored: Thu Mar 1 17:03:32 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Thu Mar 1 17:03:32 2018 +0530

----------------------------------------------------------------------
 WHATSNEW | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/61d469c3/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 8d0d671..4f82e81 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -23,6 +23,10 @@ Fixed bugs:
  * Fixed NullPointerException when a mappedresource is used in pathconvert
    Bugzilla Report 62076
 
+ * Fixed an issue where a string, when used as a resource collection, within
+   tokens, would be replaced by property values
+   Bugzilla Report 62147
+
 Other changes:
 --------------