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 2018/08/30 20:54:19 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(185e6f4 -> 7f15815)
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 185e6f4 SLING-7835 SLING-7831 switch to snapshot builds of usermanager/accessmanager bundles in the karaf feature to fix some new tests in the org-apache-sling-karaf-launchpad-oak-tar-integration-tests job
new 048b259 SLING-3027 Improve Launchpad Karaf Features
new acfd99d SLING-7873 Update to Sling Parent 34
new 66e116e SLING-7874 Update Karaf to 4.2.1
new 7f15815 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 | 4 +-
src/main/feature/feature.xml | 139 +++++++++++++++++++++----------------------
2 files changed, 71 insertions(+), 72 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 7f1581539b13fce04e7bc62bab14db7fc99bce46
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 30 22:48:09 2018 +0200
SLING-3027 Improve Launchpad Karaf Features
use latest releases and required snapshots
---
src/main/feature/feature.xml | 102 +++++++++++++++++++++----------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index a46370c..207c35d 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,15 +21,15 @@
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.4.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.6.12</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.6.14</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.9-SNAPSHOT</bundle>
<!-- Apache Sling Commons -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.1.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.10</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.2.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
<!-- dependencies -->
<feature>config</feature>
@@ -47,7 +47,7 @@
<bundle dependency="true">mvn:commons-io/commons-io/2.6</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-collections4/4.1</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.7</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.8</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
<!-- capabilities -->
<!-- https://github.com/bndtools/bnd/issues/2429 -->
@@ -91,7 +91,7 @@
<feature version="${project.version}">sling-commons-classloader</feature>
<bundle dependency="true">mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/2.6</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.7</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.8</bundle>
</feature>
<feature name="sling-commons-html" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.html/1.0.2</bundle>
@@ -108,8 +108,8 @@
<feature>scr</feature>
<feature version="${project.version}">sling-commons-messaging</feature>
<feature version="${project.version}">sling-commons-threads</feature>
- <bundle dependency="true">mvn:com.sun.mail/javax.mail/1.6.1</bundle>
- <bundle dependency="true">mvn:javax.mail/javax.mail-api/1.6.1</bundle>
+ <bundle dependency="true">mvn:com.sun.mail/javax.mail/1.6.2</bundle>
+ <bundle dependency="true">mvn:javax.mail/javax.mail-api/1.6.2</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-email/1.5</bundle>
</feature>
<feature name="sling-commons-metrics" version="${project.version}">
@@ -139,7 +139,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-bundleresource" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.3.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -169,7 +169,7 @@
<feature>webconsole</feature>
<feature version="${project.version}">sling-discovery</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="sling-discovery-oak" version="${project.version}">
@@ -183,7 +183,7 @@
<feature version="${project.version}">sling-discovery</feature>
<feature version="${project.version}">sling-healthcheck</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="sling-discovery-standalone" version="${project.version}">
@@ -193,14 +193,14 @@
</feature>
<feature name="sling-distribution" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.distribution.api/0.3.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.distribution.core/0.2.10</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.distribution.core/0.3.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-event</feature>
<feature version="${project.version}">sling-healthcheck</feature>
<feature version="${project.version}">jackrabbit-vault</feature>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="sling-event" version="${project.version}">
@@ -331,15 +331,16 @@
<feature name="sling-xss" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.xss/2.0.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.xss/2.0.12</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<!-- Apache Sling Installer -->
<feature name="sling-installer" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.installer.console/1.0.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.installer.core/3.8.13-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.installer.core/3.9.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -371,11 +372,10 @@
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.0.5-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.3-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.2.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.10</bundle>
<!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/3.0.10</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/3.0.16</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.3.8</bundle>
<!-- dependencies -->
@@ -425,7 +425,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.nosql.mongodb-resourceprovider/1.1.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-nosql-generic</feature>
- <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.7.1</bundle>
+ <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.8.1</bundle>
</feature>
<!-- Apache Sling Quickstart -->
<feature name="sling-quickstart-nosql-couchbase" version="${project.version}">
@@ -470,10 +470,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.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.8.4</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.8.6</bundle>
<!-- OAK-7263 oak-lucene should not depend on oak-store-document -->
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.4</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.1-SNAPSHOT</bundle>
<!-- capabilities -->
<!-- OAK-7380 Add missing OSGi capabilities -->
@@ -486,10 +486,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.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.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.4</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.6</bundle>
<bundle>mvn:com.h2database/h2-mvstore/1.4.197</bundle>
- <bundle>mvn:org.mongodb/mongo-java-driver/3.7.1</bundle>
+ <bundle>mvn:org.mongodb/mongo-java-driver/3.8.1</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.1-SNAPSHOT</bundle>
<!-- capabilities -->
<!-- OAK-7380 Add missing OSGi capabilities -->
@@ -549,9 +549,9 @@
</feature>
<feature name="sling-scripting-sightly" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.52-1.3.1</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.20-1.3.1</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.22-1.3.1</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.54-1.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.22-1.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.26-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.26</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.6</bundle>
<!-- dependencies -->
@@ -581,7 +581,7 @@
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.30</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.33-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.26</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.4.22</bundle>
<!-- dependencies -->
@@ -620,21 +620,21 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="jackrabbit-oak" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/oak-api/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-commons/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.8.4</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.8.4</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-api/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-commons/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.8.6</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.8.6</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">sling-commons-metrics</feature>
@@ -656,7 +656,7 @@
</capability>
</feature>
<feature name="jackrabbit-vault" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.44</bundle>
+ <bundle>mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.2.0</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">jackrabbit</feature>
@@ -665,8 +665,8 @@
<feature name="tika" version="${project.version}">
<bundle>mvn:org.apache.tika/tika-core/1.18</bundle>
<bundle>mvn:org.apache.tika/tika-parsers/1.18</bundle>
- <bundle>mvn:org.apache.pdfbox/pdfbox/2.0.8</bundle>
- <bundle>mvn:org.apache.pdfbox/fontbox/2.0.8</bundle>
+ <bundle>mvn:org.apache.pdfbox/pdfbox/2.0.11</bundle>
+ <bundle>mvn:org.apache.pdfbox/fontbox/2.0.11</bundle>
<bundle>mvn:org.apache.pdfbox/jempbox/1.8.15</bundle>
</feature>
<!-- Apache Sling Samples -->
@@ -686,12 +686,12 @@
<!-- Composum -->
<feature name="composum" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</config>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.8.4</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.8.4</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.8.4</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.8.4</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.8.4</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.8.4</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.9.0</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.9.0</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.9.0</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.9.0</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.9.0</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.9.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
[sling-org-apache-sling-karaf-features] 02/04: SLING-7873 Update to
Sling Parent 34
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 acfd99d4af515cf59bf51d51a0bcf77c38863382
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 30 22:25:55 2018 +0200
SLING-7873 Update to Sling Parent 34
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5f7dd97..44cbed0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath/>
</parent>
[sling-org-apache-sling-karaf-features] 03/04: SLING-7874 Update
Karaf to 4.2.1
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 66e116e3fd364092538ecb3a5165588007baaa46
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 30 22:32:54 2018 +0200
SLING-7874 Update Karaf to 4.2.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 44cbed0..74cb921 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.2.0</version>
+ <version>4.2.1</version>
<extensions>true</extensions>
<executions>
<execution>
[sling-org-apache-sling-karaf-features] 01/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 048b259a7ae8d2fb73f3ccabd11870be750c75fb
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Aug 8 19:14:31 2018 +0200
SLING-3027 Improve Launchpad Karaf Features
use latest releases
---
src/main/feature/feature.xml | 53 ++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index f2c780a..a46370c 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,10 +21,10 @@
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.api/2.18.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.4.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.6.12</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.6.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.9-SNAPSHOT</bundle>
<!-- Apache Sling Commons -->
@@ -128,7 +128,7 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
</feature>
<feature name="sling-commons-threads" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.17-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.18</bundle>
<!-- dependencies -->
<feature>config</feature>
</feature>
@@ -170,7 +170,7 @@
<feature version="${project.version}">sling-discovery</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="sling-discovery-oak" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</config>
@@ -184,7 +184,7 @@
<feature version="${project.version}">sling-healthcheck</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="sling-discovery-standalone" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.2</bundle>
@@ -201,12 +201,12 @@
<feature version="${project.version}">sling-healthcheck</feature>
<feature version="${project.version}">jackrabbit-vault</feature>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="sling-event" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.11-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.12</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -225,8 +225,8 @@
<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/jackrabbit-api/2.16.2</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.16.2</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.16.3</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.16.3</bundle>
</feature>
<feature name="sling-healthcheck" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.hc.api/1.0.2</bundle>
@@ -572,12 +572,11 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-i18n</feature>
- <feature prerequisite="true">wrap</feature>
- <bundle dependency="true">wrap:mvn:org.thymeleaf/thymeleaf/3.0.9.RELEASE</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.thymeleaf/3.0.9.RELEASE_1</bundle>
<bundle dependency="true">mvn:org.attoparser/attoparser/2.0.5.RELEASE</bundle>
<bundle dependency="true">mvn:org.unbescape/unbescape/1.1.6.RELEASE</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.1_1</bundle>
- <bundle dependency="true">mvn:org.javassist/javassist/3.22.0-GA</bundle>
+ <bundle dependency="true">mvn:org.javassist/javassist/3.23.1-GA</bundle>
</feature>
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
@@ -600,13 +599,13 @@
</feature>
<!-- Apache Jackrabbit -->
<feature name="jackrabbit" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/2.16.2</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.16.2</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.16.2</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.16.2</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/2.16.2</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.16.2</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.16.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/2.16.3</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.16.3</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.16.3</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.16.3</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/2.16.3</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.16.3</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.16.3</bundle>
<!-- dependencies -->
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
@@ -622,7 +621,7 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.6</bundle>
</feature>
<feature name="jackrabbit-oak" version="${project.version}">
<bundle>mvn:org.apache.jackrabbit/oak-api/1.8.4</bundle>
@@ -668,7 +667,7 @@
<bundle>mvn:org.apache.tika/tika-parsers/1.18</bundle>
<bundle>mvn:org.apache.pdfbox/pdfbox/2.0.8</bundle>
<bundle>mvn:org.apache.pdfbox/fontbox/2.0.8</bundle>
- <bundle>mvn:org.apache.pdfbox/jempbox/1.8.14</bundle>
+ <bundle>mvn:org.apache.pdfbox/jempbox/1.8.15</bundle>
</feature>
<!-- Apache Sling Samples -->
<feature name="sling-samples-fling" version="${project.version}">
@@ -687,12 +686,12 @@
<!-- Composum -->
<feature name="composum" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</config>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.8.3</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.8.3</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.8.3</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.8.3</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.8.3</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.8.3</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.8.4</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.8.4</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.8.4</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.8.4</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.8.4</bundle>
+ <bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.8.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>