Author: cziegeler
Date: Wed Aug 20 05:47:42 2008
New Revision: 687296
URL: http://svn.apache.org/viewvc?rev=687296&view=rev
Log:
SLING-623 : Upgrade to R4.1 spec
Modified:
incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
incubator/sling/trunk/parent/pom.xml
Modified:
incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=687296&r1=687295&r2=687296&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
(original)
+++ incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
Wed Aug 20 05:47:42 2008
@@ -126,30 +126,41 @@
# osgi-compendium-services : OSGi Compendium Specification packages
#
-
osgi-core-packages= \
- org.osgi.framework; version=1.3.0, \
+ org.osgi.framework; version=1.4.0, \
org.osgi.service.condpermadmin; version=1.0.0, \
org.osgi.service.packageadmin; version=1.2.0, \
org.osgi.service.permissionadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0
osgi-compendium-services= \
- org.osgi.service.cm; version=1.2, \
- org.osgi.service.component; version=1.0, \
- org.osgi.service.device; version=1.1, \
- org.osgi.service.event; version=1.1, \
- org.osgi.service.http; version=1.2, \
- org.osgi.service.io; version=1.0, \
org.osgi.service.log; version=1.3, \
+ org.osgi.service.http; version=1.2, \
+ org.osgi.service.device; version=1.1, \
+ org.osgi.service.cm; version=1.2, \
org.osgi.service.metatype; version=1.1, \
org.osgi.service.prefs; version=1.1, \
- org.osgi.service.provisioning; version=1.1, \
- org.osgi.service.upnp; version=1.1, \
org.osgi.service.useradmin; version=1.1, \
org.osgi.service.wireadmin; version=1.0, \
- org.osgi.util.measurement; version=1.0, \
- org.osgi.util.position; version=1.0, \
+ org.osgi.service.io; version=1.0, \
+ org.osgi.service.provisioning; version=1.1, \
+ org.osgi.service.upnp; version=1.1, \
+ org.osgi.service.component; version=1.0, \
+ org.osgi.service.event; version=1.1, \
+ org.osgi.service.deploymentadmin; version=1.0, \
+ org.osgi.service.deploymentadmin.spi; version=1.0, \
+ org.osgi.service.application; version=1.0, \
+ info.dmtree; version=1.0, \
+ info.dmtree.notification; version=1.0, \
+ info.dmtree.notification.spi; version=1.0, \
+ info.dmtree.registry; version=1.0, \
+ info.dmtree.security; version=1.0, \
+ info.dmtree.spi; version=1.0, \
+ org.osgi.service.monitor; version=1.0, \
+ org.osgi.application; version=1.0, \
org.osgi.util.tracker; version=1.3.2, \
- org.osgi.util.xml; version=1.0
+ org.osgi.util.xml; version=1.0, \
+ org.osgi.util.position; version=1.0, \
+ org.osgi.util.measurement; version=1.0
+
\ No newline at end of file
Modified: incubator/sling/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=687296&r1=687295&r2=687296&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Wed Aug 20 05:47:42 2008
@@ -442,13 +442,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.1</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
