Author: olli
Date: Mon Jul 10 20:09:03 2017
New Revision: 1801526
URL: http://svn.apache.org/viewvc?rev=1801526&view=rev
Log:
SLING-3027 Improve Launchpad Karaf Features
use latest releases
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
Modified: sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml?rev=1801526&r1=1801525&r2=1801526&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml Mon Jul 10
20:09:03 2017
@@ -37,8 +37,8 @@
<properties>
<org.apache.karaf.version>4.1.1</org.apache.karaf.version>
- <org.apache.jackrabbit.version>2.14.0</org.apache.jackrabbit.version>
-
<org.apache.jackrabbit.oak.version>1.6.1</org.apache.jackrabbit.oak.version>
+ <org.apache.jackrabbit.version>2.14.1</org.apache.jackrabbit.version>
+
<org.apache.jackrabbit.oak.version>1.6.2</org.apache.jackrabbit.oak.version>
<org.apache.tika.version>1.14</org.apache.tika.version>
<org.apache.sling.karaf-repoinit.version>0.2.0</org.apache.sling.karaf-repoinit.version>
</properties>
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1801526&r1=1801525&r2=1801526&view=diff
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
Mon Jul 10 20:09:03 2017
@@ -22,9 +22,9 @@
<feature name="sling" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</configfile>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.16.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.3.26</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.6.8</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.5.24</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.5.26</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.3.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.8</bundle>
<!-- Apache Sling Commons -->
@@ -43,11 +43,11 @@
<feature version="${project.version}">sling-commons-threads</feature>
<bundle dependency="true">mvn:commons-codec/commons-codec/1.10</bundle>
<bundle
dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
- <bundle
dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.2</bundle>
+ <bundle
dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.3</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/2.5</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.5</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.6</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
</feature>
<!-- Apache Sling Auth -->
@@ -85,7 +85,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.5</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.5</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.6</bundle>
</feature>
<feature name="sling-commons-html" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.html/1.0.0</bundle>
@@ -106,10 +106,10 @@
<bundle dependency="true">mvn:org.apache.commons/commons-email/1.4</bundle>
</feature>
<feature name="sling-commons-metrics" version="${project.version}">
-
<bundle>mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.0</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.2</bundle>
<!-- dependencies -->
<feature>scr</feature>
- <bundle
dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.2.2</bundle>
+ <bundle
dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.2.3</bundle>
</feature>
<feature name="sling-commons-scheduler" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.6.2</bundle>
@@ -135,7 +135,7 @@
</feature>
<feature name="sling-extension-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.base/2.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0</bundle>
<!-- dependencies -->
@@ -152,7 +152,7 @@
</feature>
<feature name="sling-extension-discovery-oak" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</configfile>
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.18</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.20</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${project.version}">sling-extension-discovery</feature>
@@ -165,7 +165,7 @@
</feature>
<feature name="sling-extension-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.6</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.distribution.core/0.2.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
@@ -173,13 +173,11 @@
<feature version="${project.version}">sling-extension-healthcheck</feature>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.3</bundle>
- <bundle
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.38</bundle>
- <!-- TODO -->
- <bundle
dependency="true">mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20</bundle>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.40</bundle>
</feature>
<feature name="sling-extension-event" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</configfile>
- <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -198,13 +196,13 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-extension-fsresource" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/2.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/2.1.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</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.vault/org.apache.jackrabbit.vault/3.1.38</bundle>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.40</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
</feature>
<feature name="sling-extension-healthcheck" version="${project.version}">
@@ -239,9 +237,9 @@
<bundle>mvn:org.apache.sling/org.apache.sling.models.jacksonexporter/1.0.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-extension-models</feature>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.8.8</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.8.8</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.8.8</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.8.9</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.8.9</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.8.9</bundle>
</feature>
<feature name="sling-extension-pipes" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.pipes/0.0.10</bundle>
@@ -259,12 +257,10 @@
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
</feature>
<feature name="sling-extension-resource-inventory"
version="${project.version}">
-
<bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.6</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.4</bundle>
- <!-- TODO -->
- <bundle
dependency="true">mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20</bundle>
</feature>
<feature name="sling-extension-resource-presence"
version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence</configfile>
@@ -273,7 +269,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-extension-resourcemerger" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.resourcemerger/1.3.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.resourcemerger/1.3.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -284,7 +280,7 @@
<feature version="${project.version}">sling-commons-html</feature>
</feature>
<feature name="sling-extension-security" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -344,13 +340,13 @@
<configfile
finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling</configfile>
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource</configfile>
<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.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.0.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.2.2</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.8</bundle>
<!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/3.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/3.0.2</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 -->
@@ -386,7 +382,7 @@
</feature>
<!-- Apache Sling Launchpad -->
<feature name="sling-launchpad-content" version="${project.version}">
-
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.8</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.12</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-auth-form</feature>
@@ -445,7 +441,7 @@
<feature version="${project.version}">sling-launchpad-oak</feature>
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/3.4.2</bundle>
- <bundle>mvn:com.h2database/h2-mvstore/1.4.195</bundle>
+ <bundle>mvn:com.h2database/h2-mvstore/1.4.196</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4</bundle>
</feature>
<!-- Apache Sling NoSQL -->
@@ -488,9 +484,9 @@
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy/2.4.11</bundle>
- <bundle
dependency="true">mvn:org.codehaus.groovy/groovy-json/2.4.11</bundle>
- <bundle
dependency="true">mvn:org.codehaus.groovy/groovy-templates/2.4.11</bundle>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy/2.4.12</bundle>
+ <bundle
dependency="true">mvn:org.codehaus.groovy/groovy-json/2.4.12</bundle>
+ <bundle
dependency="true">mvn:org.codehaus.groovy/groovy-templates/2.4.12</bundle>
</feature>
<feature name="sling-scripting-java" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.java/2.1.2</bundle>
@@ -539,8 +535,8 @@
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-extension-i18n</feature>
<bundle
dependency="true">mvn:org.attoparser/attoparser/2.0.4.RELEASE</bundle>
- <bundle
dependency="true">mvn:org.unbescape/unbescape/1.1.4.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.unbescape/unbescape/1.1.5.RELEASE</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.2_1</bundle>
<bundle dependency="true">mvn:org.javassist/javassist/3.21.0-GA</bundle>
</feature>
<!-- Apache Sling Servlets -->
@@ -567,7 +563,7 @@
<bundle
dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/1.10</bundle>
<bundle
dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
- <bundle
dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.2</bundle>
+ <bundle
dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.3</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/2.5</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
@@ -614,17 +610,17 @@
<!-- Composum -->
<feature name="composum-sling" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</configfile>
-
<bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.7.0</bundle>
-
<bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.7.0</bundle>
-
<bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.7.0</bundle>
-
<bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.7.0</bundle>
-
<bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.7.0</bundle>
+
<bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.8.0</bundle>
+
<bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.8.0</bundle>
+
<bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.8.0</bundle>
+
<bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.8.0</bundle>
+
<bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.8.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-scripting-jsp</feature>
<feature version="${project.version}">sling-extension-event</feature>
- <bundle
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.38</bundle>
+ <bundle
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.40</bundle>
</feature>
<!-- Pax URL (KARAF-4707) -->
<feature name="pax-url-classpath-sling" version="${project.version}">
@@ -634,4 +630,4 @@
<bundle>mvn:org.ops4j.pax.swissbox/pax-swissbox-property/1.8.3</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-classpath/2.5.2</bundle>
</feature>
-</features>
+</features>
\ No newline at end of file
