Fix build against new surefire
This commit is contained in:
parent
27cbbcd43c
commit
293ff1e97f
|
@ -0,0 +1,11 @@
|
|||
--- tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java.orig 2018-07-25 15:02:39.484574315 +0100
|
||||
+++ tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2018-07-25 15:04:38.494188050 +0100
|
||||
@@ -101,7 +101,7 @@
|
||||
skipAfterFailureCount, Shutdown.DEFAULT, 0);
|
||||
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
|
||||
StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
|
||||
- trimStacktrace, null, new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, null);
|
||||
+ trimStacktrace, null, new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, null, null);
|
||||
ReporterFactory reporterFactory = new DefaultReporterFactory(startupReportConfig, new NullConsoleLogger());
|
||||
// API indicates we should use testClassLoader below but surefire also tries
|
||||
// to load surefire classes using this classloader
|
13
tycho.spec
13
tycho.spec
|
@ -9,7 +9,7 @@
|
|||
# Tycho such that it can build a bootstrap mode Eclipse and subsequently
|
||||
# fully rebuild itself. In this mode, there may be reduced functionality,
|
||||
# so a full non-bootstrap mode build should always be done afterwards.
|
||||
%bcond_without bootstrap
|
||||
%bcond_with bootstrap
|
||||
|
||||
# Release tags or git SHAs
|
||||
%global git_tag tycho-%{version}
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
Name: tycho
|
||||
Version: 1.2.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
|
||||
|
||||
# license file is missing but all files having some licensing information are ASL 2.0
|
||||
|
@ -58,6 +58,9 @@ Patch2: %{name}-use-custom-resolver.patch
|
|||
Patch3: %{name}-maven-delegation.patch
|
||||
# Changes needed for building against latest surefire
|
||||
Patch4: build-against-surefire-2.21.patch
|
||||
%if 0%{?fedora} >= 29
|
||||
Patch5: build-against-surefire-2.22.patch
|
||||
%endif
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
@ -173,6 +176,9 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
|
|||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%if 0%{?fedora} >= 29
|
||||
%patch5
|
||||
%endif
|
||||
|
||||
# Unneeded for RPM builds
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
|
@ -359,6 +365,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}${xmvn_libdir}/inst
|
|||
%files javadoc -f .mfiles-javadoc
|
||||
|
||||
%changelog
|
||||
* Wed Jul 25 2018 Mat Booth <mat.booth@redhat.com> - 1.2.0-4
|
||||
- Fix build against new surefire
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue