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 2022/10/16 08:50:02 UTC
[karaf] branch main updated: [KARAF-7362] Move karaf.config bundle in startup instead of features to be sure it starts sync and in first stage
This is an automated email from the ASF dual-hosted git repository.
jbonofre 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 fcfac7cb73 [KARAF-7362] Move karaf.config bundle in startup instead of features to be sure it starts sync and in first stage
new 8133668276 Merge pull request #1663 from jbonofre/KARAF-7362
fcfac7cb73 is described below
commit fcfac7cb73246aead567650711afddbef9402385
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Oct 16 07:13:30 2022 +0200
[KARAF-7362] Move karaf.config bundle in startup instead of features to be sure it starts sync and in first stage
---
assemblies/features/framework/pom.xml | 4 ++++
assemblies/features/framework/src/main/feature/feature.xml | 2 ++
assemblies/features/standard/src/main/feature/feature.xml | 1 -
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 03f31ddd8c..5713ffc4b2 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -76,6 +76,10 @@
<artifactId>org.apache.karaf.diagnostic.boot</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf.config</groupId>
+ <artifactId>org.apache.karaf.config.core</artifactId>
+ </dependency>
<dependency>
<groupId>${equinox.groupId}</groupId>
<artifactId>${equinox.artifactId}</artifactId>
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index c302f95cf6..e202b95064 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -40,6 +40,7 @@
<bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/${felix.cm.json.version}</bundle>
<bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/${sling.commons.johnzon.version}</bundle>
<bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/${felix.configurator.version}</bundle>
+ <bundle start-level="11">mvn:org.apache.karaf.config/org.apache.karaf.config.core/${project.version}</bundle>
<!-- file install -->
<bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
<!-- features service -->
@@ -65,6 +66,7 @@
<bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/${felix.cm.json.version}</bundle>
<bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/${sling.commons.johnzon.version}</bundle>
<bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/${felix.configurator.version}</bundle>
+ <bundle start-level="11">mvn:org.apache.karaf.config/org.apache.karaf.config.core/${project.version}</bundle>
<!-- file install -->
<bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
<!-- features service -->
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index d22c8c0fd8..ecab7e3df6 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -520,7 +520,6 @@ watch = admin
</feature>
<feature name="config" description="Provide OSGi ConfigAdmin support" version="${project.version}">
- <bundle start-level="30">mvn:org.apache.karaf.config/org.apache.karaf.config.core/${project.version}</bundle>
<conditional>
<condition>management</condition>
<config name="jmx.acl.org.apache.karaf.config">