From a7027e51951fa2db6b4dd5360b222d6866e7605f Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Wed, 26 May 2021 14:50:44 +0100
Subject: [PATCH] ARTEMIS-3314: split dir creation to its own execution to fix
 warning

uses a component descriptor to share dependency/layout definitions with bin archives
---
 artemis-distribution/pom.xml                  | 16 +++++++++-
 .../src/main/assembly/bin.xml                 | 32 +++++++++++++++++++
 .../src/main/assembly/dep.xml                 | 17 +++-------
 .../src/main/assembly/dir.xml                 | 31 ++++++++++++++++++
 4 files changed, 82 insertions(+), 14 deletions(-)
 create mode 100644 artemis-distribution/src/main/assembly/bin.xml
 create mode 100644 artemis-distribution/src/main/assembly/dir.xml

diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index bfae4b234f..82bdf48655 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -281,7 +281,21 @@
                   <id>bin</id>
                   <configuration>
                      <descriptors>
-                       <descriptor>src/main/assembly/dep.xml</descriptor>
+                       <descriptor>src/main/assembly/bin.xml</descriptor>
+                     </descriptors>
+                     <tarLongFileMode>posix</tarLongFileMode>
+                  </configuration>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>single</goal>
+                  </goals>
+               </execution>
+               <execution>
+                  <id>dir</id>
+                  <configuration>
+                     <attach>false</attach>
+                     <descriptors>
+                       <descriptor>src/main/assembly/dir.xml</descriptor>
                      </descriptors>
                      <tarLongFileMode>posix</tarLongFileMode>
                   </configuration>
diff --git a/artemis-distribution/src/main/assembly/bin.xml b/artemis-distribution/src/main/assembly/bin.xml
new file mode 100644
index 0000000000..5ddee22df8
--- /dev/null
+++ b/artemis-distribution/src/main/assembly/bin.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<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>bin</id>
+   <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+   </formats>
+   <includeBaseDirectory>true</includeBaseDirectory>
+
+   <componentDescriptors>
+       <componentDescriptor>dep.xml</componentDescriptor>
+   </componentDescriptors>
+</assembly>
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index fd08c8ae31..0b24360f2b 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -15,18 +15,9 @@
   ~ limitations under the License.
   -->
 
-<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>bin</id>
-   <formats>
-      <format>dir</format>
-      <format>zip</format>
-      <format>tar.gz</format>
-   </formats>
-   <includeBaseDirectory>true</includeBaseDirectory>
-
+<component 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">
 
    <dependencySets>
       <dependencySet>
@@ -258,4 +249,4 @@
          <useDefaultExcludes>true</useDefaultExcludes>
       </fileSet>
    </fileSets>
-</assembly>
+</component>
diff --git a/artemis-distribution/src/main/assembly/dir.xml b/artemis-distribution/src/main/assembly/dir.xml
new file mode 100644
index 0000000000..f91f268e1a
--- /dev/null
+++ b/artemis-distribution/src/main/assembly/dir.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<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>bin</id>
+   <formats>
+      <format>dir</format>
+   </formats>
+   <includeBaseDirectory>true</includeBaseDirectory>
+
+   <componentDescriptors>
+       <componentDescriptor>dep.xml</componentDescriptor>
+   </componentDescriptors>
+</assembly>