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/02/14 11:28:20 UTC
[sling-org-apache-sling-karaf-features] branch feature/oak-1.8
updated (d5f001d -> f6cde29)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git.
from d5f001d SLING-7489 Update Jackrabbit to 2.16.1
new 3224673 SLING-3027 Improve Launchpad Karaf Features
new 7beda4d SLING-7489 Update Jackrabbit to 2.16.1
new 809c597 SLING-7442 Upgrade Karaf Features to Oak 1.8
new f6cde29 SLING-7442 Upgrade Karaf Features to Oak 1.8
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 | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 03/04: SLING-7442 Upgrade
Karaf Features to Oak 1.8
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 809c597ca8dac7d45ecafd5ce4f3538a0aaf20fa
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Feb 14 11:53:22 2018 +0100
SLING-7442 Upgrade Karaf Features to Oak 1.8
use Oak 1.8.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a7c2faa..fff6fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<properties>
<org.apache.karaf.version>4.2.0.M2</org.apache.karaf.version>
<org.apache.jackrabbit.version>2.16.1</org.apache.jackrabbit.version>
- <org.apache.jackrabbit.oak.version>1.8.1</org.apache.jackrabbit.oak.version>
+ <org.apache.jackrabbit.oak.version>1.8.2</org.apache.jackrabbit.oak.version>
<org.apache.tika.version>1.17</org.apache.tika.version>
</properties>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 04/04: SLING-7442 Upgrade
Karaf Features to Oak 1.8
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit f6cde29088cefb44276af64f8aadccd370547b6e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Feb 14 12:01:40 2018 +0100
SLING-7442 Upgrade Karaf Features to Oak 1.8
re-add oak-lucene to sling-quickstart-oak-tar (OAK-7263)
---
src/main/feature/feature.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index ba93f82..c142f3d 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -450,9 +450,13 @@
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4</bundle>
</feature>
<feature name="sling-quickstart-oak-tar" version="${project.version}">
+ <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/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-segment-tar/${org.apache.jackrabbit.oak.version}</bundle>
+ <!-- OAK-7263 oak-lucene should not depend on oak-store-document -->
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0-SNAPSHOT</bundle>
</feature>
<feature name="sling-quickstart-oak-mongo" version="${project.version}">
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 02/04: SLING-7489 Update
Jackrabbit to 2.16.1
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 7beda4d93fdde5cafe48fb5fda5cbb041ee7bf02
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Feb 14 10:51:35 2018 +0100
SLING-7489 Update Jackrabbit to 2.16.1
remove unused Guava dependency
---
src/main/feature/feature.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index c448278..ba93f82 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -570,7 +570,6 @@
<bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.3</bundle>
<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:com.google.guava/guava/15.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.0.4</bundle>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[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 feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 32246734bc4801b08876ab5d83357287ee452e3f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Feb 14 10:47:47 2018 +0100
SLING-3027 Improve Launchpad Karaf Features
use latest releases
---
src/main/feature/feature.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 2e30538..c448278 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -376,12 +376,12 @@
<feature version="${project.version}">sling-servlets</feature>
</feature>
<feature name="sling-jcr-repoinit" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.repoinit/1.1.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.repoinit/1.1.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-jcr-jackrabbit-security</feature>
- <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.repoinit.parser/1.2.0</bundle>
+ <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.repoinit.parser/1.2.2</bundle>
<bundle dependency="true">mvn:org.apache.sling/org.apache.sling.provisioning.model/1.8.4</bundle>
</feature>
<!-- Apache Sling Launchpad -->
@@ -503,7 +503,7 @@
<!-- dependencies -->
<feature version="${project.version}">sling-scripting</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.2_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.8_1</bundle>
</feature>
<feature name="sling-scripting-jsp" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.3.4</bundle>
@@ -529,7 +529,7 @@
<feature version="${project.version}">sling-xss</feature>
<feature version="${project.version}">sling-commons-compiler</feature>
<feature version="${project.version}">sling-commons-fsclassloader</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.2_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.8_1</bundle>
</feature>
<feature name="sling-scripting-thymeleaf" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</config>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.