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 d6cf97b454 [KARAF-7456] Upgrade to Felix SCR 2.2.2
new 0aced2bb8d Merge pull request #1589 from jbonofre/KARAF-7456
d6cf97b454 is described below
commit d6cf97b454415c010ee8ecd26f315e051ed0aba5
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Sun Jul 3 18:51:14 2022 +0200
[KARAF-7456] Upgrade to Felix SCR 2.2.2
---
assemblies/features/standard/src/main/feature/feature.xml | 1 +
pom.xml | 2 +-
scr/management/pom.xml | 5 +++++
scr/state/pom.xml | 7 ++++++-
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index b6e1784dab..908513e3bf 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1456,6 +1456,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.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.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 4a135f04b4..cafe90218b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@
<felix.eventadmin.version>1.6.2</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.2.0</felix.scr.version>
+ <felix.scr.version>2.2.2</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>2.0.4</felix.resolver.version>
diff --git a/scr/management/pom.xml b/scr/management/pom.xml
index 97dae042c8..b3e94a3caa 100644
--- a/scr/management/pom.xml
+++ b/scr/management/pom.xml
@@ -60,6 +60,11 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
diff --git a/scr/state/pom.xml b/scr/state/pom.xml
index 9d9ef11071..ff1afb8b4b 100644
--- a/scr/state/pom.xml
+++ b/scr/state/pom.xml
@@ -70,10 +70,15 @@
<groupId>org.apache.karaf.bundle</groupId>
<artifactId>org.apache.karaf.bundle.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
- <version>${osgi-component-annotations.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
