This is an automated email from the ASF dual-hosted git repository. andysch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-kickstart.git
commit 6be632fc67604188d62b89223ace7decff9c3548 Author: Andreas Schaefer <[email protected]> AuthorDate: Wed Jun 24 11:08:44 2020 -0700 Final adjustment for next release --- Readme.md | 9 ++++++--- .../java/org/apache/sling/kickstart/app/KickstartStarter.java | 2 +- .../resources/composite-nodes/feature-sling12-two-headed.json | 2 +- .../resources/composite-nodes/feature-two-headed-runtime.json | 2 +- src/main/resources/composite-nodes/feature-two-headed-seed.json | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Readme.md b/Readme.md index 3b031af..0a728a6 100644 --- a/Readme.md +++ b/Readme.md @@ -70,8 +70,7 @@ the for the Sling Starater. To checkout the usage of the parameters you can use the **help** parameter when starting the kickstarter JAR file: ``` -java -jar org.apache.sling.kickstart-0.0.5-SNAPSHOT.jar -h -Usage: java -jar <Sling Kickstart JAR File> [-hmnv] [-a=<address>] +Usage: java -jar <Sling Kickstart JAR File> [-hmnSv] [-a=<address>] [-c=<slingHome>] [-f=<logFile>] [-j=<controlAddress>] [-l=<logLevel>] [-p=<port>] @@ -112,11 +111,12 @@ Apache Sling Kickstart -s, --mainFeature=<mainFeatureFile> main feature file (file path or URL) replacing the provided Sling Feature File + -S, --nofm Do not use Sling Feature Archive or Model file -v, --verbose the feature launcher is verbose on launch Copyright(c) 2020 The Apache Software Foundation. ``` -These are two additional parameters: +These are four additional parameters: **-s**: this takes a path to a Feature Model (FM) that replaces the provided Sling Feature Module. With it it is possible to provide your own Sling FM @@ -130,6 +130,9 @@ use multiple *-af* parameter lines. plain Sling Feature Model. This will greatly increase the launch performance if most of the dependencies are already in the local Maven repository. +**-S/--nofm**: do not use the embedded Sling Feature Archive or Model file. +If no other Feature Module file is provided this launch aborts. + ### Composite Node Store The Kickstart project also comes with the Feature Models and the scripts to run diff --git a/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java b/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java index 40d808e..a58488f 100644 --- a/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java +++ b/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java @@ -144,7 +144,7 @@ public class KickstartStarter implements Runnable, ControlTarget { } } if(mainFeatureURL == null && (additionalFeatureFile == null || additionalFeatureFile.isEmpty())) { - error("Abort: No Feature(s) Provided", null); + error("No Feature(s) Provided", null); return; } List<String> argumentList = new ArrayList<>(); diff --git a/src/main/resources/composite-nodes/feature-sling12-two-headed.json b/src/main/resources/composite-nodes/feature-sling12-two-headed.json index cd090ea..4d841cc 100644 --- a/src/main/resources/composite-nodes/feature-sling12-two-headed.json +++ b/src/main/resources/composite-nodes/feature-sling12-two-headed.json @@ -1,5 +1,5 @@ { - "id":"org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling12:0.0.5-SNAPSHOT", + "id":"org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling12:0.0.6", "title":"Sling 12 Feature Model for Composite Nodestore", "description":"Complete Sling 12 Feature Model w/o Default Node Store", "vendor":"The Apache Software Foundation", diff --git a/src/main/resources/composite-nodes/feature-two-headed-runtime.json b/src/main/resources/composite-nodes/feature-two-headed-runtime.json index d355312..d95b6a7 100644 --- a/src/main/resources/composite-nodes/feature-two-headed-runtime.json +++ b/src/main/resources/composite-nodes/feature-two-headed-runtime.json @@ -1,5 +1,5 @@ { - "id": "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:two-headed:0.0.5-SNAPSHOT", + "id": "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:two-headed:0.0.6", "configurations": { "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": { "name":"Default NodeStore", diff --git a/src/main/resources/composite-nodes/feature-two-headed-seed.json b/src/main/resources/composite-nodes/feature-two-headed-seed.json index 8ff13f0..f92cea4 100644 --- a/src/main/resources/composite-nodes/feature-two-headed-seed.json +++ b/src/main/resources/composite-nodes/feature-two-headed-seed.json @@ -1,5 +1,5 @@ { - "id": "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:two-headed:0.0.5-SNAPSHOT", + "id": "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:two-headed:0.0.6", "configurations": { "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": { "name":"Default NodeStore",
