rpms/maven-surefire
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream 3.0.0-M6 milestone snapshot

Browse Source
This commit is contained in:
Mikolaj Izdebski 2022-04-21 23:54:59 +02:00
parent 8b2bd868d2
commit 87a2576a2a
8 changed files with 195 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -31,3 +31,4 @@
/maven-surefire-3.0.0-M3.tar.gz
/maven-surefire-3.0.0-M4.tar.gz
/maven-surefire-3.0.0~M4.tar.gz
/maven-surefire-3.0.0~M6.tar.gz

18
0001-Port-to-TestNG-6.11.patch → 0001-Port-to-TestNG-7.4.0.patch
View File

@ -1,7 +1,7 @@
From 85887dc85709e8719db0becc17adacd905dcd579 Mon Sep 17 00:00:00 2001
From 749b5ec6d04904d82747b60f209945a917ec479e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jul 2017 10:37:50 +0200
Subject: [PATCH 1/3] Port to TestNG 6.11
Subject: [PATCH 1/4] Port to TestNG 7.4.0
---
surefire-providers/surefire-testng/pom.xml | 3 +--
@ -10,7 +10,7 @@ Subject: [PATCH 1/3] Port to TestNG 6.11
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index 1ce2888..bf93114 100644
index ece647d6a..682f296e6 100644
--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
@@ -51,8 +51,7 @@
@ -19,15 +19,15 @@ index 1ce2888..bf93114 100644
<artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
+ <version>6.11</version>
+ <version>7.4.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependency>
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
index e966731..7021ef5 100644
index ed918f538..c4a0cd19d 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
@@ -63,7 +63,7 @@ public abstract class AbstractDirectConfigurator
@@ -63,7 +63,7 @@ public void configure( TestNG testng, Map<String, String> options )
testng.setUseDefaultListeners( false );
configureInstance( testng, options );
// TODO: we should have the Profile so that we can decide if this is needed or not
@ -37,7 +37,7 @@ index e966731..7021ef5 100644
@Override
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
index b6bf82e03..8164f4f4d 100755
index 6caf82459..2d988381f 100755
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
@@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map<String, String> options )
@ -50,5 +50,5 @@ index b6bf82e03..8164f4f4d 100755
}
--
2.30.2
2.35.1

32
0002-Disable-JUnit-4.8-test-grouping.patch
View File

@ -1,7 +1,7 @@
From 61a123e7dd146933570a252f147fa83666363de3 Mon Sep 17 00:00:00 2001
From e953698dd68a09467fcaa4a390b61c580caefa96 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 27 Apr 2020 10:45:30 +0200
Subject: [PATCH 2/3] Disable JUnit 4.8 test grouping
Subject: [PATCH 2/4] Disable JUnit 4.8 test grouping
---
.../surefire/junitcore/JUnitCoreProvider.java | 25 +++--------------
@ -9,27 +9,27 @@ Subject: [PATCH 2/3] Disable JUnit 4.8 test grouping
2 files changed, 3 insertions(+), 49 deletions(-)
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
index 7c74e8b..c86bb27 100644
index 7ed483426..1ffd826db 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
@@ -25,7 +25,6 @@ import org.apache.maven.surefire.booter.CommandReader;
@@ -40,7 +40,6 @@
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener;
import org.apache.maven.surefire.common.junit4.Notifier;
-import org.apache.maven.surefire.common.junit48.FilterFactory;
import org.apache.maven.surefire.common.junit48.JUnit48Reflector;
import org.apache.maven.surefire.common.junit48.JUnit48TestChecker;
import org.apache.maven.surefire.providerapi.AbstractProvider;
@@ -47,6 +46,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import static org.apache.maven.surefire.booter.CommandReader.getReader;
import org.junit.runner.Description;
@@ -51,6 +50,7 @@
import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE;
import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter;
import static org.apache.maven.surefire.api.util.TestsToRun.fromClass;
+import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter;
import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions;
import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners;
import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier;
@@ -126,7 +126,7 @@ public class JUnitCoreProvider
new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() );
@@ -126,7 +126,7 @@ public RunResult invoke( Object forkTestSet )
Notifier notifier = new Notifier( listener, getSkipAfterFailureCount() );
// startCapture() called in createRunListener() in prior to setTestsToRun()
- Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
@ -37,7 +37,7 @@ index 7c74e8b..c86bb27 100644
if ( testsToRun == null )
{
@@ -168,8 +168,7 @@ public class JUnitCoreProvider
@@ -169,8 +169,7 @@ public RunResult invoke( Object forkTestSet )
{
Set<Description> failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() );
testFailureListener.reset();
@ -47,7 +47,7 @@ index 7c74e8b..c86bb27 100644
rerunCore.execute( testsToRun, failureDescriptionFilter );
}
}
@@ -270,24 +269,6 @@ public class JUnitCoreProvider
@@ -271,24 +270,6 @@ private boolean isParallelTypes()
return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites();
}
@ -73,10 +73,10 @@ index 7c74e8b..c86bb27 100644
{
TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader );
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 6bc30a3..05c55f5 100644
index 7ed1719a8..07d3ad33c 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -237,36 +237,9 @@ final class TestNGExecutor
@@ -278,36 +278,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso
private static XmlMethodSelector createGroupMatchingSelector( Map<String, String> options )
throws TestSetFailedException
{
@ -114,5 +114,5 @@ index 6bc30a3..05c55f5 100644
static void run( List<String> suiteFiles, String testSourceDirectory,
--
2.30.2
2.35.1

70
0003-Port-to-JUnit-5.8.1.patch Normal file
View File

@ -0,0 +1,70 @@
From 56f22fd719fe464c8a080e710de847983bb65ac1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 22 Apr 2022 00:28:31 +0200
Subject: [PATCH 3/4] Port to JUnit 5.8.1
---
pom.xml | 6 +++---
.../maven/surefire/junitplatform/LazyLauncher.java | 14 ++++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c261bf3c2..a75e156ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,17 +250,17 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
- <version>1.3.2</version>
+ <version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.3.2</version>
+ <version>5.8.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>5.3.2</version>
+ <version>5.8.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
index 6a1a3b3b3..dee110e3c 100644
--- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
@@ -21,6 +21,7 @@
import org.apache.maven.surefire.api.util.ReflectionUtils;
import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
import org.junit.platform.launcher.LauncherDiscoveryRequest;
import org.junit.platform.launcher.TestExecutionListener;
import org.junit.platform.launcher.TestPlan;
@@ -55,6 +56,19 @@ public void execute( LauncherDiscoveryRequest launcherDiscoveryRequest,
launcher().execute( launcherDiscoveryRequest, testExecutionListeners );
}
+ @Override
+ public void execute( TestPlan testPlan,
+ TestExecutionListener... testExecutionListeners )
+ {
+ launcher().execute( testPlan, testExecutionListeners );
+ }
+
+ @Override
+ public void registerLauncherDiscoveryListeners( LauncherDiscoveryListener... launcherDiscoveryListeners )
+ {
+ launcher().registerLauncherDiscoveryListeners( launcherDiscoveryListeners );
+ }
+
private Launcher launcher()
{
if ( launcher == null )
--
2.35.1

152
0003-Port-to-maven-shared-utils-3.3.3.patch
View File

@ -1,152 +0,0 @@
From bc4f6405bb6ca0a5c0313edf878c51d5d5af9ffa Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 11 Sep 2020 12:17:15 +0200
Subject: [PATCH 3/3] Port to maven-shared-utils 3.3.3
---
.../DefaultForkConfiguration.java | 26 ++++++++++++-------
.../surefire/report/StatelessXmlReporter.java | 20 +++++++-------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
index 4ab4435..1ce348b 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
@@ -42,6 +42,8 @@ import static org.apache.maven.plugin.surefire.util.Relocator.relocate;
import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders;
import static org.apache.maven.surefire.booter.Classpath.join;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+
/**
* Basic framework which constructs CLI.
*
@@ -135,17 +137,21 @@ public abstract class DefaultForkConfiguration
cli.setExecutable( getJdkForTests().getJvmExecutable() );
- String jvmArgLine = newJvmArgLine( forkNumber );
- if ( !jvmArgLine.isEmpty() )
- {
- cli.createArg()
- .setLine( jvmArgLine );
- }
+ try {
+ String jvmArgLine = newJvmArgLine( forkNumber );
+ if ( !jvmArgLine.isEmpty() )
+ {
+ cli.createArg()
+ .setLine( jvmArgLine );
+ }
- if ( getDebugLine() != null && !getDebugLine().isEmpty() )
- {
- cli.createArg()
- .setLine( getDebugLine() );
+ if ( getDebugLine() != null && !getDebugLine().isEmpty() )
+ {
+ cli.createArg()
+ .setLine( getDebugLine() );
+ }
+ } catch (CommandLineException ex) {
+ throw new SurefireBooterForkException("", ex);
}
resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory );
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index fcb066e..bfe894e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -200,7 +200,7 @@ public class StatelessXmlReporter
}
private void serializeTestClass( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
- List<WrappedReportEntry> methodEntries )
+ List<WrappedReportEntry> methodEntries ) throws IOException
{
if ( rerunFailingTestsCount > 0 )
{
@@ -215,7 +215,7 @@ public class StatelessXmlReporter
}
private void serializeTestClassWithoutRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
- List<WrappedReportEntry> methodEntries )
+ List<WrappedReportEntry> methodEntries ) throws IOException
{
for ( WrappedReportEntry methodEntry : methodEntries )
{
@@ -231,7 +231,7 @@ public class StatelessXmlReporter
}
private void serializeTestClassWithRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
- List<WrappedReportEntry> methodEntries )
+ List<WrappedReportEntry> methodEntries ) throws IOException
{
WrappedReportEntry firstMethodEntry = methodEntries.get( 0 );
switch ( getTestResultType( methodEntries ) )
@@ -369,7 +369,7 @@ public class StatelessXmlReporter
return new File( reportsDirectory, stripIllegalFilenameChars( customizedReportName + ".xml" ) );
}
- private void startTestElement( XMLWriter ppw, WrappedReportEntry report )
+ private void startTestElement( XMLWriter ppw, WrappedReportEntry report ) throws IOException
{
ppw.startElement( "testcase" );
String name = phrasedMethodName ? report.getReportName() : report.getName();
@@ -390,7 +390,7 @@ public class StatelessXmlReporter
ppw.addAttribute( "time", report.elapsedTimeAsString() );
}
- private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats )
+ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats ) throws IOException
{
ppw.startElement( "testsuite" );
@@ -420,7 +420,7 @@ public class StatelessXmlReporter
private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
WrappedReportEntry report, boolean trimStackTrace, OutputStream fw,
- String testErrorType, boolean createOutErrElementsInside )
+ String testErrorType, boolean createOutErrElementsInside ) throws IOException
{
ppw.startElement( testErrorType );
@@ -477,7 +477,7 @@ public class StatelessXmlReporter
// Create system-out and system-err elements
private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
- WrappedReportEntry report, OutputStream fw )
+ WrappedReportEntry report, OutputStream fw ) throws IOException
{
EncodingOutputStream eos = new EncodingOutputStream( fw );
addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" );
@@ -487,7 +487,7 @@ public class StatelessXmlReporter
private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
EncodingOutputStream eos, XMLWriter xmlWriter,
Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
- String name )
+ String name ) throws IOException
{
if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
{
@@ -517,7 +517,7 @@ public class StatelessXmlReporter
*
* @param xmlWriter The test suite to report to
*/
- private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties )
+ private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties ) throws IOException
{
xmlWriter.startElement( "properties" );
for ( final Entry<String, String> entry : systemProperties.entrySet() )
@@ -559,7 +559,7 @@ public class StatelessXmlReporter
* @param message The string
*/
private static void extraEscapeElementValue( String message, OutputStreamWriter outputStreamWriter,
- XMLWriter xmlWriter, OutputStream fw )
+ XMLWriter xmlWriter, OutputStream fw ) throws IOException
{
// Someday convert to xml 1.1 which handles everything but 0 inside string
if ( containsEscapesIllegalXml10( message ) )
--
2.30.2

74
0004-Workaround-MPLUGIN-372.patch Normal file
View File

@ -0,0 +1,74 @@
From 16147360170863d136de01024e906e04b0ce1841 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 22 Apr 2022 02:01:32 +0200
Subject: [PATCH 4/4] Workaround MPLUGIN-372
Fix dependency scopes to work around
https://issues.apache.org/jira/browse/MPLUGIN-372
---
maven-failsafe-plugin/pom.xml | 4 ++--
maven-surefire-plugin/pom.xml | 9 +++++++--
maven-surefire-report-plugin/pom.xml | 4 ++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index e14a1f7b5..dac845de6 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -62,12 +62,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index e9e4bea34..61af78fe9 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -52,8 +52,13 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <scope>provided</scope>
- </dependency>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index d99c3a9c9..78abd3aaf 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -55,12 +55,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
--
2.35.1

29
maven-surefire.spec
View File

@ -1,8 +1,8 @@
%bcond_with bootstrap
Name: maven-surefire
Version: 3.0.0~M4
Release: 6%{?dist}
Version: 3.0.0~M6
Release: 1%{?dist}
Summary: Test framework project
License: ASL 2.0 and CPL
URL: https://maven.apache.org/surefire/
@ -16,9 +16,12 @@ Source0: %{name}-%{version}.tar.gz
Source1: generate-tarball.sh
Source2: https://junit.sourceforge.net/cpl-v10.html
Patch1: 0001-Port-to-TestNG-6.11.patch
Patch1: 0001-Port-to-TestNG-7.4.0.patch
Patch2: 0002-Disable-JUnit-4.8-test-grouping.patch
Patch3: 0003-Port-to-maven-shared-utils-3.3.3.patch
Patch3: 0003-Port-to-JUnit-5.8.1.patch
# Workaround for https://issues.apache.org/jira/browse/MPLUGIN-372
# Remove once maven-plugin-tools is updated to >3.6.4
Patch4: 0004-Workaround-MPLUGIN-372.patch
BuildRequires: maven-local
%if %{with bootstrap}
@ -27,19 +30,17 @@ BuildRequires: javapackages-bootstrap
BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.commons:commons-compress)
BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-java)
BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.junit.platform:junit-platform-launcher)
@ -114,6 +115,7 @@ cp -p %{SOURCE2} .
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# Disable strict doclint
sed -i /-Xdoclint:all/d pom.xml
@ -122,8 +124,6 @@ sed -i /-Xdoclint:all/d pom.xml
%pom_disable_module surefire-report-parser
%pom_disable_module surefire-shadefire
%pom_remove_dep :maven-toolchain maven-surefire-common
%pom_disable_module surefire-grouper
%pom_remove_dep :surefire-grouper surefire-providers/common-junit48
%pom_remove_dep :surefire-grouper surefire-providers/surefire-testng-utils
@ -140,11 +140,13 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref
%pom_remove_plugin -r :jacoco-maven-plugin
# Not wanted
%pom_remove_plugin -r :maven-shade-plugin
find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
# Not in Fedora
%pom_remove_plugin -r :animal-sniffer-maven-plugin
# Complains
%pom_remove_plugin -r :apache-rat-plugin
%pom_remove_plugin -r :maven-enforcer-plugin
# We don't need site-source
%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
%pom_remove_dep -r ::::site-source
@ -155,7 +157,7 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref
%mvn_package ":*{junit,testng,failsafe-plugin}*" @1
%mvn_package ":*tests*" __noinstall
# tests turned off because they need jmock
%mvn_build -f -- -DcommonsIoVersion=2.8.0 -DcommonsLang3Version=3.11
%mvn_build -f
%install
%mvn_install
@ -174,6 +176,9 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref
%license LICENSE NOTICE cpl-v10.html
%changelog
* Thu Apr 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-1
- Update to upstream 3.0.0-M6 milestone snapshot
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.0~M4-6
- Rebuilt for java-17-openjdk as system jdk

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (maven-surefire-3.0.0~M4.tar.gz) = 68ec305ff9bc56ef99af45098705d507ddc0944067fbb1411fceeb7bec8af2399f28ffb6fa722aba0ad65ec7089c76d6093e31eacb61c19c8975b37b06a56406
SHA512 (maven-surefire-3.0.0~M6.tar.gz) = 1258e113645e5e42a956ccad99f5ae44b362e8abc8dc5f17112b0fbae353a5e14b5b6fca4b6dab71d3d910a8b57d934dfcbfcdfb03304947f6043c0694aab231
SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9