karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch master updated: [KARAF-6193] Upgrade to Felix SCR 2.1.16
Date Wed, 13 Mar 2019 15:03:33 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e05417  [KARAF-6193] Upgrade to Felix SCR 2.1.16
     new b642d29  Merge pull request #784 from jbonofre/KARAF-6193
2e05417 is described below

commit 2e054177f91c047a07a4fccf8094a4585d94afe4
Author: Jean-Baptiste Onofré <jbonofre@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 d43baa3..d36c875 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 dc3ffec..59d6677 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>


Mime
View raw message