Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SLING-11408 m-assembly-p must use dependencies generated from #42

Merged
merged 2 commits into from
Aug 4, 2022
Merged

SLING-11408 m-assembly-p must use dependencies generated from #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
041fb62
SLING-11408 m-assembly-p must use dependencies generated from
kwin Aug 4, 2022
227d339
Include slf4j-impl and use wildcard classpath
cziegeler Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -256,7 +257,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>provided</scope>
<scope>compile</scope>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather have this scope runtime, as definitely not needed in the compile class path.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to adjust if it is still working then

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in b55ca9c.

</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Expand Down
16 changes: 6 additions & 10 deletions src/main/assembly/bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>