You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/02/16 15:04:39 UTC
karaf git commit: [KARAF-3481] Upgrade to OSGi r6
Repository: karaf
Updated Branches:
refs/heads/master 7ab5cda1c -> 228805507
[KARAF-3481] Upgrade to OSGi r6
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/22880550
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/22880550
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/22880550
Branch: refs/heads/master
Commit: 2288055077711d6c7b2f12f18f0e848a743b3672
Parents: 7ab5cda
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Feb 16 15:04:07 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Feb 16 15:04:07 2015 +0100
----------------------------------------------------------------------
assemblies/features/framework/pom.xml | 24 ++++++++++---
.../resources/etc/config.properties | 36 ++++++++++++--------
pom.xml | 12 ++++---
3 files changed, 47 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/22880550/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 52aaffd..b77b23e 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -65,8 +65,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>${equinox.groupId}</groupId>
+ <artifactId>${equinox.artifactId}</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -296,9 +296,9 @@
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <outputDirectory>target/classes/resources/system/org/eclipse/osgi/${equinox.version}</outputDirectory>
+ <groupId>${equinox.groupId}</groupId>
+ <artifactId>${equinox.artifactId}</artifactId>
+ <outputDirectory>target/classes/resources/system/${equinox.path}/${equinox.artifactId}/${equinox.version}</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
@@ -377,6 +377,20 @@
</artifacts>
</configuration>
</execution>
+ <execution>
+ <id>regex-property</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>equinox.path</name>
+ <value>${equinox.groupId}</value>
+ <regex>\.</regex>
+ <replacement>/</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/karaf/blob/22880550/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index 93d6c54..39e0dc5 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -50,27 +50,33 @@ karaf.framework=felix
#
# Location of the OSGi frameworks
#
-karaf.framework.equinox=mvn\:org.eclipse/osgi/${equinox.version}
+karaf.framework.equinox=mvn\:${equinox.groupId}/${equinox.artifactId}/${equinox.version}
karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version}
#
# Framework config properties.
#
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.1", \
- org.osgi.framework.hooks.bundle;uses:="org.osgi.framework";version="1.1", \
- 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.1", \
- org.osgi.framework.namespace;uses:="org.osgi.resource";version="1.0", \
- org.osgi.framework;version="1.7", \
- org.osgi.framework.hooks.weaving;uses:="org.osgi.framework.wiring";version="1.0",\
- org.osgi.resource;version="1.0",org.osgi.service.url;version="1.0",\
- org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1",\
- org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2",\
- org.osgi.service.url;version="1.0", \
- org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \
+ org.osgi.dto;version="1.0",\
+ org.osgi.resource;version="1.0",\
+ org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.8",\
+ org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
+ org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
+ org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
+ org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
+ org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",\
+ org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",\
+ org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",\
+ org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
+ org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
+ org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
+ org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\
+ org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
+ org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
+ org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
+ org.osgi.service.url;version="1.0",\
+ org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
org.apache.karaf.jaas.boot;version="${karaf.osgi.version}", \
org.apache.karaf.jaas.boot.principal;version="${karaf.osgi.version}", \
org.apache.karaf.management.boot;version="${karaf.osgi.version}", \
http://git-wip-us.apache.org/repos/asf/karaf/blob/22880550/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a9e3b4d..6a91b8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,14 +155,16 @@
<geronimo.atinject-spec.version>1.0</geronimo.atinject-spec.version>
<geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
<easymock.version>3.2</easymock.version>
- <equinox.version>3.9.1-v20140110-1610</equinox.version>
+ <equinox.groupId>org.eclipse.birt.runtime</equinox.groupId>
+ <equinox.artifactId>org.eclipse.osgi</equinox.artifactId>
+ <equinox.version>3.10.1.v20140909-1633</equinox.version>
<bndlib.version>2.3.0</bndlib.version>
<equinox.region.version>1.1.0.v20120522-1841</equinox.region.version>
<equinox.coordinator.version>1.1.0.v20120522-1841</equinox.coordinator.version>
<felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
<felix.configadmin.version>1.8.0</felix.configadmin.version>
<felix.fileinstall.version>3.4.3-SNAPSHOT</felix.fileinstall.version>
- <felix.framework.version>4.4.1</felix.framework.version>
+ <felix.framework.version>4.6.0</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.14.1-SNAPSHOT</felix.gogo.version>
<felix.plugin.version>2.5.3</felix.plugin.version>
@@ -227,7 +229,7 @@
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.7</mina.version>
- <osgi.version>5.0.0</osgi.version>
+ <osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<org.json.version>20140107</org.json.version>
<pax.cdi.version>0.12.0-SNAPSHOT</pax.cdi.version>
@@ -1466,8 +1468,8 @@
<version>${pax.tinybundle.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>${equinox.groupId}</groupId>
+ <artifactId>${equinox.artifactId}</artifactId>
<version>${equinox.version}</version>
</dependency>