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 2021/09/21 09:00:44 UTC
[sling-org-apache-sling-starter] 02/02: SLING-10829 - Declare
o.a.felix.framework 7.0.1 as an execution environment
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/SLING-10827
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit d7942df6f039e61f29d2690c7619e20b9454e4ee
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 21 10:40:15 2021 +0200
SLING-10829 - Declare o.a.felix.framework 7.0.1 as an execution environment
Move from pom.xml configuration, which affects mostly the analysers to a
feature-model based configuration, which works for the launcher as well.
---
pom.xml | 5 -----
src/main/features/base.json | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd45be1..eeb6972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,11 +105,6 @@
<extensions>true</extensions>
<configuration>
<replacePropertyVariables>asm.version,jackrabbit.version,groovy.version,oak.version,slf4j.version,composum.nodes.version,jackson.version</replacePropertyVariables>
- <framework>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
- </framework>
<aggregates>
<aggregate>
<classifier>oak_tar</classifier>
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 5b23bdc..abff493 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -1,5 +1,10 @@
{
+ "execution-environment:JSON|false":{
+ "framework":{
+ "id":"org.apache.felix:org.apache.felix.framework:7.0.1"
+ }
+ },
"bundles":[
{
"id":"commons-codec:commons-codec:1.15",