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 2020/08/05 17:23:37 UTC
[sling-org-apache-sling-starter] branch feature/SLING-9595 updated
(e69b23b -> d445b7c)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch feature/SLING-9595
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.
from e69b23b SLING-9595 - Fully switch starter build to the feature model
new a67702b SLING-9595 - Fully switch starter build to the feature model
new 3b8aa6e SLING-9595 - Fully switch starter build to the feature model
new d445b7c SLING-9595 - Fully switch starter build to the feature model
The 3 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.
Summary of changes:
README.md | 64 ++++++--------------------
set-sling-snapshots.sh | 51 --------------------
src/main/features/boot_boot.json | 13 ++++--
src/main/features/composum_composum-nodes.json | 14 +++---
src/main/features/repoinit_repoinit.json | 8 ++--
src/main/features/sling_sling.json | 6 +--
6 files changed, 37 insertions(+), 119 deletions(-)
delete mode 100755 set-sling-snapshots.sh
[sling-org-apache-sling-starter] 03/03: SLING-9595 - Fully switch
starter build to the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-9595
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit d445b7c738bc66f5918bfcd3f8656be007710d8c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Aug 5 19:19:58 2020 +0200
SLING-9595 - Fully switch starter build to the feature model
Remove set-sling-snapshots.sh, it does not work with the feature model.
---
set-sling-snapshots.sh | 51 --------------------------------------------------
1 file changed, 51 deletions(-)
diff --git a/set-sling-snapshots.sh b/set-sling-snapshots.sh
deleted file mode 100755
index 1c64337..0000000
--- a/set-sling-snapshots.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# ----------------------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor license
-# agreements. See the NOTICE file distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file to you under the Apache License,
-# Version 2.0 (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed under the
-# License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-# ----------------------------------------------------------------------------------------
-# That being said, this is an EXPERIMENTAL script to remove
-# versions from the provisioning model lines of Sling artifacts.
-#
-# Meant to create an alternate version of the Sling
-# launchpad using all the latest snapshots, for
-# integration testing in parallel with a stable
-# versions that uses releases.
-#
-# This script modifies provisioning model files under
-# src/main/provisioning, the changes are NOT
-# meant to be committed, just meant to build and
-# deploy an "all snapshots" launchpad jar meant to
-# be used by the launchpad/testing module.
-#
-# To verify the results use
-# mvn dependency:resolve | grep org.apache.sling
-#
-# For some reason currently two modules are not resolved
-# to snapshots although their versions are correctly removed
-# in the provisioning model:
-#
-# mvn dependency:resolve | grep org.apache.sling | grep -v SNAPSHOT
-# [INFO] --- maven-dependency-plugin:2.10:resolve (default-cli) @ org.apache.sling.launchpad ---
-# [INFO] org.apache.sling:org.apache.sling.resourceresolver:jar:1.4.18:provided
-# [INFO] org.apache.sling:org.apache.sling.i18n:jar:2.5.4:provided
-#
-
-function removeSlingVersions() {
- sed 's/\(org.apache.sling\)\/\(org.apache.sling.*\)\/.*/org.apache.sling\/\2/g' < $1
-}
-
-SRC="src/main/provisioning/*.txt"
-echo "Removing Sling versions from provisioning model files under $SRC..."
-for i in $SRC
-do
- TMP=/tmp/$ME_$$
- removeSlingVersions $i > $TMP
- mv $TMP $i
-done
\ No newline at end of file
[sling-org-apache-sling-starter] 01/03: SLING-9595 - Fully switch
starter build to the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-9595
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit a67702b0afcd46b6d1b0aa60d278361f31484598
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Aug 5 19:07:39 2020 +0200
SLING-9595 - Fully switch starter build to the feature model
Catch up with latest changes from the master branch
---
src/main/features/boot_boot.json | 13 +++++++++----
src/main/features/composum_composum-nodes.json | 14 +++++++-------
src/main/features/repoinit_repoinit.json | 8 ++++----
src/main/features/sling_sling.json | 6 +++---
4 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/features/boot_boot.json b/src/main/features/boot_boot.json
index 62c0e3b..d747199 100644
--- a/src/main/features/boot_boot.json
+++ b/src/main/features/boot_boot.json
@@ -58,7 +58,7 @@
"start-order":"1"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.2",
+ "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.4",
"start-order":"1"
},
{
@@ -82,7 +82,7 @@
"start-order":"1"
},
{
- "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.2.2",
+ "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.3.0",
"start-order":"1"
},
{
@@ -90,7 +90,7 @@
"start-order":"1"
},
{
- "id":"org.apache.sling:org.apache.sling.settings:1.3.10",
+ "id":"org.apache.sling:org.apache.sling.settings:1.4.0",
"start-order":"1"
},
{
@@ -124,11 +124,16 @@
{
"id":"org.slf4j:slf4j-api:1.7.25",
"start-order":"1"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.scr:2.1.20",
+ "start-order":"1"
}
+
],
"framework-properties":{
"sling.run.mode.install.options":"oak_tar,oak_mongo",
"localIndexDir":"${sling.home}/repository/index",
"repository.home":"${sling.home}/repository"
}
-}
\ No newline at end of file
+}
diff --git a/src/main/features/composum_composum-nodes.json b/src/main/features/composum_composum-nodes.json
index 7d69770..408ceb3 100644
--- a/src/main/features/composum_composum-nodes.json
+++ b/src/main/features/composum_composum-nodes.json
@@ -2,27 +2,27 @@
{
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:composum_composum-nodes:12-SNAPSHOT",
"variables":{
- "composum.nodes.version":"1.11.5"
+ "composum.nodes.version":"1.12.0"
},
"bundles":[
{
- "id":"com.composum.sling.core:composum-sling-core-commons:1.11.5",
+ "id":"com.composum.sling.core:composum-sling-core-commons:1.12.0",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-core-console:1.11.5",
+ "id":"com.composum.sling.core:composum-sling-core-console:1.12.0",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-core-jslibs:1.11.5",
+ "id":"com.composum.sling.core:composum-sling-core-jslibs:1.12.0",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-package-manager:1.11.5",
+ "id":"com.composum.sling.core:composum-sling-package-manager:1.12.0",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-user-management:1.11.5",
+ "id":"com.composum.sling.core:composum-sling-user-management:1.12.0",
"start-order":"20"
}
],
@@ -36,4 +36,4 @@
"whitelist.name":"composum"
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/features/repoinit_repoinit.json b/src/main/features/repoinit_repoinit.json
index 819b518..f1f18e3 100644
--- a/src/main/features/repoinit_repoinit.json
+++ b/src/main/features/repoinit_repoinit.json
@@ -3,15 +3,15 @@
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:repoinit:12-SNAPSHOT",
"bundles":[
{
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.20",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.4",
+ "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.4.2",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
"start-order":"20"
}
],
@@ -71,4 +71,4 @@
"allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
"end"
]
-}
\ No newline at end of file
+}
diff --git a/src/main/features/sling_sling.json b/src/main/features/sling_sling.json
index 1ddf965..e40c868 100644
--- a/src/main/features/sling_sling.json
+++ b/src/main/features/sling_sling.json
@@ -102,7 +102,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.2.2",
+ "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.3.0",
"start-order":"20"
},
{
@@ -318,7 +318,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.4",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.6",
"start-order":"20"
},
{
@@ -448,4 +448,4 @@
]
}
}
-}
\ No newline at end of file
+}
[sling-org-apache-sling-starter] 02/03: SLING-9595 - Fully switch
starter build to the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-9595
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 3b8aa6e5b60576274ea652d2a043048942d29c7a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Aug 5 19:18:31 2020 +0200
SLING-9595 - Fully switch starter build to the feature model
Update documentation.
---
README.md | 64 ++++++++++++++-------------------------------------------------
1 file changed, 14 insertions(+), 50 deletions(-)
diff --git a/README.md b/README.md
index 85f617b..512facd 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,8 @@
This module is part of the [Apache Sling](https://sling.apache.org) project.
-The starter project produces both a Standalone Java Application which
-contains everything needed to run the Launchpad in a single JAR file and a Web
-Application.
+The starter project produces feature artifacts that can be launched using the
+[Feature Launcher](https://github.com/apache/sling-org-apache-sling-feature-launcher).
It is **not meant to be a production-ready setup**, more as a way to facilitate experimenting and learning Sling.
@@ -17,7 +16,7 @@ See [Releasing a new version of the Sling starter](https://cwiki.apache.org/conf
How to run the Sling Starter module in Standalone mode
----------------------------------------
- NOTE: "mvn clean" deletes the "sling" work directory in the project base
+ NOTE: "mvn clean" deletes the "launcher" work directory in the project base
directory. It is advisable to use a work directory outside of the
project directory.
@@ -27,57 +26,22 @@ How to run the Sling Starter module in Standalone mode
in the current directory.
-2) Start the generated jar with
+2) Download the feature launcher using
- java -jar target/org.apache.sling.starter-10-SNAPSHOT.jar
-
-Use the correct version number instead of 10-SNAPSHOT, if needed.
-
-3) Browse Sling in:
-
- http://localhost:8080
-
-How to run the Sling Starter module in webapp mode
-----------------------------------------
+ mvn dependency:get dependency:copy -Dartifact=org.apache.sling:org.apache.sling.feature.launcher:1.1.4
+
+ mvn dependency:copy -Dartifact=org.apache.sling:org.apache.sling.feature.launcher:1.1.4
-1) Build the Sling Starter using
+3) Start Sling backed by an Oak SegmentStore with
- mvn clean install
+ java -jar target/dependency/org.apache.sling.feature.launcher-1.1.4.jar -f target/slingfeature-tmp/feature-oak_tar.json
-in the current directory.
-
-2) Deploy target/org.apache.sling.starter-10-SNAPSHOT.war to your favorite application
-server or servlet container. Servlet 3.1 is a minimum requirement for the web app.
+4) Browse Sling in:
-Experimental Feature Model support
-----------------------------------------
-
-During the build the provisioning model files will be converted on the fly to feature model files
-on-the-fly. The conversion taking into account the `oak_tar` runmode places its results in
-`target/fm/oak_tar`. In a similar way, the MongoDB feature files are placed under
-`target/fm/oak_mongo`.
-
-For convenience, the results are aggregates in a single, standalone feature file. Due to technical
-limitations only a single aggregate feature file is created, by default the `oak_tar` one, found
-under `target/slingfeature-tmp/feature-oak_tar.json`.
-
-If you don't have a copy of the feature launcher jar, download it, for instance using
-
- $ mvn dependency:get dependency:copy \
- -Dartifact=org.apache.sling:org.apache.sling.feature.launcher:LATEST \
- -DoutputDirectory=.
-
-To launch Sling using the feature launcher, simply execute
-
- $ java -jar org.apache.sling.feature.launcher-*.jar -f target/slingfeature-tmp/feature-oak_tar.json
-
-To clean up the repository state just delete the `launcher` directory.
+ http://localhost:8080
-To generate the oak_mongo aggregate run the build and define the `fm.oak_mongo` property, e.g.
+For MongoDB support replace the launch command with
- $ mvn clean package -Dfm.oak_mongo
-
-The instruction to launch Sling then becomes
+ java -jar target/dependency/org.apache.sling.feature.launcher-1.1.4.jar -f target/slingfeature-tmp/feature-oak_tar.json
- $ java -jar org.apache.sling.feature.launcher-*.jar -f target/slingfeature-tmp/feature-oak_mongo.json
-
+This expects a MongoDB server to be running locally.