maven-assembly-plugin files updated

bitrepository · Jun 24, 2020 · 55a5b29 · 55a5b29
1 parent 0c77aeb
commit 55a5b29
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 76 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>