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:11:21 UTC
[sling-org-apache-sling-starter] branch master updated (a3bd4b5 ->
0eb7629)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.
from a3bd4b5 Add some helper scripts
new af5858d SLING-10828 - Update to the latest slingfeature-maven-plugin
new 0eb7629 SLING-10829 - Declare o.a.felix.framework 7.0.1 as an execution environment
The 2 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:
pom.xml | 7 +------
src/main/features/base.json | 5 +++++
2 files changed, 6 insertions(+), 6 deletions(-)
[sling-org-apache-sling-starter] 02/02: SLING-10829 - Declare
o.a.felix.framework 7.0.1 as an execution environment
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 0eb7629f102f8ed6f11e20763cff67afb61f9643
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",
[sling-org-apache-sling-starter] 01/02: SLING-10828 - Update to the
latest slingfeature-maven-plugin
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit af5858d54d1a1cc4c89112c0011a7ed59a1e2fbe
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 21 10:35:58 2021 +0200
SLING-10828 - Update to the latest slingfeature-maven-plugin
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2c39d0e..fd45be1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.4.22</version>
+ <version>1.5.16</version>
<extensions>true</extensions>
<configuration>
<replacePropertyVariables>asm.version,jackrabbit.version,groovy.version,oak.version,slf4j.version,composum.nodes.version,jackson.version</replacePropertyVariables>