You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2024/08/23 15:26:11 UTC
(sling-project-archetype) 01/01: SLING-12414 - Update the project archetype to use the latest version of the feature model tooling
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/SLING-12414
in repository https://gitbox.apache.org/repos/asf/sling-project-archetype.git
commit d437421e6abf6a05feffdc5fb6898cc06b24e15b
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 23 17:21:20 2024 +0200
SLING-12414 - Update the project archetype to use the latest version of the feature model tooling
Update to the latest versions and adapt to the new packaging of the feature model launcher.
---
.../resources/archetype-resources/launcher/launch.sh | 3 ++-
.../resources/archetype-resources/launcher/pom.xml | 20 ++++++++++++++++----
src/main/resources/archetype-resources/pom.xml | 6 +++---
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/archetype-resources/launcher/launch.sh b/src/main/resources/archetype-resources/launcher/launch.sh
index 79c5771..4ca5b16 100755
--- a/src/main/resources/archetype-resources/launcher/launch.sh
+++ b/src/main/resources/archetype-resources/launcher/launch.sh
@@ -21,4 +21,5 @@ echo '[NOTE] Launching application, this will fail if you did not build the proj
echo '[NOTE] Remove the launcher folder to throw away local changes'
echo '-------------------------------------------------------------------------------------------'
-java -jar target/dependency/org.apache.sling.feature.launcher.jar -f target/slingfeature-tmp/feature-app.json
+target/dependency/org.apache.sling.feature.launcher/bin/launcher -f target/slingfeature-tmp/feature-app.json
+
diff --git a/src/main/resources/archetype-resources/launcher/pom.xml b/src/main/resources/archetype-resources/launcher/pom.xml
index 5d1c0f5..05d6e2b 100644
--- a/src/main/resources/archetype-resources/launcher/pom.xml
+++ b/src/main/resources/archetype-resources/launcher/pom.xml
@@ -104,13 +104,25 @@
<execution>
<id>prepare-feature-launcher</id>
<goals>
- <goal>get</goal>
- <goal>copy</goal>
+ <goal>unpack</goal>
</goals>
<phase>package</phase>
<configuration>
- <artifact>org.apache.sling:org.apache.sling.feature.launcher:\${org.apache.sling.feature.launcher.version}</artifact>
- <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.launcher</artifactId>
+ <version>\${org.apache.sling.feature.launcher.version}</version>
+ <type>tar.gz</type>
+ <!-- remove the version number from the unpacked folder -->
+ <fileMappers>
+ <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ <pattern>\Qorg.apache.sling.feature.launcher-\${org.apache.sling.feature.launcher.version}\E</pattern>
+ <replacement>org.apache.sling.feature.launcher</replacement>
+ </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ </fileMappers>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 26fd114..e8b3998 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -70,12 +70,12 @@
<failsafe.plugin.version>3.0.0-M3</failsafe.plugin.version>
<deploy.plugin.version>3.0.0-M1</deploy.plugin.version>
<sling.plugin.version>2.4.0</sling.plugin.version>
- <dependency.plugin.version>3.1.1</dependency.plugin.version>
+ <dependency.plugin.version>3.8.0</dependency.plugin.version>
<build.helper.plugin.version>3.0.0</build.helper.plugin.version>
<wcmio.plugin.version>1.7.6</wcmio.plugin.version>
<!-- TODO: Could not upgrade to 1.1.x as some tests prevent the creation of All packages -->
<filevault-package.plugin.version>1.0.4</filevault-package.plugin.version>
- <slingfeature.plugin.version>1.5.10</slingfeature.plugin.version>
+ <slingfeature.plugin.version>1.8.4</slingfeature.plugin.version>
<osgi.core.version>7.0.0</osgi.core.version>
<osgi.annotation.version>7.0.0</osgi.annotation.version>
@@ -88,7 +88,7 @@
<org.apache.felix.framework.version>7.0.1</org.apache.felix.framework.version>
<org.apache.sling.api.version>2.22.0</org.apache.sling.api.version>
<org.apache.sling.models.api.version>1.3.8</org.apache.sling.models.api.version>
- <org.apache.sling.feature.launcher.version>1.1.20</org.apache.sling.feature.launcher.version>
+ <org.apache.sling.feature.launcher.version>1.3.0</org.apache.sling.feature.launcher.version>
<jetbrains.annotations.version>19.0.0</jetbrains.annotations.version>
<org.apache.sling.settings.version>1.3.10</org.apache.sling.settings.version>
<org.apache.sling.commons.osgi.version>2.4.0</org.apache.sling.commons.osgi.version>