karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject git commit: [KARAF-3110] Upgrade to felix utils 1.6.0 and fix compilation error in [KARAF-1560]
Date Thu, 10 Jul 2014 13:59:57 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x b846b03e3 -> bdf1ef7db


[KARAF-3110] Upgrade to felix utils 1.6.0
and fix compilation error in  [KARAF-1560]


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bdf1ef7d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bdf1ef7d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bdf1ef7d

Branch: refs/heads/karaf-2.3.x
Commit: bdf1ef7dbc690101b0d07ded19f3aff22369a6f9
Parents: b846b03
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Thu Jul 10 15:56:26 2014 +0200
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Thu Jul 10 15:59:24 2014 +0200

----------------------------------------------------------------------
 pom.xml              | 2 +-
 shell/config/pom.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/bdf1ef7d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0cb600e..7437845 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
         <felix.framework.version>4.0.3</felix.framework.version>
         <felix.gogo.version>0.10.0</felix.gogo.version>
         <felix.plugin.version>2.4.0</felix.plugin.version>
-        <felix.utils.version>1.4.2</felix.utils.version>
+        <felix.utils.version>1.6.0</felix.utils.version>
         <felix.webconsole.version>4.2.0</felix.webconsole.version>
         <felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
         <felix.metatype.version>1.0.10</felix.metatype.version>

http://git-wip-us.apache.org/repos/asf/karaf/blob/bdf1ef7d/shell/config/pom.xml
----------------------------------------------------------------------
diff --git a/shell/config/pom.xml b/shell/config/pom.xml
index 8d13fe5..d68cb88 100644
--- a/shell/config/pom.xml
+++ b/shell/config/pom.xml
@@ -39,13 +39,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.utils</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.utils</artifactId>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
 
         <dependency>


Mime
View raw message