Author: olli
Date: Fri Apr 29 08:27:57 2016
New Revision: 1741574
URL: http://svn.apache.org/viewvc?rev=1741574&view=rev
Log:
SLING-5699 Update Apache Karaf to 4.0.5
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml?rev=1741574&r1=1741573&r2=1741574&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
Fri Apr 29 08:27:57 2016
@@ -38,10 +38,10 @@
<!--
https://github.com/apache/karaf/blob/master/assemblies/apache-karaf/pom.xml -->
<properties>
- <org.apache.karaf.version>4.0.4</org.apache.karaf.version>
- <servicemix.specs.version>2.5.0</servicemix.specs.version>
+ <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
+ <servicemix.specs.version>2.7.0</servicemix.specs.version>
<xerces.version>2.11.0</xerces.version>
- <xalan.bundle.version>2.7.2_2</xalan.bundle.version>
+ <xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
</properties>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties?rev=1741574&r1=1741573&r2=1741574&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
Fri Apr 29 08:27:57 2016
@@ -20,10 +20,10 @@
# Bundles to be started on startup, with startlevel
mvn\:org.apache.sshd/sshd-core/0.14.0 = 20
mvn\:org.apache.felix/org.apache.felix.metatype/1.1.2 = 5
-mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.4 = 5
-mvn\:org.ops4j.pax.url/pax-url-aether/2.4.5 = 5
+mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.5 = 5
+mvn\:org.ops4j.pax.url/pax-url-aether/2.4.7 = 5
mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.5 = 8
mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.5 = 8
mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.8 = 10
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.0 = 11
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.4 = 15
+mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.4 = 11
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.5 = 15
