This is an automated email from the ASF dual-hosted git repository.
nite pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f7451eb361 KARAF-7727: Fix org.osgi.util.promise version and use
properties
new fef1c5533f Merge pull request #1808 from jbonofre/KARAF-7727
f7451eb361 is described below
commit f7451eb3618decec1a276148add5ba598b1ed95a
Author: JB Onofré <j...@nanthrax.net>
AuthorDate: Fri Dec 15 17:36:33 2023 +0100
KARAF-7727: Fix org.osgi.util.promise version and use properties
---
assemblies/features/framework/src/main/feature/feature.xml | 8 ++++----
assemblies/features/standard/src/main/feature/feature.xml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/assemblies/features/framework/src/main/feature/feature.xml
b/assemblies/features/framework/src/main/feature/feature.xml
index e202b95064..d339d8555d 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -31,8 +31,8 @@
<bundle
start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle>
<bundle
start-level="8">mvn:org.fusesource.jansi/jansi/${jansi.version}</bundle>
<!-- config admin -->
- <bundle
start-level="9">mvn:org.osgi/org.osgi.util.function/1.2.0</bundle>
- <bundle
start-level="9">mvn:org.osgi/org.osgi.util.promise/1.2.0</bundle>
+ <bundle
start-level="9">mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version}</bundle>
+ <bundle
start-level="9">mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version}</bundle>
<bundle
start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
<bundle
start-level="9">mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version}</bundle>
<bundle
start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
@@ -57,8 +57,8 @@
<bundle
start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
<bundle
start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version}</bundle>
<!-- config admin -->
- <bundle
start-level="9">mvn:org.osgi/org.osgi.util.function/1.2.0</bundle>
- <bundle
start-level="9">mvn:org.osgi/org.osgi.util.promise/1.2.0</bundle>
+ <bundle
start-level="9">mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version}</bundle>
+ <bundle
start-level="9">mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version}</bundle>
<bundle
start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
<bundle
start-level="9">mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version}</bundle>
<bundle
start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index 85e9e04ce0..896cdf5c97 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1465,9 +1465,9 @@ 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.2.0</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.util.promise/1.2.0</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.service.component/1.5.0</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.osgi/org.osgi.service.component/${org.osgi.service.component.version}</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>
