From 55a5b29f60f88cd1e02680444ebe816fd7042d15 Mon Sep 17 00:00:00 2001
From: bohlski <rbkr@kb.dk>
Date: Wed, 24 Jun 2020 14:16:46 +0200
Subject: [PATCH] maven-assembly-plugin files updated

---
 .../src/main/assembly/assembly.xml            |  5 +-
 .../src/main/assembly/assembly.xml            |  5 +-
 .../src/main/assembly/assembly.xml            | 53 +++++++++----------
 .../src/main/assembly/assembly.xml            |  5 +-
 .../src/main/assembly/tools-assembly.xml      |  5 +-
 .../src/main/assembly/assembly.xml            |  5 +-
 .../src/main/assembly/assembly.xml            |  5 +-
 .../src/main/assembly/assembly.xml            |  5 +-
 .../src/main/assembly/deploy-assembly.xml     |  5 +-
 .../src/test/assembly/assembly.xml            |  7 ++-
 .../test/assembly/test-deploy-assembly.xml    | 34 ++++++------
 .../src/main/assembly/assembly.xml            |  5 +-
 12 files changed, 63 insertions(+), 76 deletions(-)

diff --git a/bitrepository-alarm-service/src/main/assembly/assembly.xml b/bitrepository-alarm-service/src/main/assembly/assembly.xml
index 5a5612c43..908f02075 100644
--- a/bitrepository-alarm-service/src/main/assembly/assembly.xml
+++ b/bitrepository-alarm-service/src/main/assembly/assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>distribution</id>
 
   <formats>
diff --git a/bitrepository-audit-trail-service/src/main/assembly/assembly.xml b/bitrepository-audit-trail-service/src/main/assembly/assembly.xml
index 5a5612c43..908f02075 100644
--- a/bitrepository-audit-trail-service/src/main/assembly/assembly.xml
+++ b/bitrepository-audit-trail-service/src/main/assembly/assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>distribution</id>
 
   <formats>
diff --git a/bitrepository-client/src/main/assembly/assembly.xml b/bitrepository-client/src/main/assembly/assembly.xml
index 9f12cc9d4..979f62847 100644
--- a/bitrepository-client/src/main/assembly/assembly.xml
+++ b/bitrepository-client/src/main/assembly/assembly.xml
@@ -22,33 +22,32 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>distribution</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
+<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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+  <id>distribution</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
 
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-        </dependencySet>
-    </dependencySets>
-    <fileSets>
-        <fileSet>
-            <outputDirectory>bin</outputDirectory>
-            <fileMode>0740</fileMode>
-            <directoryMode>0740</directoryMode>
-            <directory>src/main/resources/scripts</directory>
-        </fileSet>
-      <fileSet>
-        <outputDirectory>conf</outputDirectory>
-        <fileMode>0740</fileMode>
-        <directoryMode>0740</directoryMode>
-        <directory>src/main/conf</directory>
-      </fileSet>
-    </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0740</fileMode>
+      <directoryMode>0740</directoryMode>
+      <directory>src/main/resources/scripts</directory>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0740</fileMode>
+      <directoryMode>0740</directoryMode>
+      <directory>src/main/conf</directory>
+    </fileSet>
+  </fileSets>
 </assembly>
 
diff --git a/bitrepository-integration/src/main/assembly/assembly.xml b/bitrepository-integration/src/main/assembly/assembly.xml
index 46db8f082..d951de23c 100644
--- a/bitrepository-integration/src/main/assembly/assembly.xml
+++ b/bitrepository-integration/src/main/assembly/assembly.xml
@@ -19,9 +19,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
 
   <id>quickstart</id>
   <formats>
diff --git a/bitrepository-integration/src/main/assembly/tools-assembly.xml b/bitrepository-integration/src/main/assembly/tools-assembly.xml
index 5ddb63885..1eb32229d 100644
--- a/bitrepository-integration/src/main/assembly/tools-assembly.xml
+++ b/bitrepository-integration/src/main/assembly/tools-assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>tools</id>
 
   <formats>
diff --git a/bitrepository-integrity-service/src/main/assembly/assembly.xml b/bitrepository-integrity-service/src/main/assembly/assembly.xml
index 3c5185793..447f75979 100644
--- a/bitrepository-integrity-service/src/main/assembly/assembly.xml
+++ b/bitrepository-integrity-service/src/main/assembly/assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>distribution</id>
 
   <formats>
diff --git a/bitrepository-monitoring-service/src/main/assembly/assembly.xml b/bitrepository-monitoring-service/src/main/assembly/assembly.xml
index cf6e74e46..208b92468 100644
--- a/bitrepository-monitoring-service/src/main/assembly/assembly.xml
+++ b/bitrepository-monitoring-service/src/main/assembly/assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>distribution</id>
 
   <formats>
diff --git a/bitrepository-reference-pillar/src/main/assembly/assembly.xml b/bitrepository-reference-pillar/src/main/assembly/assembly.xml
index 1ee11c82e..6b5363302 100644
--- a/bitrepository-reference-pillar/src/main/assembly/assembly.xml
+++ b/bitrepository-reference-pillar/src/main/assembly/assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>distribution</id>
 
   <formats>
diff --git a/bitrepository-reference-pillar/src/main/assembly/deploy-assembly.xml b/bitrepository-reference-pillar/src/main/assembly/deploy-assembly.xml
index 21ed6ba68..dd4ed493c 100644
--- a/bitrepository-reference-pillar/src/main/assembly/deploy-assembly.xml
+++ b/bitrepository-reference-pillar/src/main/assembly/deploy-assembly.xml
@@ -25,9 +25,8 @@
 
 
 <!-- Work in progress, creating zip distributable for running reference pillar tests. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>deploy</id>
   <baseDirectory>.</baseDirectory>
   <formats>
diff --git a/bitrepository-reference-pillar/src/test/assembly/assembly.xml b/bitrepository-reference-pillar/src/test/assembly/assembly.xml
index baf68e051..726086753 100644
--- a/bitrepository-reference-pillar/src/test/assembly/assembly.xml
+++ b/bitrepository-reference-pillar/src/test/assembly/assembly.xml
@@ -25,9 +25,8 @@
 
 
 <!-- Work in progress, creating zip distributable for running reference pillar tests. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>acceptance-test</id>
 
   <formats>
@@ -66,7 +65,7 @@
     </fileSet>
     <fileSet>
       <outputDirectory>bin</outputDirectory>
-        <directory>src/test/bin</directory>
+      <directory>src/test/bin</directory>
       <directoryMode>0755</directoryMode>
       <fileMode>0744</fileMode>
       <filtered>true</filtered>
diff --git a/bitrepository-reference-pillar/src/test/assembly/test-deploy-assembly.xml b/bitrepository-reference-pillar/src/test/assembly/test-deploy-assembly.xml
index ea3f87eb8..6211dbd2b 100644
--- a/bitrepository-reference-pillar/src/test/assembly/test-deploy-assembly.xml
+++ b/bitrepository-reference-pillar/src/test/assembly/test-deploy-assembly.xml
@@ -25,24 +25,22 @@
 
 
 <!-- Work in progress, creating zip distributable for running reference pillar tests. -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd
-http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 ">
-    <id>acceptance-test-deploy</id>
-    <baseDirectory>pillar-tests</baseDirectory>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
+<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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+  <id>acceptance-test-deploy</id>
+  <baseDirectory>pillar-tests</baseDirectory>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
 
-    <fileSets>
-        <fileSet>
-            <outputDirectory>deploy</outputDirectory>
-            <directoryMode>0755</directoryMode>
-            <fileMode>0744</fileMode>
-            <directory>src/test/deploy</directory>
-            <filtered>true</filtered>
-        </fileSet>
-    </fileSets>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>deploy</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0744</fileMode>
+      <directory>src/test/deploy</directory>
+      <filtered>true</filtered>
+    </fileSet>
+  </fileSets>
 </assembly>
 
diff --git a/bitrepository-webclient/src/main/assembly/assembly.xml b/bitrepository-webclient/src/main/assembly/assembly.xml
index cf6e74e46..33b237466 100644
--- a/bitrepository-webclient/src/main/assembly/assembly.xml
+++ b/bitrepository-webclient/src/main/assembly/assembly.xml
@@ -22,9 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>distribution</id>
 
   <formats>