You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/01/15 20:00:34 UTC
svn commit: r1652223 - in /sling/trunk/launchpad: base/pom.xml
base/src/main/resources/sling.properties builder/pom.xml
builder/src/main/bundles/list.xml
Author: cziegeler
Date: Thu Jan 15 19:00:34 2015
New Revision: 1652223
URL: http://svn.apache.org/r1652223
Log:
SLING-4317 : Update to R6 OSGi framework
Modified:
sling/trunk/launchpad/base/pom.xml
sling/trunk/launchpad/base/src/main/resources/sling.properties
sling/trunk/launchpad/builder/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1652223&r1=1652222&r2=1652223&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Thu Jan 15 19:00:34 2015
@@ -32,7 +32,7 @@
This version is a concatenation of the framework version and a version for the launchpad base itself.
For a release only the qualifier (launchpad base version) is increased.
-->
- <version>4.4.1-2.5.3-SNAPSHOT</version>
+ <version>4.6.0-2.5.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Base</name>
@@ -258,7 +258,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.4.1</version>
+ <version>4.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: sling/trunk/launchpad/base/src/main/resources/sling.properties
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=1652223&r1=1652222&r2=1652223&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ sling/trunk/launchpad/base/src/main/resources/sling.properties Thu Jan 15 19:00:34 2015
@@ -206,20 +206,26 @@ sling.bootdelegation.ibm = com.ibm.xml.*
# Only provide the OSGi packages contained in the Apache Felix framework itself
sling.osgi-core-packages= \
- org.osgi.framework; version=1.7.0, \
+ org.osgi.dto; version=1.0.0, \
+ org.osgi.framework; version=1.8.0, \
+ org.osgi.framework.dto; version=1.8.0, \
org.osgi.framework.hooks.bundle; version=1.1.0, \
org.osgi.framework.hooks.resolver; version=1.0.0, \
org.osgi.framework.hooks.service; version=1.1.0, \
- org.osgi.framework.hooks.weaving; version=1.0.0, \
- org.osgi.framework.launch; version=1.1.0, \
- org.osgi.framework.namespace; version=1.0.0, \
+ org.osgi.framework.hooks.weaving; version=1.1.0, \
+ org.osgi.framework.launch; version=1.2.0, \
+ org.osgi.framework.namespace; version=1.1.0, \
org.osgi.framework.startlevel; version=1.0.0, \
- org.osgi.framework.wiring; version=1.1.0, \
+ org.osgi.framework.startlevel.dto; version=1.0.0, \
+ org.osgi.framework.wiring; version=1.2.0, \
+ org.osgi.framework.wiring.dto; version=1.2.0, \
org.osgi.resource; version=1.0.0, \
+ org.osgi.resource.dto; version=1.0.0, \
org.osgi.service.packageadmin; version=1.2.0, \
org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0
+
# Only provide the tracker (from the Apache felix framework)
sling.osgi-compendium-services= \
org.osgi.util.tracker;version="1.5.1"
\ No newline at end of file
Modified: sling/trunk/launchpad/builder/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1652223&r1=1652222&r2=1652223&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Thu Jan 15 19:00:34 2015
@@ -306,7 +306,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.4.1-2.5.2</version>
+ <version>4.6.0-2.5.3-SNAPSHOT</version>
<classifier>webapp</classifier>
<type>war</type>
<scope>runtime</scope>
@@ -314,7 +314,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.4.1-2.5.2</version>
+ <version>4.6.0-2.5.3-SNAPSHOT</version>
<classifier>app</classifier>
<scope>provided</scope>
</dependency>
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1652223&r1=1652222&r2=1652223&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Jan 15 19:00:34 2015
@@ -235,7 +235,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.3.12</version>
+ <version>2.4.1-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>