You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/09/30 14:57:49 UTC
karaf git commit: [KARAF-4025] Update scr to 2.0.0
Repository: karaf
Updated Branches:
refs/heads/master f5058c374 -> c6b0be15c
[KARAF-4025] Update scr to 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c6b0be15
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c6b0be15
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c6b0be15
Branch: refs/heads/master
Commit: c6b0be15c245ffaa7bd1000955fb63a31ac1c283
Parents: f5058c3
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Sep 30 14:57:29 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Sep 30 14:57:29 2015 +0200
----------------------------------------------------------------------
assemblies/features/standard/pom.xml | 5 +++++
assemblies/features/standard/src/main/feature/feature.xml | 1 +
pom.xml | 8 +++++++-
scr/command/pom.xml | 4 ++++
scr/management/pom.xml | 5 +++++
5 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6b0be15/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 02392e9..2c77432 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -378,6 +378,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.compat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.scr</groupId>
<artifactId>org.apache.karaf.scr.command</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6b0be15/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index d972da0..68a70ac 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -528,6 +528,7 @@
<feature name="scr" description="Declarative Service support" version="${project.version}">
<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>
+ <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.scr.compat/${felix.scr.compat.version}</bundle>
<conditional>
<condition>management</condition>
<bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.management/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6b0be15/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9292256..71d71d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,8 @@
<felix.eventadmin.version>1.4.2</felix.eventadmin.version>
<felix.eventadmin.webconsole.plugin.version>1.1.2</felix.eventadmin.webconsole.plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
- <felix.scr.version>1.8.2</felix.scr.version>
+ <felix.scr.version>2.0.0</felix.scr.version>
+ <felix.scr.compat.version>1.0.2</felix.scr.compat.version>
<felix.scr.webconsole.plugin.version>1.0.0</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.6.0</felix.scr.annotation.version>
<felix.resolver.version>1.4.0</felix.resolver.version>
@@ -1005,6 +1006,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.compat</artifactId>
+ <version>${felix.scr.compat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.resolver</artifactId>
<version>${felix.resolver.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6b0be15/scr/command/pom.xml
----------------------------------------------------------------------
diff --git a/scr/command/pom.xml b/scr/command/pom.xml
index bc9485e..69e3bcc 100644
--- a/scr/command/pom.xml
+++ b/scr/command/pom.xml
@@ -60,6 +60,10 @@
<artifactId>org.apache.felix.scr</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.compat</artifactId>
+ </dependency>
+ <dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6b0be15/scr/management/pom.xml
----------------------------------------------------------------------
diff --git a/scr/management/pom.xml b/scr/management/pom.xml
index 58cdf06..c214da0 100644
--- a/scr/management/pom.xml
+++ b/scr/management/pom.xml
@@ -54,6 +54,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.compat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>