From b795577a5cfbc3a427142696b8a4ec52ea2c3066 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 27 Apr 2022 11:03:25 +0200
Subject: [PATCH 1/2] Align assembly XSD version with plugin used

As title says, XSD is ancient old 2.0.0, while all
latest assembly plugins uses 2.1.0.

Not that this matters or changes anything at all,
this is more about correctness.
---
 apache-maven/src/assembly/bin.xml | 4 ++--
 apache-maven/src/assembly/dir.xml | 4 ++--
 apache-maven/src/assembly/src.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apache-maven/src/assembly/bin.xml b/apache-maven/src/assembly/bin.xml
index 2ecbf30d4855..f6a438ea93b6 100644
--- a/apache-maven/src/assembly/bin.xml
+++ b/apache-maven/src/assembly/bin.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>bin</id>
   <formats>
     <format>zip</format>
diff --git a/apache-maven/src/assembly/dir.xml b/apache-maven/src/assembly/dir.xml
index 76adb87cf651..6a9d73fd652e 100644
--- a/apache-maven/src/assembly/dir.xml
+++ b/apache-maven/src/assembly/dir.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>dir</id>
   <formats>
     <format>dir</format>
diff --git a/apache-maven/src/assembly/src.xml b/apache-maven/src/assembly/src.xml
index 9f43a0a7984e..6a6317d3443b 100644
--- a/apache-maven/src/assembly/src.xml
+++ b/apache-maven/src/assembly/src.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>src</id>
   <formats>
     <format>zip</format>

From 4e917e220f55cf405a81b32bc5244cd36316b1c0 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 27 Apr 2022 11:48:07 +0200
Subject: [PATCH 2/2] Aligned name as well

---
 apache-maven/src/assembly/bin.xml | 2 +-
 apache-maven/src/assembly/dir.xml | 2 +-
 apache-maven/src/assembly/src.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apache-maven/src/assembly/bin.xml b/apache-maven/src/assembly/bin.xml
index f6a438ea93b6..da2c686efe8e 100644
--- a/apache-maven/src/assembly/bin.xml
+++ b/apache-maven/src/assembly/bin.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>bin</id>
   <formats>
     <format>zip</format>
diff --git a/apache-maven/src/assembly/dir.xml b/apache-maven/src/assembly/dir.xml
index 6a9d73fd652e..514cb9e89b7c 100644
--- a/apache-maven/src/assembly/dir.xml
+++ b/apache-maven/src/assembly/dir.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>dir</id>
   <formats>
     <format>dir</format>
diff --git a/apache-maven/src/assembly/src.xml b/apache-maven/src/assembly/src.xml
index 6a6317d3443b..940467421a87 100644
--- a/apache-maven/src/assembly/src.xml
+++ b/apache-maven/src/assembly/src.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>src</id>
   <formats>
     <format>zip</format>