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

Remove workaround for maven-plugin-tools issue

Browse Source
This commit is contained in:
Mikolaj Izdebski 2022-04-28 16:18:28 +02:00
parent 32df82418d
commit c88e44ac96
2 changed files with 5 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
maven-surefire.spec
View File

@ -2,7 +2,7 @@
Name: maven-surefire
Version: 3.0.0~M6
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Test framework project
License: ASL 2.0 and CPL
URL: https://maven.apache.org/surefire/
@ -19,9 +19,6 @@ Source2: https://junit.sourceforge.net/cpl-v10.html
Patch1: 0001-Port-to-TestNG-7.4.0.patch
Patch2: 0002-Disable-JUnit-4.8-test-grouping.patch
Patch3: 0003-Port-to-JUnit-5.8.1.patch
# Workaround for https://issues.apache.org/jira/browse/MPLUGIN-372
# Remove once maven-plugin-tools is updated to >3.6.4
Patch4: 0004-Workaround-MPLUGIN-372.patch
BuildRequires: maven-local
%if %{with bootstrap}
@ -34,7 +31,7 @@ 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)
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)
@ -115,7 +112,6 @@ cp -p %{SOURCE2} .
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# Disable strict doclint
sed -i /-Xdoclint:all/d pom.xml
@ -176,6 +172,9 @@ find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.a
%license LICENSE NOTICE cpl-v10.html
%changelog
* 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