You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/03/11 08:52:51 UTC
[sling-org-apache-sling-starter] branch master updated: SLING-11170 update to DS 1.5 compatible implementation of Felix SCR (#55)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
The following commit(s) were added to refs/heads/master by this push:
new cf0d880 SLING-11170 update to DS 1.5 compatible implementation of Felix SCR (#55)
cf0d880 is described below
commit cf0d880293512cba24abbf75c73d017c23bb360e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Mar 11 09:52:42 2022 +0100
SLING-11170 update to DS 1.5 compatible implementation of Felix SCR (#55)
add hint in readme how to defer stopping the instance
---
README.md | 2 ++
src/main/features/boot.json | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0941083..683107a 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ See [Releasing a new version of the Sling starter](https://cwiki.apache.org/conf
in the current directory.
+Hint: You can defer stopping the instance after running the ITs with argument `-Dfeature-launcher.waitForInput=true` to do some manual checks.
+
2) Start Sling backed by an Oak SegmentStore with
java -jar target/dependency/org.apache.sling.feature.launcher.jar -f target/slingfeature-tmp/feature-oak_tar.json
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 4955a81..5c0e3d0 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -137,7 +137,7 @@
"start-order":"1"
},
{
- "id":"org.apache.felix:org.apache.felix.scr:2.1.30",
+ "id":"org.apache.felix:org.apache.felix.scr:2.2.0",
"start-order":"1"
}