You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/03/13 15:04:46 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6193] Upgrade to Felix
SCR 2.1.16
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 3c7f7de [KARAF-6193] Upgrade to Felix SCR 2.1.16
3c7f7de is described below
commit 3c7f7de816c0197920978dfb78a84dd040aaca84
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Mar 12 17:46:07 2019 +0100
[KARAF-6193] Upgrade to Felix SCR 2.1.16
---
assemblies/features/standard/src/main/feature/feature.xml | 2 ++
pom.xml | 2 +-
scr/management/pom.xml | 12 ++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 8c57da6..6ec81dd 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1426,6 +1426,8 @@ org.apache.felix.eventadmin.AddSubject=true
</feature>
<feature name="scr" description="Declarative Service support" version="${project.version}">
+ <bundle dependency="true" start-level="30">mvn:org.osgi/org.osgi.util.function/1.0.0</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.osgi/org.osgi.util.promise/1.0.0</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version}</bundle>
<conditional>
diff --git a/pom.xml b/pom.xml
index bf2ebed..7b32675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
<felix.eventadmin.version>1.5.0</felix.eventadmin.version>
<felix.eventadmin.webconsole.plugin.version>1.1.8</felix.eventadmin.webconsole.plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
- <felix.scr.version>2.1.14</felix.scr.version>
+ <felix.scr.version>2.1.16</felix.scr.version>
<felix.scr.webconsole.plugin.version>2.1.0</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.12.0</felix.scr.annotation.version>
<felix.resolver.version>1.16.0</felix.resolver.version>
diff --git a/scr/management/pom.xml b/scr/management/pom.xml
index 4551944..8a1059b 100644
--- a/scr/management/pom.xml
+++ b/scr/management/pom.xml
@@ -54,6 +54,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>