75 lines
2.7 KiB
Diff
75 lines
2.7 KiB
Diff
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
|
|
|