[MNG-6914] move assembly descriptors to src/assembly
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 40cfb25..57f2718 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -200,7 +200,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/maven/bin.xml</descriptor>
+ <descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -268,7 +268,7 @@
<attach>false</attach>
<outputDirectory>${distributionTargetDir}</outputDirectory>
<descriptors>
- <descriptor>src/assembly/maven/dir.xml</descriptor>
+ <descriptor>src/assembly/dir.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -292,7 +292,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/maven/src.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
diff --git a/apache-maven/src/assembly/maven/bin.xml b/apache-maven/src/assembly/bin.xml
similarity index 93%
rename from apache-maven/src/assembly/maven/bin.xml
rename to apache-maven/src/assembly/bin.xml
index 3addb34..2ecbf30 100644
--- a/apache-maven/src/assembly/maven/bin.xml
+++ b/apache-maven/src/assembly/bin.xml
@@ -25,6 +25,6 @@
<format>tar.gz</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/assembly/maven/component.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/apache-maven/src/assembly/maven/component.xml b/apache-maven/src/assembly/component.xml
similarity index 100%
rename from apache-maven/src/assembly/maven/component.xml
rename to apache-maven/src/assembly/component.xml
diff --git a/apache-maven/src/assembly/maven/dir.xml b/apache-maven/src/assembly/dir.xml
similarity index 93%
rename from apache-maven/src/assembly/maven/dir.xml
rename to apache-maven/src/assembly/dir.xml
index 418327d..76adb87 100644
--- a/apache-maven/src/assembly/maven/dir.xml
+++ b/apache-maven/src/assembly/dir.xml
@@ -25,6 +25,6 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
- <componentDescriptor>src/assembly/maven/component.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/apache-maven/src/assembly/maven/src.xml b/apache-maven/src/assembly/src.xml
similarity index 100%
rename from apache-maven/src/assembly/maven/src.xml
rename to apache-maven/src/assembly/src.xml