Author: olli
Date: Tue Oct 13 13:40:19 2015
New Revision: 1708393
URL: http://svn.apache.org/viewvc?rev=1708393&view=rev
Log:
SLING-3027 use properties for Jackrabbit and Oak’s versions
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml?rev=1708393&r1=1708392&r2=1708393&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
Tue Oct 13 13:40:19 2015
@@ -35,6 +35,11 @@
<name>Apache Sling Launchpad Karaf - Features</name>
<description>Apache Sling Features for provisioning with Apache
Karaf</description>
+ <properties>
+ <org.apache.jackrabbit.version>2.11.1</org.apache.jackrabbit.version>
+
<org.apache.jackrabbit.oak.version>1.4-SNAPSHOT</org.apache.jackrabbit.oak.version>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1708393&r1=1708392&r2=1708393&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Tue Oct 13 13:40:19 2015
@@ -339,13 +339,13 @@
</feature>
<!-- Apache Jackrabbit -->
<feature name="jackrabbit-sling" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/2.11.1</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/2.11.1</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.11.1</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.11.1</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi/2.11.1</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.11.1</bundle>
- <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.11.1</bundle>
+
<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>
<!-- dependencies -->
<bundle>mvn:javax.jcr/jcr/2.0</bundle>
<!-- TODO... -->
@@ -366,10 +366,10 @@
</feature>
<!-- Apache Jackrabbit Oak-->
<feature name="oak-sling" version="${project.version}">
- <bundle>mvn:org.apache.jackrabbit/oak-core/1.3.7</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-commons/1.3.7</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-lucene/1.3.7</bundle>
- <bundle>mvn:org.apache.jackrabbit/oak-blob/1.3.7</bundle>
+
<bundle>mvn:org.apache.jackrabbit/oak-core/${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-lucene/${org.apache.jackrabbit.oak.version}</bundle>
+
<bundle>mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">jackrabbit-sling</feature>
