pool/tycho
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=50

Browse Source
This commit is contained in:
Fridrich Strba 2024-02-22 07:58:02 +00:00 committed by Git OBS Bridge
parent 813b724c06
commit 74580b8468
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tycho-surefire.patch Normal file
View File

@ -0,0 +1,21 @@
--- org.eclipse.tycho-tycho-1.6.0/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2024-02-22 08:27:09.040344970 +0100
+++ org.eclipse.tycho-tycho-1.6.0/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2024-02-22 08:42:48.709870381 +0100
@@ -27,6 +27,7 @@
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;
@@ -104,8 +105,8 @@
extractProviderProperties(testProps), null, false, Collections.<CommandLineOption> emptyList(),
skipAfterFailureCount, Shutdown.DEFAULT, 30);
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
- StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
- trimStackTrace, null, new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null);
+ ConsoleReporter.PLAIN, redirectTestOutputToFile, disableXmlReport, reportsDir,
+ trimStackTrace, null, new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null, false);
ReporterFactory reporterFactory = new DefaultReporterFactory(startupReportConfig,
new PrintStreamLogger(startupReportConfig.getOriginalSystemOut()));
// API indicates we should use testClassLoader below but surefire also tries

7
tycho.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 22 07:57:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* tycho-surefire.patch
+ fix build against maven-surefire >= 2.22.1
-------------------------------------------------------------------
Wed Feb 21 10:55:05 UTC 2024 - Gus Kenion <gus.kenion@suse.com>

4
tycho.spec
View File

@ -68,6 +68,7 @@ Patch8: plexus-lookup-fix.patch
Patch9: tycho-plexus-compiler-2.13.patch
Patch10: tycho-sourcetarget.patch
Patch11: tycho-getTimestamp.patch
Patch12: tycho-surefire.patch
Patch100: fedoraproject-p2-bootstrap-fix.patch
BuildRequires: bash
BuildRequires: fdupes
@ -90,7 +91,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common)
BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common) >= 2.22.1
BuildRequires: mvn(org.apache.maven.surefire:surefire-api)
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit3)
BuildRequires: mvn(org.apache.maven.surefire:surefire-testng-utils)
@ -218,6 +219,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
%patch -P 9 -p1
%patch -P 10 -p1
%patch -P 11 -p1
%patch -P 12 -p1
%patch -P 100
# Unneeded for RPM builds