diff --git a/dist/src/assembly/docs.xml b/dist/src/assembly/docs.xml
index 9d9c805c0..75247b7ad 100644
--- a/dist/src/assembly/docs.xml
+++ b/dist/src/assembly/docs.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <component>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>license.txt</include>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>license.txt</include>
                 <include>notice.txt</include>
-            </includes>
-        </fileSet>
+            </includes>
+        </fileSet>
  		<fileSet>
 			<directory>target</directory>
 			<outputDirectory>samples</outputDirectory>
@@ -14,6 +14,5 @@
 				<include>pom.xml</include>
 			</includes>
 		</fileSet>
-		<lineEnding>unix</lineEnding>
 	</fileSets>
 </component>
\ No newline at end of file
diff --git a/dist/src/assembly/with-dependencies.xml b/dist/src/assembly/with-dependencies.xml
index 79fbfef74..2fdcaac60 100644
--- a/dist/src/assembly/with-dependencies.xml
+++ b/dist/src/assembly/with-dependencies.xml
@@ -89,7 +89,7 @@
 				<dependencySets>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
 						</outputFileNameMapping>
 						<scope>runtime</scope>
 						<excludes>
@@ -106,7 +106,7 @@
 					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
 						</outputFileNameMapping>
 						<scope>provided</scope>
 					</dependencySet>
@@ -126,7 +126,7 @@
 				<dependencySets>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
 						</outputFileNameMapping>
 						<scope>runtime</scope>
 						<excludes>
@@ -143,7 +143,7 @@
 					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
 						</outputFileNameMapping>
 						<scope>provided</scope>
 						<excludes>
@@ -160,7 +160,7 @@
 					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
 						</outputFileNameMapping>
 						<scope>test</scope>
 						<excludes>