diff --git a/.gitignore b/.gitignore index d1fe22f..1443da2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /maven-surefire-2.22.0.tar.gz /maven-surefire-3.0.0-M3.tar.gz /maven-surefire-3.0.0-M4.tar.gz +/maven-surefire-3.0.0~M4.tar.gz diff --git a/0001-Port-to-TestNG-6.11.patch b/0001-Port-to-TestNG-6.11.patch index 0281bd5..ad3562c 100644 --- a/0001-Port-to-TestNG-6.11.patch +++ b/0001-Port-to-TestNG-6.11.patch @@ -1,7 +1,7 @@ -From 69c97f47a7bbec601b407cd2cd81aee64507e562 Mon Sep 17 00:00:00 2001 +From 14196b58bc1d96d76636914b575dc22b7cc94b1a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski 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 +-- @@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Port to TestNG 6.11 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml -index 49e75b6e..a9db4a8d 100644 +index 49e75b6ea..a9db4a8d9 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -51,8 +51,7 @@ @@ -23,7 +23,7 @@ index 49e75b6e..a9db4a8d 100644 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 e9667316b..7021ef561 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 void configure( TestNG testng, Map options ) @@ -36,5 +36,5 @@ index e9667316..7021ef56 100644 @Override -- -2.20.1 +2.25.2 diff --git a/0002-Disable-JUnit-4.8-test-grouping.patch b/0002-Disable-JUnit-4.8-test-grouping.patch new file mode 100644 index 0000000..ef03f05 --- /dev/null +++ b/0002-Disable-JUnit-4.8-test-grouping.patch @@ -0,0 +1,118 @@ +From 21890515f3eeba73065b79b6a65678ec1e2a821d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 10:45:30 +0200 +Subject: [PATCH 3/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 7c74e8b86..c86bb276c 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.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.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 RunResult invoke( Object forkTestSet ) + 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 RunResult invoke( Object forkTestSet ) + { + Set 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 @@ private boolean isParallelTypes() + return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites(); + } + +- private Filter createJUnit48Filter() +- { +- final FilterFactory factory = new FilterFactory( testClassLoader ); +- Map 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 6bc30a300..05c55f55a 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 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso + private static XmlMethodSelector createGroupMatchingSelector( Map 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 suiteFiles, String testSourceDirectory, +-- +2.25.2 + diff --git a/0002-Port-to-current-maven-shared-utils.patch b/0002-Port-to-current-maven-shared-utils.patch deleted file mode 100644 index 3ecc21d..0000000 --- a/0002-Port-to-current-maven-shared-utils.patch +++ /dev/null @@ -1,94 +0,0 @@ -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 methodEntries ) -+ List methodEntries ) throws IOException - { - if ( rerunFailingTestsCount > 0 ) - { -@@ -215,7 +215,7 @@ public class StatelessXmlReporter - } - - private void serializeTestClassWithoutRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw, -- List methodEntries ) -+ List methodEntries ) throws IOException - { - for ( WrappedReportEntry methodEntry : methodEntries ) - { -@@ -231,7 +231,7 @@ public class StatelessXmlReporter - } - - private void serializeTestClassWithRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw, -- List methodEntries ) -+ List 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 systemProperties ) -+ private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) throws IOException - { - xmlWriter.startElement( "properties" ); - for ( final Entry 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 ) ) diff --git a/0003-Fix-broken-Javadocs.patch b/0003-Fix-broken-Javadocs.patch deleted file mode 100644 index c442549..0000000 --- a/0003-Fix-broken-Javadocs.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java -index 4bc3b6d..bb17474 100644 ---- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java -+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java -@@ -65,7 +65,6 @@ public class SurefirePlugin - @Parameter( defaultValue = "${project.build.directory}/surefire-reports" ) - private File reportsDirectory; - -- @SuppressWarnings( "checkstyle:linelength" ) - /** - * Specify this parameter to run individual tests by file name, overriding the parameter {@code includes} and - * {@code excludes}. Each pattern you specify here will be used to create an include pattern formatted like -@@ -179,7 +178,6 @@ public class SurefirePlugin - @Parameter( property = "surefire.parallel.forcedTimeout" ) - private double parallelTestsTimeoutForcedInSeconds; - -- @SuppressWarnings( "checkstyle:linelength" ) - /** - * A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not - * specified and when the {@code test} parameter is not specified, the default includes will be -@@ -195,10 +193,9 @@ public class SurefirePlugin - *  <include> entries.
- * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG): - * 

--     *
--     *
- * {@literal }%regex[.*[Cat|Dog].*], Basic????, !Unstable*{@literal } - * {@literal }%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg{@literal /}**{@literal /}*Fast*.java{@literal } -+ * - *
- * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.
- *
diff --git a/0003-Port-to-maven-shared-utils-3.3.3.patch b/0003-Port-to-maven-shared-utils-3.3.3.patch new file mode 100644 index 0000000..0dac2d5 --- /dev/null +++ b/0003-Port-to-maven-shared-utils-3.3.3.patch @@ -0,0 +1,57 @@ +From 980a109bd3607f1035097d6ad923f82cc58c95d2 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 11 Sep 2020 12:17:15 +0200 +Subject: [PATCH] Port to maven-shared-utils 3.3.3 + +--- + .../DefaultForkConfiguration.java | 26 ++++++++++++------- + 1 file changed, 16 insertions(+), 10 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 fa9945123..ed75ecdff 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.SurefireHelper.replaceThreadNumberPlaceholders; + import static org.apache.maven.surefire.booter.Classpath.join; + ++import org.apache.maven.shared.utils.cli.CommandLineException; ++ + /** + * Basic framework which constructs CLI. + * +@@ -131,17 +133,21 @@ public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfi + + 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 ); +-- +2.26.2 + diff --git a/generate-tarball.sh b/generate-tarball.sh index 36e1ad6..fec8974 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -2,14 +2,11 @@ set -e name=maven-surefire -if [[ -n "$1" ]]; then - version="$1" -else - version="$(sed -n 's/Version:\s*//p' *.spec)" -fi +version="$(sed -n 's/Version:\s*//p' *.spec)" +upstream_version="${version/'~'/'-'}" # RETRIEVE -wget "https://repo1.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 mkdir tarball-tmp diff --git a/maven-surefire.spec b/maven-surefire.spec index ed392aa..ba11fe1 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,68 +1,53 @@ -%bcond_without junit5 +%bcond_with bootstrap Name: maven-surefire -Epoch: 0 Version: 3.0.0~M4 Release: 1%{?dist} Summary: Test framework project License: ASL 2.0 and CPL +URL: https://maven.apache.org/surefire/ +BuildArch: noarch %global upstream_version %(echo '%{version}' | tr '~' '-') -URL: http://maven.apache.org/surefire/ - -# ./generate-tarball.sh 3.0.0-M4 -Source0: %{name}-%{upstream_version}.tar.gz +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz # Remove bundled binaries which cannot be easily verified for licensing 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 -Patch2: 0002-Port-to-current-maven-shared-utils.patch -Patch3: 0003-Fix-broken-Javadocs.patch - -BuildArch: noarch +Patch2: 0002-Disable-JUnit-4.8-test-grouping.patch +Patch3: 0003-Port-to-maven-shared-utils-3.3.3.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) -BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.doxia:doxia-core) -BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) 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.plugins:maven-shade-plugin) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) -BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) 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-compat) +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.apache.maven:maven-toolchain) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildRequires: mvn(org.fusesource.jansi:jansi) +BuildRequires: mvn(org.junit.platform:junit-platform-launcher) BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) - -%if %{with junit5} -BuildRequires: mvn(org.junit.platform:junit-platform-launcher) %endif + # PpidChecker relies on /usr/bin/ps to check process uptime Requires: procps-ng @@ -71,34 +56,24 @@ Surefire is a test framework project. %package plugin Summary: Surefire plugin for maven -Requires: (%{name}-provider-junit = %{epoch}:%{version}-%{release} if junit) -Requires: (%{name}-provider-testng = %{epoch}:%{version}-%{release} if testng) -%if %{with junit5} -Requires: (%{name}-provider-junit5 = %{epoch}:%{version}-%{release} if junit5) -%endif +Requires: (%{name}-provider-junit = %{version}-%{release} if junit) +Requires: (%{name}-provider-junit5 = %{version}-%{release} if junit5) +Requires: (%{name}-provider-testng = %{version}-%{release} if testng) %description plugin Maven surefire plugin for running tests via the surefire framework. -%package report-plugin -Summary: Surefire reports plugin for maven - -%description report-plugin -Plugin for generating reports from surefire test runs. - %package provider-junit Summary: JUnit provider for Maven Surefire %description provider-junit JUnit provider for Maven Surefire. -%if %{with junit5} %package provider-junit5 Summary: JUnit 5 provider for Maven Surefire %description provider-junit5 JUnit 5 provider for Maven Surefire. -%endif %package provider-testng Summary: TestNG provider for Maven Surefire @@ -106,12 +81,6 @@ Summary: TestNG provider for Maven Surefire %description provider-testng TestNG provider for Maven Surefire. -%package report-parser -Summary: Parses report output files from surefire - -%description report-parser -Plugin for parsing report output files from surefire. - %package -n maven-failsafe-plugin Summary: Maven plugin for running integration tests @@ -149,11 +118,17 @@ cp -p %{SOURCE2} . # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml +%pom_disable_module maven-surefire-report-plugin +%pom_disable_module surefire-report-parser %pom_disable_module surefire-shadefire -%if %{without junit5} -%pom_disable_module surefire-junit-platform surefire-providers -%endif +%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 @@ -163,29 +138,24 @@ sed -i /-Xdoclint:all/d pom.xml # QA plugin useful only for upstream %pom_remove_plugin -r :jacoco-maven-plugin - +# Not wanted +%pom_remove_plugin -r :maven-shade-plugin # 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 -# This package needs maven compat for ArtifactResolver class -%pom_add_dep org.apache.maven:maven-compat maven-surefire-common - -%mvn_package ":*{surefire-plugin,report-plugin}*" @1 +%build +%mvn_package ":*{surefire-plugin}*" @1 %mvn_package ":*junit-platform*" junit5 -%mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*" @1 +%mvn_package ":*{junit,testng,failsafe-plugin}*" @1 %mvn_package ":*tests*" __noinstall - -%build -# tests are disabled because of unpackaged dependencies (fest-assert, etc.) -%mvn_build -f +# tests turned off because they need jmock +%mvn_build -f -- -DcommonsIoVersion=2.8.0 -DcommonsLang3Version=3.11 %install %mvn_install @@ -195,19 +165,18 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %files plugin -f .mfiles-surefire-plugin -%files report-plugin -f .mfiles-report-plugin -%files report-parser -f .mfiles-report-parser %files provider-junit -f .mfiles-junit +%files provider-junit5 -f .mfiles-junit5 %files provider-testng -f .mfiles-testng %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin -%if %{with junit5} -%files provider-junit5 -f .mfiles-junit5 -%endif %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE cpl-v10.html %changelog +* Fri May 14 2021 Marian Koncek - 3.0.0~M4-1 +- Update to upstream version 3.0.0~M4 + * Fri Feb 05 2021 Fabio Valentini - 0:3.0.0~M4-1 - Update to version 3.0.0-M4. @@ -230,9 +199,24 @@ sed -i /-Xdoclint:all/d pom.xml * Wed Jan 29 2020 Fedora Release Engineering - 0:2.22.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.0.0~M3-4 +- Mass rebuild for javapackages-tools 201902 + +* Mon Oct 28 2019 Mikolaj Izdebski - 3.0.0~M3-3 +- Enable JUnit 5 provider + * Thu Jul 25 2019 Fedora Release Engineering - 0:2.22.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 3.0.0~M3-2 +- Mass rebuild for javapackages-tools 201901 + +* Mon May 13 2019 Mikolaj Izdebski - 3.0.0~M3-1 +- Switch to tilde versioning + +* Sat Apr 13 2019 Mikolaj Izdebski - 3.0.0-0.1.M3 +- Update to upstream 3.0.0-M3 milestone snapshot + * Fri Feb 01 2019 Fedora Release Engineering - 0:2.22.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 688fc50..ad73776 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (maven-surefire-3.0.0-M4.tar.gz) = fb20bdaadc9a034bf2ce3d79fc866c5c54b2e4a13869294c02d2ee99741b5cb30d7b0040326e28e1c34fc7a51f20f693e5c7b4ab5ca0cd72dd9aa984a1df5aa7 +SHA512 (maven-surefire-3.0.0~M4.tar.gz) = 68ec305ff9bc56ef99af45098705d507ddc0944067fbb1411fceeb7bec8af2399f28ffb6fa722aba0ad65ec7089c76d6093e31eacb61c19c8975b37b06a56406 SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9