Merge branch 'maven' into stream-javapackages-bootstrap-202501-rhel-9.6.0

2025-01-15 12:53:40 -06:00 · 2025-01-15 12:53:40 -06:00 · 1779052026
commit 1779052026
parent 7e1671262e 5d260eaa71
16 changed files with 880 additions and 0 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,35 @@
+/results_*
+/*.src.rpm
+
+/maven-surefire-1.5.3.tar.gz
+/maven-surefire-booter-1.5.3.tar.gz
+/maven-surefire-2.3-src.tar.gz
+/maven-surefire-2.6-src.tar.xz
+/surefire-2.7.1-source-release.zip
+/surefire-2.7.2-source-release.zip
+/surefire-2.8-source-release.zip
+/surefire-2.8.1-source-release.zip
+/surefire-2.9-source-release.zip
+/surefire-2.10-source-release.zip
+/surefire-2.12-source-release.zip
+/surefire-2.12.1-source-release.zip
+/surefire-2.13-source-release.zip
+/cpl-v10.html
+/surefire-2.14-source-release.zip
+/surefire-2.14.1-source-release.zip
+/surefire-2.15-source-release.zip
+/surefire-2.16-source-release.zip
+/surefire-2.17-source-release.zip
+/surefire-2.18.1-source-release.zip
+/surefire-2.19-source-release.zip
+/surefire-2.19.1-source-release.zip
+/surefire-2.20-source-release.zip
+/surefire-2.20.1-source-release.zip
+/surefire-2.21.0-source-release.zip
+/surefire-2.22.0-source-release.zip
+/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
+/maven-surefire-3.0.0~M6.tar.gz
+/maven-surefire-3.2.2.tar.gz
--- a/0001-Port-to-TestNG-7.4.0.patch
+++ b/0001-Port-to-TestNG-7.4.0.patch
@ -0,0 +1,54 @@
+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/4] Port to TestNG 7.4.0
+
+---
+ surefire-providers/surefire-testng/pom.xml                     | 3 +--
+ .../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-
+ .../maven/surefire/testng/conf/TestNGMapConfigurator.java      | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
+index 5cf9b2e..d23b123 100644
+--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
+@@ -54,8 +54,7 @@
+     <dependency>
+       <groupId>org.testng</groupId>
+       <artifactId>testng</artifactId>
+-      <version>5.10</version>
+-      <classifier>jdk15</classifier>
+      <version>7.4.0</version>
+       <scope>provided</scope>
+     </dependency>
+     <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 b73b9ba..ab187b6 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
+@@ -57,7 +57,7 @@ public void configure(TestNG testng, Map<String, String> options) throws TestSet
+         testng.setUseDefaultListeners(false);
+         configureInstance(testng, options);
+         // TODO: we should have the Profile so that we can decide if this is needed or not
+-        testng.setListenerClasses(loadListenerClasses(listeners));
+        testng.setListenerClasses((List)loadListenerClasses(listeners));
+     }
+ 
+     @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 d91e76a..06dbd23 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
+@@ -71,7 +71,7 @@ protected void configureThreadCount(XmlSuite suite, Map<String, String> options)
+     protected void configureParallel(XmlSuite suite, Map<String, String> options) throws TestSetFailedException {
+         String parallel = options.get(PARALLEL_PROP);
+         if (parallel != null) {
+-            suite.setParallel(parallel);
+            suite.setParallel(XmlSuite.ParallelMode.getValidParallel(parallel));
+         }
+     }
+ 
+-- 
+2.43.0
+
--- a/0002-Disable-JUnit-4.8-test-grouping.patch
+++ b/0002-Disable-JUnit-4.8-test-grouping.patch
@ -0,0 +1,111 @@
+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/4] Disable JUnit 4.8 test grouping
+
+---
+ .../surefire/junitcore/JUnitCoreProvider.java | 21 +++------------
+ .../maven/surefire/testng/TestNGExecutor.java | 27 +------------------
+ 2 files changed, 4 insertions(+), 44 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 f2f58fe..c09c51e 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
+@@ -39,7 +39,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.junit.runner.Description;
+@@ -50,6 +49,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;
+@@ -118,7 +118,7 @@ public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
+         Notifier notifier = new Notifier(listener, getSkipAfterFailureCount());
+         // startCapture() called in createRunListener() in prior to setTestsToRun()
+ 
+-        Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
+        Filter filter = null;
+ 
+         if (testsToRun == null) {
+             setTestsToRun(forkTestSet);
+@@ -158,8 +158,7 @@ public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
+                         i++) {
+                     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);
+                 }
+             }
+@@ -236,20 +235,6 @@ private boolean isParallelTypes() {
+         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);
+         return runOrderCalculator.orderTestClasses(scanned);
+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 020212f..299b6bf 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
+@@ -258,32 +258,7 @@ private static XmlMethodSelector createMethodNameFilteringSelector(TestListResol
+     @SuppressWarnings("checkstyle:magicnumber")
+     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;
+        return null;
+     }
+ 
+     static void run(
+-- 
+2.43.0
+
--- a/ci.fmf
+++ b/ci.fmf
@ -0,0 +1 @@
+resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_contexts:
+  - osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+name=maven-surefire
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+upstream_version="${version/'~'/'-'}"
+
+# RETRIEVE
+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
+cd tarball-tmp
+unzip "../${name}-${version}.orig.zip"
+
+# CLEAN TARBALL
+find -name '*.jar' -delete
+find -name '*.class' -delete
+
+tar czf "../${name}-${version}.tar.gz" *
+cd ..
+rm -r tarball-tmp "${name}-${version}.orig.zip"
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@ -0,0 +1,586 @@
+%bcond_with bootstrap
+%global upstream_version %(echo '%{version}' | tr '~' '-')
+
+Name:           maven-surefire
+Version:        3.2.2
+Release:        16%{?dist}
+Summary:        Test framework project
+License:        Apache-2.0 AND CPL-1.0
+URL:            https://maven.apache.org/surefire/
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
+
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
+# Remove bundled binaries which cannot be easily verified for licensing
+Source1:        generate-tarball.sh
+Source2:        https://junit.sourceforge.net/cpl-v10.html
+
+Patch:          0001-Port-to-TestNG-7.4.0.patch
+Patch:          0002-Disable-JUnit-4.8-test-grouping.patch
+
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  maven-local
+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-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin) >= 3.6.4
+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-core)
+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.eclipse.aether:aether-util)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
+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:)
+%endif
+# PpidChecker relies on /usr/bin/ps to check process uptime
+Requires:       procps-ng
+
+%description
+Surefire is a test framework project.
+
+%package plugin
+Summary:        Surefire plugin for maven
+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 provider-junit
+Summary:        JUnit provider for Maven Surefire
+
+%description provider-junit
+JUnit provider for Maven Surefire.
+
+%package provider-junit5
+Summary:        JUnit 5 provider for Maven Surefire
+
+%description provider-junit5
+JUnit 5 provider for Maven Surefire.
+
+%package provider-testng
+Summary:        TestNG provider for Maven Surefire
+
+%description provider-testng
+TestNG provider for Maven Surefire.
+
+%package -n maven-failsafe-plugin
+Summary:        Maven plugin for running integration tests
+
+%description -n maven-failsafe-plugin
+The Failsafe Plugin is designed to run integration tests while the
+Surefire Plugins is designed to run unit. The name (failsafe) was
+chosen both because it is a synonym of surefire and because it implies
+that when it fails, it does so in a safe way.
+
+If you use the Surefire Plugin for running tests, then when you have a
+test failure, the build will stop at the integration-test phase and
+your integration test environment will not have been torn down
+correctly.
+
+The Failsafe Plugin is used during the integration-test and verify
+phases of the build lifecycle to execute the integration tests of an
+application. The Failsafe Plugin will not fail the build during the
+integration-test phase thus enabling the post-integration-test phase
+to execute.
+
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
+%prep
+%autosetup -p1 -n surefire-%{upstream_version}
+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
+
+%pom_disable_module surefire-grouper
+%pom_remove_dep org.junit:junit-bom
+%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
+
+# Help plugin is needed only to evaluate effective Maven settings.
+# For building RPM package default settings will suffice.
+%pom_remove_plugin :maven-help-plugin surefire-its
+
+# QA plugin useful only for upstream
+%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
+# We don't need site-source
+%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
+%pom_remove_dep -r ::::site-source
+
+%build
+%mvn_package ":*{surefire-plugin}*" @1
+%mvn_package ":*junit-platform*" junit5
+%mvn_package ":*{junit,testng,failsafe-plugin}*"  @1
+%mvn_package ":*tests*" __noinstall
+# tests turned off because they need jmock
+%mvn_build -f
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc README.md
+%license LICENSE NOTICE cpl-v10.html
+
+%files plugin -f .mfiles-surefire-plugin
+
+%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
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE cpl-v10.html
+
+%changelog
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-14
+- Update javapackages test plan to f42
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 3.2.2-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 3.2.2-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 13 2023 Marian Koncek <mkoncek@redhat.com> - 3.2.2-1
+- Update to upstream version 3.2.2
+
+* Sat Sep 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-7
+- Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-6
+- Convert License tag to SPDX format
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Apr 28 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-2
+- Remove workaround for maven-plugin-tools issue
+
+* 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
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 09 2021 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M4-4
+- Port to TestNG 7.4.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-3
+- 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
+- Mass rebuild for javapackages-tools 201901
+
+* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-1
+- Switch to tilde versioning
+
+* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-0.1.M3
+- 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
+- Repack the tarball without binaries
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0:2.22.0-1
+- Update to upstream version 2.22.0
+
+* Fri Mar 16 2018 Michael Simacek <msimacek@redhat.com> - 0:2.21.0-1
+- Update to upstream version 2.21.0
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.20.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.20.1-3
+- Remove temporary build-requires
+
+* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.20.1-2
+- Add missing requires on procps-ng
+
+* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.20.1-1
+- Update to upstream version 2.20.1
+
+* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.20-1
+- Update to upstream version 2.20
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.19.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 10 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19.1-7
+- Port to TestNG 6.11
+- Resolves: rhbz#1469005
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.19.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jul 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19.1-5
+- Don't use Maven 2 toolchain
+
+* Thu Jun 30 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19.1-4
+- Compile against Maven 3 APIs
+
+* Thu May 05 2016 Michael Simacek <msimacek@redhat.com> - 0:2.19.1-3
+- Fix FTBFS after doxia 1.7 update
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan  4 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19.1-1
+- Update to upstream version 2.19.1
+
+* Mon Oct 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19-1
+- Update to upstream version 2.19
+
+* Mon Jul 13 2015 Michael Simacek <msimacek@redhat.com> - 0:2.18.1-2
+- Fix FTBFS
+
+* Thu Jun 25 2015 Michael Simacek <msimacek@redhat.com> - 0:2.18.1-1
+- Update to upstream version 2.18.1
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.17-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.17-6
+- Remove legacy Obsoletes/Provides for maven2 plugin
+
+* Thu Jun 19 2014 Michal Srb <msrb@redhat.com> - 0:2.17-5
+- Fix maven-parent BR
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.17-3
+- Rebuild to regenerate file lists
+
+* Thu May 22 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.17-2
+- Drop junit4 virtual provide
+
+* Mon Mar 17 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.17-1
+- Update to upstream version 2.17
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.16-3
+- Use Requires: java-headless rebuild (#1067528)
+
+* Fri Feb 21 2014 Michal Srb <msrb@redhat.com> - 0:2.16-2
+- Remove dep on maven-compat
+
+* Mon Aug 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.16-1
+- Update to upstream version 2.16
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jun 18 2013 Michal Srb <msrb@redhat.com> - 0:2.15-1
+- Update to upstream version 2.15
+
+* Thu May  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.14.1-2
+- Remove unneeded BR
+- Resolves: rhbz#961467
+
+* Mon Apr 15 2013 Michal Srb <msrb@redhat.com> - 0:2.14.1-1
+- Update to upstream version 2.14.1
+
+* Fri Apr 05 2013 Michal Srb <msrb@redhat.com> - 0:2.14-3
+- Remove unnecessary dependency on mockito
+
+* Fri Mar 15 2013 Michal Srb <msrb@redhat.com> - 0:2.14-2
+- Remove unneeded dependencies
+
+* Fri Mar 15 2013 Michal Srb <msrb@redhat.com> - 0:2.14-1
+- Update to upstream version 2.14
+
+* Thu Mar  7 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.13-4
+- Add missing BR: mockito
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:2.13-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Tue Jan 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.13-2
+- Get rid of custom depmap
+
+* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.13-1
+- Update to upstream version 2.13
+
+* Fri Dec 21 2012 Michal Srb <msrb@redhat.com> - 0:2.12.4-8
+- Migrated from maven-doxia to doxia subpackages (Resolves: #889149)
+
+* Fri Dec 14 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-7
+- Fix Provides: maven-surefire-provider-junit4
+
+* Fri Dec 14 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-6
+- Merge junit3 and junit4 providers
+- Disable dependency on shadefire
+
+* Mon Dec 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-5
+- Enable xmvn auto-requires
+
+* Thu Nov 29 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-4
+- Build with xmvn
+
+* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-3
+- Add CPL license
+
+* Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-2
+- Add maven depmap for org.beanshell:bsh
+
+* Fri Oct  5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-1
+- Update to upstream version 2.12.4
+
+* Tue Sep 25 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.3-1
+- Update to upstream version 2.12.3
+
+* Mon Aug 13 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.2-1
+- Update to upstream version 2.12.2
+
+* Fri Aug  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.1-1
+- Update to upstream version 2.12.1
+- Install LICENSE and NOTICE files
+- Remove RPM bug workaround
+
+* Fri Jul 27 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.12-5
+- Fix build problem and rebuild with target 1.5
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Mar 06 2012 Jaromir Capik <jcapik@redhat.com> - 0:2.12-3
+- Removing bootstrap condition for Patch1 inclusion (always needed in SRPM)
+
+* Thu Mar 01 2012 Jaromir Capik <jcapik@redhat.com> - 0:2.12-2
+- Update to 2.12
+
+* Thu Mar 01 2012 Jaromir Capik <jcapik@redhat.com> - 0:2.12-1
+- Bootstrap for 2.12
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.10-4
+- Move poms and depmaps to respective sub-packages
+- Add requires on junit provider to maven-plugin
+
+* Wed Oct  5 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.10-3
+- Fix junit4 depmap provider macro
+- Remove unused patches
+
+* Sun Oct 2 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.10-2
+- BR maven-enforcer-plugin.
+
+* Sun Oct 2 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.10-1
+- Update to latest upstream - 2.10.
+- Use new maven macro.
+
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.9-1
+- Update to latest upstream (2.9)
+- Fix up Requires for juni4 provider
+
+* Tue May 24 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.8.1-4
+- Fix up providers artifact and report plugin groupid
+
+* Tue May 24 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.8.1-3
+- Fix maven-surefire-plugin group in the depmap.
+
+* Fri May 13 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.8.1-2
+- Install testng-utils jar and pom
+
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.8.1-1
+- Update to latest upstream version (2.8.1)
+
+* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.8-1
+- Update to latest upstream version (2.8)
+
+* Mon Mar  7 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.7.2-1
+- Update to latest version (2.7.2)
+- Add common-junit* jars to distribution
+- Versionless javadocs
+- Use maven 3 to build
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 3 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.7.1-2
+- Fix junit3 depmap.
+
+* Wed Dec 29 2010 Alexander Kurtakov <akurtako@redhat.com> 0:2.7.1-1
+- Update to 2.7.1.
+
+* Wed Dec  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.6-3
+- Add proper Requires on junit/junit4/testng to providers
+
+* Fri Oct 29 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.6-2
+- Add main pom.xml
+
+* Mon Aug 30 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.6-1
+- Rename subpackages to not repeat "maven" twice
+- Update to latest upstream version
+- Add common jar to files
+- Introduce maven-failsafe-plugin sub-package
+- Cleanups
+
+* Mon Aug 31 2009 Andrew Overholt <overholt@redhat.com> 0:2.3-7.7
+- Bump release to rebuild
+
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.3-7.6
+- Really remove maven2-plugin-surefire BR.
+
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.3-7.5
+- Revert previous change.
+
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.3-7.4
+- Disable not needed BRs.
+
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.3-7.3
+- Install JPP.maven2.plugins-surefire-plugin.pom now that we have maven 2.0.8.
+
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.3-7.2
+- Don't install JPP.maven2.plugins-surefire-plugin.pom to fix conflict with maven2 2.0.4.
+
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.3-7.1
+- Update to 2.3 - sync with jpackage.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5.3-4.8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5.3-3.8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Aug 13 2008 Deepak Bhole <dbhole@redhat.com> 1.5.3-2.8
+- Build for ppc64
+
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.3-2.7
+- drop repotag
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.3-2jpp.6
+- fix license tag
+
+* Thu Feb 28 2008 Deepak Bhole <dbhole@redhat.com> 1.5.3-2jpp.5
+- Rebuild
+
+* Fri Sep 21 2007 Deepak Bhole <dbhole@redhat.com> 1.5.3-2jpp.4
+- Build with maven
+- ExcludeArch ppc64
+
+* Fri Aug 31 2007 Deepak Bhole <dbhole@redhat.com> 0:1.5.3-2jpp.3
+- Build without maven (for initial ppc build)
+
+* Tue Mar 20 2007 Deepak Bhole <dbhole@redhat.com> 0:1.5.3-2jpp.2
+- Build with maven
+
+* Mon Feb 26 2007 Tania Bento <tbento@redhat.com> 0:1.5.3-2jpp.1
+- Fixed %%Release.
+- Fixed %%BuildRoot.
+- Removed %%Vendor.
+- Removed %%Distribution.
+- Removed period at the end of %%Summary.
+- Removed %%post and %%postun sections for javadoc.
+- Removed %%post and %%postun sections for booter-javadoc.
+- Added gcj support option.
+- Fixed instructions on how to generate source drop.
+
+* Tue Oct 17 2006 Deepak Bhole <dbhole@redhat.com> 1.5.3-2jpp
+- Update for maven2 9jpp
+
+* Mon Jun 19 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.5.3-1jpp
+- Initial build
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: c9s
+execute:
+  how: tmt
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+  how: fmf
+execute:
+  how: tmt
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (maven-surefire-3.2.2.tar.gz) = 13db27b91d369b6d6858636192af39841d8111dbb784835a44c84056860214e9decf21c6099423716cba3b9d5acf488d7f6a37f0524195445ac8819a1c4d77ca
+SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9
--- a/tests/Regression/bz1981486-fork/main.fmf
+++ b/tests/Regression/bz1981486-fork/main.fmf
@ -0,0 +1,9 @@
+summary: rhbz#1981486 regression test for maven-surefire
+description: |
+  Regression test for https://bugzilla.redhat.com/show_bug.cgi?id=1981486.
+  Ensure that maven-surefire can execute forked JVM.
+require:
+  - maven-surefire-plugin
+  - maven-surefire-provider-junit
+  - maven-compiler-plugin
+  - xmvn-minimal
--- a/tests/Regression/bz1981486-fork/pom.xml
+++ b/tests/Regression/bz1981486-fork/pom.xml
@ -0,0 +1,16 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>test</groupId>
+  <artifactId>forktest</artifactId>
+  <version>1.0.0</version>
+  <build>
+    <plugins>
+      <plugin>
+	<artifactId>maven-surefire-plugin</artifactId>
+	<configuration>
+	  <forkCount>2</forkCount>
+	</configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
--- a/tests/Regression/bz1981486-fork/runtest.sh
+++ b/tests/Regression/bz1981486-fork/runtest.sh
@ -0,0 +1,15 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "compile and run surefire tests"
+    rlRun -s "xmvn -V -e -B -o compiler:testCompile surefire:test"
+    rlAssertGrep "Running ForkTest" $rlRun_LOG
+    rlAssertGrep "Tests run: 1, Failures: 0, Errors: 0, Skipped: 0" $rlRun_LOG
+    rlAssertGrep "BUILD SUCCESS" $rlRun_LOG
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
--- a/tests/Regression/bz1981486-fork/src/test/java/ForkTest.java
+++ b/tests/Regression/bz1981486-fork/src/test/java/ForkTest.java
@ -0,0 +1,4 @@
+public class ForkTest {
+  public void testFork() {
+  }
+}
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -0,0 +1,4 @@
+contact: Mikolaj Izdebski <mizdebsk@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 0