You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/01/05 11:30:08 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(1cb8fd7 -> 597cc47)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git.
from 1cb8fd7 Fixing bad commit of merge
new 26da350 SLING-9999 Remove cyclic dependency between scripting and servlets features
new cad6258 SLING-3027 Improve Launchpad Karaf Features
new 597cc47 SLING-3027 Improve Launchpad Karaf Features
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:
src/main/feature/feature.xml | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
[sling-org-apache-sling-karaf-features] 01/03: SLING-9999 Remove
cyclic dependency between scripting and servlets features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 26da3506e3af3c2008a524aee3c4f76048230405
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 5 12:22:10 2021 +0100
SLING-9999 Remove cyclic dependency between scripting and servlets features
switch to current SNAPSHOTs
---
src/main/feature/feature.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index ddf99c1..2d37e0d 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,7 +21,7 @@
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.api/2.23.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.api/2.23.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.7.0</bundle>
@@ -503,8 +503,8 @@
<feature name="sling-scripting" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.config</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.2.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.2.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.2.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.3.5-SNAPSHOT</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-commons-compiler</feature>
@@ -543,7 +543,7 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.13_1</bundle>
</feature>
<feature name="sling-scripting-jsp" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.4.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.5.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.el-api/1.0.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.2</bundle>
@@ -555,11 +555,11 @@
</feature>
<feature name="sling-scripting-htl" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.config</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.3.2-1.4.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.6-1.4.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.2.0-1.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.4.7-1.4.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.12-1.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.2.2-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.2.6</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.2.2-1.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.2.4-1.4.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
@@ -587,7 +587,7 @@
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.40</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.36</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.6.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.7.13-SNAPSHOT</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
[sling-org-apache-sling-karaf-features] 03/03: SLING-3027 Improve
Launchpad Karaf Features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 597cc47f1b173e4bc8ca2ba6c34f7b677a1ce81a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 5 12:28:45 2021 +0100
SLING-3027 Improve Launchpad Karaf Features
update Groovy (now fragment bundles)
---
src/main/feature/feature.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 2a11f3e..398f178 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -520,9 +520,9 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">spifly</feature>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy/3.0.1</bundle>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy-json/3.0.1</bundle>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy-templates/3.0.1</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy/3.0.7</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy-json/3.0.7</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy-templates/3.0.7</bundle>
</feature>
<feature name="sling-scripting-java" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.java/2.1.2</bundle>
[sling-org-apache-sling-karaf-features] 02/03: SLING-3027 Improve
Launchpad Karaf Features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit cad6258f9b19ea03cfbd9912e0fb8b043bfef21d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 5 12:25:56 2021 +0100
SLING-3027 Improve Launchpad Karaf Features
switch to current Sling Engine SNAPSHOT with capabilities added
---
src/main/feature/feature.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 2d37e0d..2a11f3e 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -23,7 +23,7 @@
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.23.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.3-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.7.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.4.2</bundle>
@@ -49,10 +49,6 @@
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.11</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
- <capability>
- osgi.service;objectClass=org.apache.sling.engine.SlingRequestProcessor, <!-- provided by engine -->
- osgi.service;objectClass=javax.servlet.ServletContext
- </capability>
</feature>
<feature name="sling-configs" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.karaf-configs/0.1.1-SNAPSHOT</bundle>