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/03/17 22:54:51 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(798e544 -> 5a07013)
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 798e544 SLING-7442 Upgrade Karaf Features to Oak 1.8
new 4f863ad remove bundle versions
new a35fbd1 remove version property
new 5a07013 decouple versions
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:
pom.xml | 11 ++-------
src/main/feature/feature.xml | 54 ++++++++++++++++++++++----------------------
2 files changed, 29 insertions(+), 36 deletions(-)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 02/03: remove version
property
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 a35fbd16c3d219563c09422f5922d5b41a651560
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 17 21:45:40 2018 +0100
remove version property
---
pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad892e0..df18ca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,10 +35,6 @@
<name>Apache Sling - Karaf Features</name>
<description>Apache Sling Features for provisioning with Apache Karaf</description>
- <properties>
- <org.apache.karaf.version>4.2.0.M2</org.apache.karaf.version>
- </properties>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git</developerConnection>
@@ -50,7 +46,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${org.apache.karaf.version}</version>
+ <version>4.2.0.M2</version>
<extensions>true</extensions>
<executions>
<execution>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 03/03: decouple versions
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 5a070137c044a17a9579b4a4c44358e2a3e03868
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 17 21:49:35 2018 +0100
decouple versions
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index df18ca5..9431c70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-features] 01/03: remove bundle
versions
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 4f863ad1f026c92a21c31e4f8ae63a3234c2a21b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 17 20:47:36 2018 +0100
remove bundle versions
---
pom.xml | 3 ---
src/main/feature/feature.xml | 54 ++++++++++++++++++++++----------------------
2 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index fff6fb3..ad892e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,6 @@
<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.2</org.apache.jackrabbit.oak.version>
- <org.apache.tika.version>1.17</org.apache.tika.version>
</properties>
<scm>
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index e738ad8..f20bdc8 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -201,8 +201,8 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">jackrabbit-vault</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/${org.apache.jackrabbit.version}</bundle>
- <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${org.apache.jackrabbit.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.16.1</bundle>
+ <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.16.1</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
</feature>
<feature name="sling-healthcheck" version="${project.version}">
@@ -445,18 +445,18 @@
<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>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.8.2</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.jackrabbit/oak-store-document/1.8.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0</bundle>
</feature>
<feature name="sling-quickstart-oak-mongo" 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.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/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-document/${org.apache.jackrabbit.oak.version}</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-document/1.8.2</bundle>
<bundle>mvn:com.h2database/h2-mvstore/1.4.196</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/3.6.3</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.2.0</bundle>
@@ -559,13 +559,13 @@
</feature>
<!-- Apache Jackrabbit -->
<feature name="jackrabbit" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/${org.apache.jackrabbit.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/${org.apache.jackrabbit.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${org.apache.jackrabbit.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/${org.apache.jackrabbit.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/${org.apache.jackrabbit.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/${org.apache.jackrabbit.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/${org.apache.jackrabbit.version}</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/2.16.1</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.16.1</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.16.1</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.16.1</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/2.16.1</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.16.1</bundle>
+ <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.16.1</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>
@@ -584,17 +584,17 @@
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle>
</feature>
<feature name="jackrabbit-oak" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/oak-api/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-core-spi/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-jcr/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-query-spi/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-security-spi/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-composite/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-store-spi/${org.apache.jackrabbit.oak.version}</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-api/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-blob-plugins/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-commons/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-core-spi/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-jcr/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-query-spi/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-security-spi/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-composite/1.8.2</bundle>
+ <bundle>mvn:org.apache.jackrabbit/oak-store-spi/1.8.2</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">jackrabbit</feature>
@@ -611,8 +611,8 @@
</feature>
<!-- Apache Tika -->
<feature name="tika" version="${project.version}">
- <bundle>mvn:org.apache.tika/tika-core/${org.apache.tika.version}</bundle>
- <bundle>mvn:org.apache.tika/tika-parsers/${org.apache.tika.version}</bundle>
+ <bundle>mvn:org.apache.tika/tika-core/1.17</bundle>
+ <bundle>mvn:org.apache.tika/tika-parsers/1.17</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.13</bundle>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.