From 198e9602dcdd7b7e81edf74a1f47e6a9f6e65dfe Mon Sep 17 00:00:00 2001
From: Martin Oberhuber <mober.at+eclipse@gmail.com>
Date: Wed, 14 Jun 2017 06:14:51 +0200
Subject: [PATCH] Releng: Revert to jarsigner-1.1.2 since 1.1.4 fails with Java
 8

Change-Id: Ifab75c4dd0c96c9217cf8154ab72f79a924c54b7
Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>
---
 admin/pom-config.xml                                  | 5 ++---
 plugins/org.eclipse.tm.terminal.test/build.properties | 1 -
 plugins/org.eclipse.tm.terminal.test/pom.xml          | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index e4c59610386..255f285932b 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -47,9 +47,8 @@
         <findbugs-version>3.0.4</findbugs-version>
         <!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
         <jacoco-version>0.7.9</jacoco-version>
-        <!-- Needed by Jacoco, see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
-        <tycho.testArgLine></tycho.testArgLine>
-        <eclipse-jarsigner-version>1.1.4</eclipse-jarsigner-version>
+        <!-- Note: jarsigner-1.1.4 fails with Java 7 so stick to 1.1.2 -->
+        <eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
 
         <!-- Common global properties -->
         <adminDir>${env.WORKSPACE}/admin</adminDir>
diff --git a/plugins/org.eclipse.tm.terminal.test/build.properties b/plugins/org.eclipse.tm.terminal.test/build.properties
index c59c495c94a..21697f09edc 100644
--- a/plugins/org.eclipse.tm.terminal.test/build.properties
+++ b/plugins/org.eclipse.tm.terminal.test/build.properties
@@ -17,7 +17,6 @@ bin.includes = META-INF/,\
                about.properties,\
                about.ini,\
                tm32.png,\
-               test.xml,\
                about.html
 src.includes = teamConfig/,\
                about.html
diff --git a/plugins/org.eclipse.tm.terminal.test/pom.xml b/plugins/org.eclipse.tm.terminal.test/pom.xml
index b478e72e2b8..20697fe3169 100644
--- a/plugins/org.eclipse.tm.terminal.test/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.test/pom.xml
@@ -34,7 +34,8 @@
 							<useUIHarness>true</useUIHarness>
 							<useUIThread>false</useUIThread>
 							<product>org.eclipse.platform.ide</product>
-							<!-- For Jacoco, see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
+							<!-- tycho.testArgLine is filled by Jacoco prepare-agent -->
+							<!-- see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
 							<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
 							<application>org.eclipse.ui.ide.workbench</application>
 							<testFailureIgnore>true</testFailureIgnore>