From fe9bef74138cd3cea7603557c6e8d3da358df5cd Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 25 Nov 2020 10:35:26 +0000
Subject: [PATCH 7/7] Revert change for surefire update that is not in Fedora
---
pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 8 ++++----
.../tycho/surefire/osgibooter/OsgiSurefireBooter.java | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 04cd97c..defce9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<pluginToolsVersion>3.6.0</pluginToolsVersion>
<maven-version>3.6.3</maven-version>
<!-- NOTE: when updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
- <surefire-version>2.22.2</surefire-version>
+ <surefire-version>2.22.0</surefire-version>
<equinoxVersion>3.16.100</equinoxVersion>
<equinoxCompatVersion>1.2.200</equinoxCompatVersion>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
index 9ad1c2e..20f92c6 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.2.0
Bundle-ClassPath: .,
- jars/surefire-booter-2.22.2.jar,
- jars/surefire-api-2.22.2.jar,
- jars/surefire-logger-api-2.22.2.jar,
- jars/maven-surefire-common-2.22.2.jar
+ jars/surefire-booter-2.22.0.jar,
+ jars/surefire-api-2.22.0.jar,
+ jars/surefire-logger-api-2.22.0.jar,
+ jars/maven-surefire-common-2.22.0.jar
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
index 3680799..08acad2 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.apache.maven.plugin.surefire.StartupReportConfiguration;
import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
-import org.apache.maven.plugin.surefire.report.ConsoleReporter;
import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
import org.apache.maven.surefire.booter.BooterConstants;
import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
@@ -107,8 +106,8 @@ public class OsgiSurefireBooter {
extractProviderProperties(testProps), null, false, Collections.<CommandLineOption> emptyList(),
skipAfterFailureCount, Shutdown.DEFAULT, 30);
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
- ConsoleReporter.PLAIN, redirectTestOutputToFile, disableXmlReport, reportsDir, trimStackTrace, null,
- new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null, false);
+ StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
+ trimStackTrace, null, new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null);
ReporterFactory reporterFactory = new DefaultReporterFactory(startupReportConfig,
new PrintStreamLogger(startupReportConfig.getOriginalSystemOut()));
// API indicates we should use testClassLoader below but surefire also tries
--
2.28.0