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 0312f9a Upgrade to promise 1.1.1 in scr feature
new d683feb Merge pull request #1297 from jbonofre/PROMISE_ALIGN
0312f9a is described below
commit 0312f9a3e10396986bb827b113539cc9cd3c9496
Author: jbonofre <jbono...@apache.org>
AuthorDate: Sun Feb 21 08:15:11 2021 +0100
Upgrade to promise 1.1.1 in scr feature
---
assemblies/features/standard/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index d026faa..12dc4b4 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1443,7 +1443,7 @@ org.apache.felix.eventadmin.AddSubject=true
<feature name="scr" description="Declarative Service support"
version="${project.version}">
<bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.util.promise/1.1.1</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>
