Author: gnodet
Date: Fri Apr 6 07:54:47 2012
New Revision: 1310211
URL: http://svn.apache.org/viewvc?rev=1310211&view=rev
Log:
[KARAF-855][KARAF-854][KARAF-770] Upgrade to OSGi r4.3, felix 4.0 and equinox
3.7
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
karaf/branches/karaf-2.3.x/pom.xml
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties?rev=1310211&r1=1310210&r2=1310211&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
Fri Apr 6 07:54:47 2012
@@ -57,18 +57,24 @@ karaf.framework.felix=${karaf.default.re
#
# Framework config properties.
#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
- org.osgi.framework.launch; version=1.0.0, \
- org.osgi.framework.hooks.service; 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, \
- org.osgi.util.tracker; version=1.4.0, \
- org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
- org.apache.karaf.version; version=${karaf.osgi.version}, \
+org.osgi.framework.system.packages= \
+ org.osgi.framework.startlevel;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.wiring;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.hooks.bundle;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.hooks.service;uses:="org.osgi.framework";version="1.1", \
+
org.osgi.framework.hooks.resolver;uses:="org.osgi.framework.wiring";version="1.0",
\
+ org.osgi.framework.launch;uses:="org.osgi.framework";version="1.0", \
+
org.osgi.framework;version="1.6",org.osgi.framework.hooks.weaving;uses:="org.osgi.framework.wiring";version="1.0",
\
+ org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2", \
+ org.osgi.service.url;version="1.0", \
+ org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1", \
+ org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5", \
+ org.apache.karaf.jaas.boot;version="${karaf.osgi.version}", \
+ org.apache.karaf.version;version="${karaf.osgi.version}", \
${jre-${java.specification.version}}
-org.osgi.framework.system.packages.extra=
+# Extra packages appended after standard packages
+# org.osgi.framework.system.packages.extra=
# javax.transaction is needed to avoid class loader constraint violation when
using javax.sql
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1310211&r1=1310210&r2=1310211&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Fri Apr 6 07:54:47 2012
@@ -118,11 +118,11 @@
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<easymock.version>3.1</easymock.version>
- <equinox.version>3.6.2.R36x_v20110210</equinox.version>
+ <equinox.version>3.7.1.R37x_v20110808-1106</equinox.version>
<felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<felix.fileinstall.version>3.2.0</felix.fileinstall.version>
- <felix.framework.version>3.0.9</felix.framework.version>
+ <felix.framework.version>4.0.2</felix.framework.version>
<felix.gogo.version>0.10.0</felix.gogo.version>
<felix.plugin.version>2.3.7</felix.plugin.version>
<felix.utils.version>1.1.0</felix.utils.version>
