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 2020/10/17 14:05:49 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(c0dc396 -> 0b587ba)
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 c0dc396 Adding sonarqube badges as per SLING-9682
new c67a4a8 SLING-8888 Upgrade Karaf to 4.3.0
new d981410 SLING-9837 Use OSGi R7 HTTP Service
new d6b7a34 SLING-3027 Improve Launchpad Karaf Features
new 0b587ba SLING-3027 Improve Launchpad Karaf Features
The 4 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 | 2 +-
src/main/feature/feature.xml | 70 +++++++++++++++++++++-----------------------
2 files changed, 35 insertions(+), 37 deletions(-)
[sling-org-apache-sling-karaf-features] 04/04: 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 0b587ba854104e2bc76c254dd1a7b0d34ac9203b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 17 10:10:35 2020 +0200
SLING-3027 Improve Launchpad Karaf Features
add eventadmin dependency to felix-healthcheck
---
src/main/feature/feature.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index bf5c423..10f312e 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -592,6 +592,7 @@
<bundle>mvn:org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.6</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.healthcheck.webconsoleplugin/2.0.2</bundle>
<!-- dependencies -->
+ <feature>eventadmin</feature>
<feature>scr</feature>
<feature>webconsole</feature>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.11</bundle>
[sling-org-apache-sling-karaf-features] 01/04: SLING-8888 Upgrade
Karaf to 4.3.0
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 c67a4a84563e89fcff8ebfc0526df9c3f48dbd28
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 17 08:23:52 2020 +0200
SLING-8888 Upgrade Karaf to 4.3.0
using snapshot for new R7 features
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 55e1c14..e87ea9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>4.3.0.RC1</version>
+ <version>4.3.0-SNAPSHOT</version>
<extensions>true</extensions>
<executions>
<execution>
[sling-org-apache-sling-karaf-features] 02/04: SLING-9837 Use OSGi
R7 HTTP Service
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 d981410f6d58a9c9937e73f22e0a12c20e4428b0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 17 08:40:03 2020 +0200
SLING-9837 Use OSGi R7 HTTP Service
---
src/main/feature/feature.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 4727968..734bc6e 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -36,8 +36,7 @@
<feature>eventadmin</feature>
<feature>scr</feature>
<feature>management</feature>
- <feature>http</feature>
- <feature>http-whiteboard</feature>
+ <feature>felix-http</feature>
<feature version="${project.version}">sling-commons-fsclassloader</feature>
<feature version="${project.version}">sling-commons-osgi</feature>
<feature version="${project.version}">sling-commons-scheduler</feature>
@@ -51,8 +50,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>
- <!-- FIX PAXWEB-1250 -->
- <!-- <bundle dependency="true">mvn:org.osgi/org.osgi.service.http.whiteboard/1.1.0</bundle> -->
<capability>
osgi.service;objectClass=org.apache.sling.engine.SlingRequestProcessor <!-- provided by engine -->
</capability>
@@ -534,6 +531,8 @@
<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.taglib/2.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.el-api/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-commons-compiler</feature>
[sling-org-apache-sling-karaf-features] 03/04: 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 d6b7a34f2e165e80eb7b23ed2da6c3d71a913d0d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 17 10:03:47 2020 +0200
SLING-3027 Improve Launchpad Karaf Features
use latest working releases
---
src/main/feature/feature.xml | 62 +++++++++++++++++++++-----------------------
1 file changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 734bc6e..bf5c423 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -22,10 +22,9 @@
<feature name="sling" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</config>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.4.4</bundle>
- <!-- next engine 2.6.22 has new requirements, FIX PAXWEB-1251 -->
- <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.6.20</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.16</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>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.4.0</bundle>
<!-- Apache Sling Commons -->
@@ -41,10 +40,10 @@
<feature version="${project.version}">sling-commons-osgi</feature>
<feature version="${project.version}">sling-commons-scheduler</feature>
<feature version="${project.version}">sling-commons-threads</feature>
- <bundle dependency="true">mvn:commons-codec/commons-codec/1.14</bundle>
+ <bundle dependency="true">mvn:commons-codec/commons-codec/1.15</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
<bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.4</bundle>
- <bundle dependency="true">mvn:commons-io/commons-io/2.7</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/2.8.0</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-collections4/4.4</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.11</bundle>
@@ -66,7 +65,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.commons.clam/2.0.0</bundle>
<!-- dependencies -->
<feature>scr</feature>
- <bundle dependency="true">mvn:commons-io/commons-io/2.7</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/2.8.0</bundle>
</feature>
<feature name="sling-commons-compiler" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.compiler/2.4.0</bundle>
@@ -91,7 +90,7 @@
<feature>webconsole</feature>
<feature version="${project.version}">sling-commons-classloader</feature>
<feature version="${project.version}">sling-commons-osgi</feature>
- <bundle dependency="true">mvn:commons-io/commons-io/2.7</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/2.8.0</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.11</bundle>
</feature>
<feature name="sling-commons-html" version="${project.version}">
@@ -175,7 +174,6 @@
</feature>
<feature name="sling-discovery" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -186,6 +184,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.30</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.6</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${project.version}">sling-discovery</feature>
@@ -231,7 +230,7 @@
<feature version="${project.version}">jackrabbit-vault</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/oak-jackrabbit-api/1.32.0</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/oak-jackrabbit-api/1.34.0</bundle>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.20.1</bundle>
</feature>
<feature name="sling-healthcheck" version="${project.version}">
@@ -313,7 +312,7 @@
<feature version="${project.version}">sling-commons-html</feature>
</feature>
<feature name="sling-security" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.12</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.20</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -456,10 +455,10 @@
<config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config>
<config external="true" name="org.apache.jackrabbit.oak.segment.SegmentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</config>
<feature version="${project.version}">sling-quickstart-oak</feature>
- <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.32.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.34.0</bundle>
<!-- OAK-7263 oak-lucene should not depend on oak-store-document -->
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.32.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.34.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.4</bundle>
<!-- capabilities -->
<!-- OAK-7380 Add missing OSGi capabilities -->
@@ -474,8 +473,8 @@
<config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config>
<config external="true" name="org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</config>
<feature version="${project.version}">sling-quickstart-oak</feature>
- <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.32.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.34.0</bundle>
<bundle>mvn:com.h2database/h2-mvstore/1.4.200</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/3.12.7</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.4</bundle>
@@ -543,8 +542,7 @@
<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.js.provider/1.2.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.10</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>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -607,7 +605,7 @@
</feature>
<!-- Apache Jackrabbit -->
<feature name="jackrabbit" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/oak-jackrabbit-api/1.32.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-jackrabbit-api/1.34.0</bundle>
<bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.20.1</bundle>
<bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.20.1</bundle>
<bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.20.1</bundle>
@@ -618,10 +616,10 @@
<feature version="${project.version}">httpcomponents-client</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
- <bundle dependency="true">mvn:commons-codec/commons-codec/1.14</bundle>
+ <bundle dependency="true">mvn:commons-codec/commons-codec/1.15</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
<bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.4</bundle>
- <bundle dependency="true">mvn:commons-io/commons-io/2.7</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/2.8.0</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.1</bundle>
@@ -630,17 +628,17 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
</feature>
<feature name="jackrabbit-oak" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/oak-api/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-commons/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.32.0</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.32.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-api/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-commons/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.34.0</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.34.0</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">sling-commons-metrics</feature>