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 2018/03/20 11:58:54 UTC
[1/2] ant git commit: I'm afraid git ate my keystore
Repository: ant
Updated Branches:
refs/heads/master f64dbfbc2 -> 5886bd354
I'm afraid git ate my keystore
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/07776ac6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/07776ac6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/07776ac6
Branch: refs/heads/master
Commit: 07776ac6ad2a1bb9e45f0da3aad756615008c796
Parents: 0945257
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 12:48:03 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 12:48:03 2018 +0100
----------------------------------------------------------------------
src/etc/testcases/testkeystore.pkcs12 | Bin 2945 -> 0 bytes
src/etc/testcases/testkeystore.pkcs12.gz | Bin 0 -> 2871 bytes
src/tests/antunit/taskdefs/signjar-test.xml | 4 +++-
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/07776ac6/src/etc/testcases/testkeystore.pkcs12
----------------------------------------------------------------------
diff --git a/src/etc/testcases/testkeystore.pkcs12 b/src/etc/testcases/testkeystore.pkcs12
deleted file mode 100644
index c0016c5..0000000
Binary files a/src/etc/testcases/testkeystore.pkcs12 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ant/blob/07776ac6/src/etc/testcases/testkeystore.pkcs12.gz
----------------------------------------------------------------------
diff --git a/src/etc/testcases/testkeystore.pkcs12.gz b/src/etc/testcases/testkeystore.pkcs12.gz
new file mode 100644
index 0000000..57a3d45
Binary files /dev/null and b/src/etc/testcases/testkeystore.pkcs12.gz differ
http://git-wip-us.apache.org/repos/asf/ant/blob/07776ac6/src/tests/antunit/taskdefs/signjar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/signjar-test.xml b/src/tests/antunit/taskdefs/signjar-test.xml
index 30671cf..7cff520 100644
--- a/src/tests/antunit/taskdefs/signjar-test.xml
+++ b/src/tests/antunit/taskdefs/signjar-test.xml
@@ -25,7 +25,7 @@
<property name="signtest.jar" location="${sign.dir}/signtest.jar" />
<property name="subdirsigntest.jar" location="${subdir}/signtest.jar" />
<property name="testkeystore" location="../../../etc/testcases/testkeystore" />
- <property name="testkeystore.pkcs12" location="${testkeystore}.pkcs12" />
+ <property name="testkeystore.pkcs12" location="${input}/testkeystore.pkcs12" />
<macrodef name="assertSigned">
<attribute name="jar" default="${signtest.jar}" />
@@ -54,6 +54,8 @@
</presetdef>
<target name="setUp">
+ <mkdir dir="${input}"/>
+ <gunzip src="${testkeystore}.pkcs12.gz" dest="${testkeystore.pkcs12}"/>
<mkdir dir="${sign.dir}" />
<mkdir dir="${subdir}" />
</target>
[2/2] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5886bd35
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5886bd35
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5886bd35
Branch: refs/heads/master
Commit: 5886bd354f16bf4f462b6b6c1b86a07b84c784b7
Parents: f64dbfb 07776ac
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 12:58:44 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 12:58:44 2018 +0100
----------------------------------------------------------------------
src/etc/testcases/testkeystore.pkcs12 | Bin 2945 -> 0 bytes
src/etc/testcases/testkeystore.pkcs12.gz | Bin 0 -> 2871 bytes
src/tests/antunit/taskdefs/signjar-test.xml | 4 +++-
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------