Merge pull request #42 from apache/bugfix/m-assembly-plugin-use-libs-…

…from-appassembler SLING-11408 m-assembly-p must use dependencies generated from
apache · Aug 4, 2022 · 9ee7aea · 9ee7aea
2 parents 072fe2a + 227d339
commit 9ee7aea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -192,6 +192,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <useWildcardClassPath>true</useWildcardClassPath>
                     <repositoryLayout>flat</repositoryLayout>
                     <repositoryName>lib</repositoryName>
                     <extraJvmArguments>-Dproject.artifactId=${project.artifactId} -Dproject.version=${project.version} -Dbuild.timestamp=${maven.build.timestamp} -Dfile.encoding=UTF-8</extraJvmArguments>
@@ -256,7 +257,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>

diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
@@ -47,23 +47,19 @@
 
   <fileSets>
     <!--
-     | shell scripts
+     | shell scripts generated from appassembler
     -->
     <fileSet>
       <directory>${project.build.directory}/appassembler/bin/</directory>
       <outputDirectory>bin</outputDirectory>
       <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>