You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/08/11 14:21:48 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated: SLING-11396 use the libs folder from appsassembler (#144)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new ca2b551 SLING-11396 use the libs folder from appsassembler (#144)
ca2b551 is described below
commit ca2b551f1872d0efd1b5839fb59e87edef2b872c
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Aug 11 16:21:44 2022 +0200
SLING-11396 use the libs folder from appsassembler (#144)
---
pom.xml | 4 ++--
src/main/assembly/bin.xml | 14 +++++---------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73b48ec..8965409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <scope>compile</scope>
- <!-- make optional to not transitively pollute class loaders -->
+ <!-- make runtime and optional to not transitively pollute compile class loaders -->
+ <scope>runtime</scope>
<optional>true</optional>
</dependency>
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index fca39ee..b86acde 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -57,15 +57,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>compile</scope>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useProjectArtifact>true</useProjectArtifact>
- </dependencySet>
- </dependencySets>
+ </fileSet>
+ </fileSets>
</assembly>