From 581a7671e5305426ec8a50dc09d28ea68c113fcf Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 18 May 2020 09:29:47 +0200
Subject: [PATCH] Fix malformed XMvn configuration

---
 ...p-execution-of-various-Maven-plugins.patch | 23 ++++++++++---------
 ...Don-t-try-to-kill-PID-1-during-tests.patch |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch
index db88d37..fb4cfae 100644
--- a/0004-Skip-execution-of-various-Maven-plugins.patch
+++ b/0004-Skip-execution-of-various-Maven-plugins.patch
@@ -1,21 +1,21 @@
-From 4e9d0cd44cc47e88f48f160e5b2fd74d944147e5 Mon Sep 17 00:00:00 2001
+From f13279da55e61045c8334b40c1fa39c466fdf24c Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Sat, 29 Jun 2019 12:09:25 +0200
 Subject: [PATCH 4/5] Skip execution of various Maven plugins
 
 Resolves: #70
 ---
- configs/configuration.xml | 56 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 56 insertions(+)
+ configs/configuration.xml | 58 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 58 insertions(+)
 
 diff --git a/configs/configuration.xml b/configs/configuration.xml
-index b6288fea..2c1a941b 100644
+index b6288fea..4431f25e 100644
 --- a/configs/configuration.xml
 +++ b/configs/configuration.xml
-@@ -4,6 +4,62 @@
-     <metadataRepositories>
-       <repository>/usr/share/maven-metadata</repository>
-     </metadataRepositories>
+@@ -1,5 +1,63 @@
+ <?xml version="1.0" encoding="US-ASCII"?>
+ <configuration xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
++  <buildSettings>
 +    <skippedPlugins>
 +      <!-- Version of Java and bytecode level is always fixed in distro -->
 +      <plugin>
@@ -72,9 +72,10 @@ index b6288fea..2c1a941b 100644
 +        <artifactId>nexus-staging-maven-plugin</artifactId>
 +      </plugin>
 +    </skippedPlugins>
-   </resolverSettings>
-   <installerSettings>
-     <metadataDir>usr/share/maven-metadata</metadataDir>
++  </buildSettings>
+   <resolverSettings>
+     <metadataRepositories>
+       <repository>/usr/share/maven-metadata</repository>
 -- 
 2.25.4
 
diff --git a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch
index 35c4e94..df4f59f 100644
--- a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch
+++ b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch
@@ -1,4 +1,4 @@
-From 16808487796822c5477d1ba0478bd2b0ca884818 Mon Sep 17 00:00:00 2001
+From e5d2b436ed9e01b357a069d1dd6b258fb0b651f3 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 18 May 2020 09:11:31 +0200
 Subject: [PATCH 5/5] [test] Don't try to kill PID 1 during tests