Remove mojo-parent dependency on junit-bom
This commit is contained in:
parent
e6f90a5533
commit
c2e09f71c8
@ -1,7 +1,7 @@
|
|||||||
From ed96595dda4b84370b88d7f784c0c69d243c3595 Mon Sep 17 00:00:00 2001
|
From ed96595dda4b84370b88d7f784c0c69d243c3595 Mon Sep 17 00:00:00 2001
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
Date: Fri, 13 May 2022 13:53:32 +0200
|
Date: Fri, 13 May 2022 13:53:32 +0200
|
||||||
Subject: [PATCH] Revert "Update maven-surefire to version 3.0.0~M6"
|
Subject: [PATCH 1/2] Revert "Update maven-surefire to version 3.0.0~M6"
|
||||||
|
|
||||||
This reverts commit 50c1e58288a8834aab84b1d370565e7b907cee1d.
|
This reverts commit 50c1e58288a8834aab84b1d370565e7b907cee1d.
|
||||||
---
|
---
|
||||||
|
49
0002-Remove-mojo-parent-dependency-on-junit-bom.patch
Normal file
49
0002-Remove-mojo-parent-dependency-on-junit-bom.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
From 60154680d275ef707d7a3a9f32721b02e38199cd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Fri, 13 May 2022 14:17:13 +0200
|
||||||
|
Subject: [PATCH 2/2] Remove mojo-parent dependency on junit-bom
|
||||||
|
|
||||||
|
---
|
||||||
|
.../0001-Remove-dependency-on-junit-bom.patch | 30 +++++++++++++++++++
|
||||||
|
1 file changed, 30 insertions(+)
|
||||||
|
create mode 100644 patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch
|
||||||
|
|
||||||
|
diff --git a/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch b/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..dab700a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch
|
||||||
|
@@ -0,0 +1,30 @@
|
||||||
|
+From 64b34bc217f861e84017b56522e8e0efbc267405 Mon Sep 17 00:00:00 2001
|
||||||
|
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
+Date: Fri, 13 May 2022 14:11:25 +0200
|
||||||
|
+Subject: [PATCH] Remove dependency on junit-bom
|
||||||
|
+
|
||||||
|
+---
|
||||||
|
+ pom.xml | 7 -------
|
||||||
|
+ 1 file changed, 7 deletions(-)
|
||||||
|
+
|
||||||
|
+diff --git a/pom.xml b/pom.xml
|
||||||
|
+index 8785f76..5b2c08b 100644
|
||||||
|
+--- a/pom.xml
|
||||||
|
++++ b/pom.xml
|
||||||
|
+@@ -275,13 +275,6 @@
|
||||||
|
+ <version>4.13.2</version>
|
||||||
|
+ <scope>test</scope>
|
||||||
|
+ </dependency>
|
||||||
|
+- <dependency>
|
||||||
|
+- <groupId>org.junit</groupId>
|
||||||
|
+- <artifactId>junit-bom</artifactId>
|
||||||
|
+- <version>${junit5.version}</version>
|
||||||
|
+- <type>pom</type>
|
||||||
|
+- <scope>import</scope>
|
||||||
|
+- </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>org.apache.maven.plugin-tools</groupId>
|
||||||
|
+ <artifactId>maven-plugin-annotations</artifactId>
|
||||||
|
+--
|
||||||
|
+2.35.1
|
||||||
|
+
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
@ -149,6 +149,7 @@ Source1108: xz-java.tar.xz
|
|||||||
|
|
||||||
Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch
|
Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch
|
||||||
Patch1: 0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch
|
Patch1: 0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch
|
||||||
|
Patch2: 0002-Remove-mojo-parent-dependency-on-junit-bom.patch
|
||||||
|
|
||||||
Provides: bundled(ant) = 1.10.12
|
Provides: bundled(ant) = 1.10.12
|
||||||
Provides: bundled(apache-parent) = 26
|
Provides: bundled(apache-parent) = 26
|
||||||
@ -299,6 +300,7 @@ done
|
|||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
for patch_path in patches/*/*
|
for patch_path in patches/*/*
|
||||||
do
|
do
|
||||||
|
Loading…
Reference in New Issue
Block a user