You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2022/08/12 16:16:45 UTC
[sling-org-apache-sling-committer-cli] branch issue/SLING-11539 created (now 4d18f33)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch issue/SLING-11539
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
at 4d18f33 SLING-11539 - update-local-site fails on arm64v8 with Java 17
This branch includes the following new commits:
new 4d18f33 SLING-11539 - update-local-site fails on arm64v8 with Java 17
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-committer-cli] 01/01: SLING-11539 - update-local-site fails on arm64v8 with Java 17
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch issue/SLING-11539
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
commit 4d18f33e10119085b0333b1c051fd48115fd9d7e
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Aug 12 18:14:17 2022 +0200
SLING-11539 - update-local-site fails on arm64v8 with Java 17
* updated to latest org.apache.sling.feature.launcher and
org.apache.felix.framework
* optimised some pom configs
* renamed launcher.sh to run.sh, to make it less confusing, since
we're now using the launcher distribution, rather than the jar
---
Dockerfile | 13 +++---
pom.xml | 52 +++++++++++-----------
src/main/features/app.json | 5 +++
src/main/resources/scripts/{launcher.sh => run.sh} | 11 ++---
4 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4ec7f39..d35e3ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,18 +26,19 @@ COPY --from=builder /opt/jre /opt/jre
RUN /opt/jre/bin/java -Xshare:dump
# escaping required to properly handle arguments with spaces
-ENTRYPOINT ["/usr/share/sling-cli/bin/launcher.sh"]
+ENTRYPOINT ["/usr/share/sling-cli/bin/run.sh"]
+CMD ["help"]
# Add feature launcher
-ADD target/lib /usr/share/sling-cli/launcher
+COPY target/lib/feature-launcher /usr/share/sling-cli/launcher
# Add launcher script
-ADD target/classes/scripts /usr/share/sling-cli/bin
+COPY target/classes/scripts/run.sh /usr/share/sling-cli/bin/run.sh
# workaround for MRESOURCES-236
RUN chmod a+x /usr/share/sling-cli/bin/*
# Add config files
-ADD target/classes/conf /usr/share/sling-cli/conf
+COPY target/classes/conf /usr/share/sling-cli/conf
# Add all bundles
-ADD target/artifacts /usr/share/sling-cli/artifacts
+COPY target/artifacts /usr/share/sling-cli/artifacts
# Add the service itself
ARG FEATURE_FILE
-ADD ${FEATURE_FILE} /usr/share/sling-cli/sling-cli.feature
+COPY ${FEATURE_FILE} /usr/share/sling-cli/sling-cli.feature
diff --git a/pom.xml b/pom.xml
index b431733..5576286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,30 @@
<overWriteReleases>false</overWriteReleases>
<includeScope>runtime</includeScope>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
- <stripVersion>true</stripVersion>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-feature-launcher</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.launcher</artifactId>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/lib/feature-launcher</outputDirectory>
+ <fileMappers>
+ <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ <pattern>^org\.apache\.sling\.feature\.launcher-[0-9\.]+(-SNAPSHOT)?/</pattern>
+ <replacement>./</replacement>
+ </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ </fileMappers>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
@@ -114,30 +137,6 @@
<goal>repository</goal>
</goals>
</execution>
- <execution>
- <id>extra-dependencies</id>
- <goals>
- <goal>repository</goal>
- </goals>
- <configuration>
- <repositories>
- <repository>
- <embedArtifacts>
- <embedArtifact>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.2</version>
- </embedArtifact>
- <embedArtifact>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.2.0</version>
- </embedArtifact>
- </embedArtifacts>
- </repository>
- </repositories>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -223,7 +222,8 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>0.8.0</version>
+ <version>1.2.0</version>
+ <type>zip</type>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/src/main/features/app.json b/src/main/features/app.json
index ca05350..9f1693b 100644
--- a/src/main/features/app.json
+++ b/src/main/features/app.json
@@ -1,5 +1,10 @@
{
"id" : "${project.groupId}:${project.artifactId}:slingfeature:app:${project.version}",
+ "execution-environment:JSON|false":{
+ "framework":{
+ "id":"org.apache.felix:org.apache.felix.framework:7.0.5"
+ }
+ },
"bundles": [
{
"id" : "${project.groupId}:${project.artifactId}:${project.version}",
diff --git a/src/main/resources/scripts/launcher.sh b/src/main/resources/scripts/run.sh
similarity index 93%
rename from src/main/resources/scripts/launcher.sh
rename to src/main/resources/scripts/run.sh
index 08f103f..9d06898 100755
--- a/src/main/resources/scripts/launcher.sh
+++ b/src/main/resources/scripts/run.sh
@@ -18,15 +18,16 @@
ARGS_PROP="exec.args=$@"
# Use exec to become pid 1, see https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
-exec /opt/jre/bin/java \
+export JAVA_HOME=/opt/jre
+export JAVA_OPTS="\
+ -Dorg.slf4j.simpleLogger.logFile=/dev/null \
+ -Dlogback.configurationFile=file:/usr/share/sling-cli/conf/logback-default.xml \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \
--add-opens=java.base/java.net=ALL-UNNAMED \
--add-opens=java.base/java.security=ALL-UNNAMED \
- -Xshare:on \
- -Dorg.slf4j.simpleLogger.logFile=/dev/null \
- -Dlogback.configurationFile=file:/usr/share/sling-cli/conf/logback-default.xml \
- -jar /usr/share/sling-cli/launcher/org.apache.sling.feature.launcher.jar \
+ -Xshare:on"
+exec /usr/share/sling-cli/launcher/bin/launcher \
-f /usr/share/sling-cli/sling-cli.feature \
-c /usr/share/sling-cli/artifacts \
-D "$ARGS_PROP" \