[sling-org-apache-sling-feature-launcher] 01/01: SLING-11408 m-assembly-p must use dependencies generated from appassembler

[kw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch bugfix/m-assembly-plugin-use-libs-from-appassembler
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git

commit 041fb62ca2df7288f195372f884ab4bb9f6714be
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Aug 4 12:55:03 2022 +0200

    SLING-11408 m-assembly-p must use dependencies generated from
    appassembler
---
 src/main/assembly/bin.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index f494a91..49f7c8f 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -47,7 +47,7 @@
 
   <fileSets>
     <!--
-     | shell scripts
+     | shell scripts generated from appassembler
     -->
     <fileSet>
       <directory>${project.build.directory}/appassembler/bin/</directory>
@@ -55,15 +55,11 @@
       <fileMode>755</fileMode>
       <directoryMode>755</directoryMode>
     </fileSet>
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
+    <!-- dependencies (as identified by appassembler) -->
+    <fileSet>
+      <directory>${project.build.directory}/appassembler/lib/</directory>
       <outputDirectory>lib</outputDirectory>
-      <scope>provided</scope>
-      <useTransitiveDependencies>true</useTransitiveDependencies>
-      <useProjectArtifact>true</useProjectArtifact>
-    </dependencySet>
-  </dependencySets>
+    </fileSet>
+  </fileSets>
 
 </assembly>