Compare commits

...

No commits in common. "c8-stream-201902" and "c9-beta" have entirely different histories.

8 changed files with 361 additions and 105 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/maven-surefire-3.0.0-M3.tar.gz SOURCES/maven-surefire-3.0.0~M4.tar.gz

View File

@ -1 +1 @@
aa431c17c3667c58c9895ae845aa566f6336c7ba SOURCES/maven-surefire-3.0.0-M3.tar.gz a9e95fafb958c17118687d8d6b088325abb6dc25 SOURCES/maven-surefire-3.0.0~M4.tar.gz

View File

@ -1,7 +1,7 @@
From 69c97f47a7bbec601b407cd2cd81aee64507e562 Mon Sep 17 00:00:00 2001 From 85887dc85709e8719db0becc17adacd905dcd579 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jul 2017 10:37:50 +0200 Date: Mon, 10 Jul 2017 10:37:50 +0200
Subject: [PATCH 1/2] Port to TestNG 6.11 Subject: [PATCH 1/3] Port to TestNG 6.11
--- ---
surefire-providers/surefire-testng/pom.xml | 3 +-- surefire-providers/surefire-testng/pom.xml | 3 +--
@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Port to TestNG 6.11
2 files changed, 2 insertions(+), 3 deletions(-) 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index 49e75b6e..a9db4a8d 100644 index 1ce2888..bf93114 100644
--- a/surefire-providers/surefire-testng/pom.xml --- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml
@@ -51,8 +51,7 @@ @@ -51,8 +51,7 @@
@ -23,10 +23,10 @@ index 49e75b6e..a9db4a8d 100644
</dependency> </dependency>
</dependencies> </dependencies>
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 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 e9667316..7021ef56 100644 index e966731..7021ef5 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java --- 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 +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
@@ -63,7 +63,7 @@ public void configure( TestNG testng, Map<String, String> options ) @@ -63,7 +63,7 @@ public abstract class AbstractDirectConfigurator
testng.setUseDefaultListeners( false ); testng.setUseDefaultListeners( false );
configureInstance( testng, options ); configureInstance( testng, options );
// TODO: we should have the Profile so that we can decide if this is needed or not // TODO: we should have the Profile so that we can decide if this is needed or not
@ -36,5 +36,5 @@ index e9667316..7021ef56 100644
@Override @Override
-- --
2.20.1 2.30.2

View File

@ -0,0 +1,118 @@
From 61a123e7dd146933570a252f147fa83666363de3 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
---
.../surefire/junitcore/JUnitCoreProvider.java | 25 +++--------------
.../maven/surefire/testng/TestNGExecutor.java | 27 -------------------
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
--- 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;
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 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() );
// startCapture() called in createRunListener() in prior to setTestsToRun()
- Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
+ Filter filter = null;
if ( testsToRun == null )
{
@@ -168,8 +168,7 @@ public class JUnitCoreProvider
{
Set<Description> failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() );
testFailureListener.reset();
- FilterFactory filterFactory = new FilterFactory( testClassLoader );
- Filter failureDescriptionFilter = filterFactory.createMatchAnyDescriptionFilter( failures );
+ Filter failureDescriptionFilter = createMatchAnyDescriptionFilter( failures );
rerunCore.execute( testsToRun, failureDescriptionFilter );
}
}
@@ -270,24 +269,6 @@ public class JUnitCoreProvider
return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites();
}
- private Filter createJUnit48Filter()
- {
- final FilterFactory factory = new FilterFactory( testClassLoader );
- Map<String, String> props = providerParameters.getProviderProperties();
- Filter groupFilter = factory.canCreateGroupFilter( props ) ? factory.createGroupFilter( props ) : null;
- TestListResolver methodFilter = optionallyWildcardFilter( testResolver );
- boolean onlyGroups = methodFilter.isEmpty() || methodFilter.isWildcard();
- if ( onlyGroups )
- {
- return groupFilter;
- }
- else
- {
- Filter jUnitMethodFilter = factory.createMethodFilter( methodFilter );
- return groupFilter == null ? jUnitMethodFilter : factory.and( groupFilter, jUnitMethodFilter );
- }
- }
-
private TestsToRun scanClassPath()
{
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
--- 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
private static XmlMethodSelector createGroupMatchingSelector( Map<String, String> options )
throws TestSetFailedException
{
- final String groups = options.get( ProviderParameterNames.TESTNG_GROUPS_PROP );
- final String excludedGroups = options.get( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP );
-
- if ( groups == null && excludedGroups == null )
{
return null;
}
-
- // the class is available in the testClassPath
- final String clazzName = "org.apache.maven.surefire.testng.utils.GroupMatcherMethodSelector";
- try
- {
- Class<?> clazz = Class.forName( clazzName );
-
- // HORRIBLE hack, but TNG doesn't allow us to setup a method selector instance directly.
- Method method = clazz.getMethod( "setGroups", String.class, String.class );
- method.invoke( null, groups, excludedGroups );
- }
- catch ( Exception e )
- {
- throw new TestSetFailedException( e.getMessage(), e );
- }
-
- XmlMethodSelector xms = new XmlMethodSelector();
-
- xms.setName( clazzName );
- // looks to need a high value
- xms.setPriority( 9999 );
-
- return xms;
}
static void run( List<String> suiteFiles, String testSourceDirectory,
--
2.30.2

View File

@ -1,70 +0,0 @@
From a96b8f5dd6d7fc51d9056c93bd08635e06957ea5 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 16 Mar 2018 13:45:01 +0100
Subject: [PATCH 2/2] Port to current maven-shared-utils
---
.../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 b89c4e9b..8cf0b60c 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
@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St
}
private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix,
- String timeAsString )
+ String timeAsString ) throws IOException
{
ppw.startElement( "testcase" );
ppw.addAttribute( "name", report.getReportName() );
@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report,
}
private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
- String timeAsString )
+ String timeAsString ) throws IOException
{
ppw.startElement( "testsuite" );
@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T
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 );
@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW
// 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" );
@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter,
private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
EncodingOutputStream eos, XMLWriter xmlWriter,
Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
- String name )
+ String name ) throws IOException
{
if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
{
@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite
*
* @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() )
--
2.20.1

View File

@ -0,0 +1,152 @@
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

View File

@ -2,14 +2,11 @@
set -e set -e
name=maven-surefire name=maven-surefire
if [[ -n "$1" ]]; then version="$(sed -n 's/Version:\s*//p' *.spec)"
version="$1" upstream_version="${version/'~'/'-'}"
else
version="$(sed -n 's/Version:\s*//p' *.spec)"
fi
# RETRIEVE # RETRIEVE
wget "http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/${version}/surefire-${version}-source-release.zip" -O "${name}-${version}.orig.zip" wget "https://repo1.maven.org/maven2/org/apache/maven/surefire/surefire/${upstream_version}/surefire-${upstream_version}-source-release.zip" -O "${name}-${version}.orig.zip"
rm -rf tarball-tmp rm -rf tarball-tmp
mkdir tarball-tmp mkdir tarball-tmp

View File

@ -1,21 +1,29 @@
%bcond_with bootstrap
Name: maven-surefire Name: maven-surefire
Version: 3.0.0~M3 Version: 3.0.0~M4
Release: 4%{?dist} Release: 5%{?dist}
Summary: Test framework project Summary: Test framework project
License: ASL 2.0 and CPL License: ASL 2.0 and CPL
URL: http://maven.apache.org/surefire/ URL: https://maven.apache.org/surefire/
BuildArch: noarch BuildArch: noarch
# ./generate-tarball.sh 3.0.0-M3 %global upstream_version %(echo '%{version}' | tr '~' '-')
Source0: %{name}-3.0.0-M3.tar.gz
# ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz
# Remove bundled binaries which cannot be easily verified for licensing # Remove bundled binaries which cannot be easily verified for licensing
Source1: generate-tarball.sh Source1: generate-tarball.sh
Source2: http://junit.sourceforge.net/cpl-v10.html Source2: https://junit.sourceforge.net/cpl-v10.html
Patch1: 0001-Port-to-TestNG-6.11.patch Patch1: 0001-Port-to-TestNG-6.11.patch
Patch2: 0002-Port-to-current-maven-shared-utils.patch Patch2: 0002-Disable-JUnit-4.8-test-grouping.patch
Patch3: 0003-Port-to-maven-shared-utils-3.3.3.patch
BuildRequires: maven-local BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
@ -25,7 +33,6 @@ 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-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-artifact)
@ -33,13 +40,12 @@ BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-toolchain)
BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildRequires: mvn(org.codehaus.plexus:plexus-java)
BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.junit.platform:junit-platform-launcher) BuildRequires: mvn(org.junit.platform:junit-platform-launcher)
BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng)
BuildRequires: mvn(org.testng:testng::jdk15:) BuildRequires: mvn(org.testng:testng::jdk15:)
%endif
# PpidChecker relies on /usr/bin/ps to check process uptime # PpidChecker relies on /usr/bin/ps to check process uptime
@ -49,7 +55,7 @@ Requires: procps-ng
Surefire is a test framework project. Surefire is a test framework project.
%package plugin %package plugin
Summary: Surefire plugin for maven Summary: Surefire plugin for maven
Requires: (%{name}-provider-junit = %{version}-%{release} if junit) Requires: (%{name}-provider-junit = %{version}-%{release} if junit)
Requires: (%{name}-provider-junit5 = %{version}-%{release} if junit5) Requires: (%{name}-provider-junit5 = %{version}-%{release} if junit5)
Requires: (%{name}-provider-testng = %{version}-%{release} if testng) Requires: (%{name}-provider-testng = %{version}-%{release} if testng)
@ -58,25 +64,25 @@ Requires: (%{name}-provider-testng = %{version}-%{release} if testng)
Maven surefire plugin for running tests via the surefire framework. Maven surefire plugin for running tests via the surefire framework.
%package provider-junit %package provider-junit
Summary: JUnit provider for Maven Surefire Summary: JUnit provider for Maven Surefire
%description provider-junit %description provider-junit
JUnit provider for Maven Surefire. JUnit provider for Maven Surefire.
%package provider-junit5 %package provider-junit5
Summary: JUnit 5 provider for Maven Surefire Summary: JUnit 5 provider for Maven Surefire
%description provider-junit5 %description provider-junit5
JUnit 5 provider for Maven Surefire. JUnit 5 provider for Maven Surefire.
%package provider-testng %package provider-testng
Summary: TestNG provider for Maven Surefire Summary: TestNG provider for Maven Surefire
%description provider-testng %description provider-testng
TestNG provider for Maven Surefire. TestNG provider for Maven Surefire.
%package -n maven-failsafe-plugin %package -n maven-failsafe-plugin
Summary: Maven plugin for running integration tests Summary: Maven plugin for running integration tests
%description -n maven-failsafe-plugin %description -n maven-failsafe-plugin
The Failsafe Plugin is designed to run integration tests while the The Failsafe Plugin is designed to run integration tests while the
@ -96,17 +102,18 @@ integration-test phase thus enabling the post-integration-test phase
to execute. to execute.
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
%description javadoc %description javadoc
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n surefire-3.0.0-M3 %setup -q -n surefire-%{upstream_version}
cp -p %{SOURCE2} . cp -p %{SOURCE2} .
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# Disable strict doclint # Disable strict doclint
sed -i /-Xdoclint:all/d pom.xml sed -i /-Xdoclint:all/d pom.xml
@ -115,6 +122,14 @@ sed -i /-Xdoclint:all/d pom.xml
%pom_disable_module surefire-report-parser %pom_disable_module surefire-report-parser
%pom_disable_module surefire-shadefire %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
rm surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/{FilterFactory,GroupMatcherCategoryFilter}.java
rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
%pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
# Help plugin is needed only to evaluate effective Maven settings. # Help plugin is needed only to evaluate effective Maven settings.
@ -123,7 +138,8 @@ sed -i /-Xdoclint:all/d pom.xml
# QA plugin useful only for upstream # QA plugin useful only for upstream
%pom_remove_plugin -r :jacoco-maven-plugin %pom_remove_plugin -r :jacoco-maven-plugin
# Not wanted
%pom_remove_plugin -r :maven-shade-plugin
# Not in Fedora # Not in Fedora
%pom_remove_plugin -r :animal-sniffer-maven-plugin %pom_remove_plugin -r :animal-sniffer-maven-plugin
# Complains # Complains
@ -133,19 +149,17 @@ sed -i /-Xdoclint:all/d pom.xml
%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
%pom_remove_dep -r ::::site-source %pom_remove_dep -r ::::site-source
%build %build
%mvn_package ":*{surefire-plugin}*" @1 %mvn_package ":*{surefire-plugin}*" @1
%mvn_package ":*junit-platform*" junit5 %mvn_package ":*junit-platform*" junit5
%mvn_package ":*{junit,testng,failsafe-plugin}*" @1 %mvn_package ":*{junit,testng,failsafe-plugin}*" @1
%mvn_package ":*tests*" __noinstall %mvn_package ":*tests*" __noinstall
# tests turned off because they need jmock # tests turned off because they need jmock
%mvn_build -f %mvn_build -f -- -DcommonsIoVersion=2.8.0 -DcommonsLang3Version=3.11
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%doc README.md %doc README.md
%license LICENSE NOTICE cpl-v10.html %license LICENSE NOTICE cpl-v10.html
@ -160,12 +174,54 @@ sed -i /-Xdoclint:all/d pom.xml
%license LICENSE NOTICE cpl-v10.html %license LICENSE NOTICE cpl-v10.html
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.0~M4-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-4
- Rebuild to workaround DistroBaker issue
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-3
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-2
- Bootstrap build
- Non-bootstrap build
* Fri May 14 2021 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M4-1
- Update to upstream version 3.0.0~M4
* Fri Feb 05 2021 Fabio Valentini <decathorpe@gmail.com> - 0:3.0.0~M4-1
- Update to version 3.0.0-M4.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.22.0-10
- Add boolean dependencies between plugin and provider subpackages
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.22.0-8
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Mar 25 2020 Severin Gehwolf <sgehwolf@redhat.com> - 0:2.22.0-7
- Add maven-compat dependency in maven-surefire-common for ArtifactResolver
class.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-4 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-4
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902
* Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-3 * Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-3
- Enable JUnit 5 provider - Enable JUnit 5 provider
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-2 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-2
- Mass rebuild for javapackages-tools 201901 - Mass rebuild for javapackages-tools 201901
@ -175,6 +231,9 @@ sed -i /-Xdoclint:all/d pom.xml
* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-0.1.M3 * Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-0.1.M3
- Update to upstream 3.0.0-M3 milestone snapshot - Update to upstream 3.0.0-M3 milestone snapshot
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.22.0-3 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.22.0-3
- Repack the tarball without binaries - Repack the tarball without binaries