You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/04/30 20:04:59 UTC

[7/7] git commit: [KARAF-2888] Fix unit tests caused by the change in Feature#getId()

[KARAF-2888] Fix unit tests caused by the change in Feature#getId()


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

Branch: refs/heads/master
Commit: bd9167729d3c824914f3e6fecaaa34bd48437fb3
Parents: e334fae
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Apr 30 20:04:17 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Apr 30 20:04:28 2014 +0200

----------------------------------------------------------------------
 .../src/it/test-aggregate-features/control.xml                   | 4 ++--
 .../src/it/test-check-dependencies-failure/control.xml           | 4 ++--
 .../src/it/test-check-dependencies/control.xml                   | 4 ++--
 tooling/karaf-maven-plugin/src/it/test-input-file/control.xml    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/bd916772/tooling/karaf-maven-plugin/src/it/test-aggregate-features/control.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/control.xml b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/control.xml
index 01a6721..8369f0d 100644
--- a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/control.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/control.xml
@@ -19,11 +19,11 @@
   -->
 
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="aggregate-features">
-    <feature description="aggregate-recursive-module-c" version="1.0-SNAPSHOT" name="aggregate-recursive-module-c">
+    <feature description="aggregate-recursive-module-c" version="1.0.0.SNAPSHOT" name="aggregate-recursive-module-c">
         <details>Test Description</details>
         <bundle>mvn:test/aggregate-recursive-module-b/1.0-SNAPSHOT</bundle>
     </feature>
-    <feature description="aggregate-recursive-module-d" version="1.0-SNAPSHOT" name="aggregate-recursive-module-d">
+    <feature description="aggregate-recursive-module-d" version="1.0.0.SNAPSHOT" name="aggregate-recursive-module-d">
         <details>Test Description</details>
         <bundle>mvn:test/aggregate-recursive-module-a/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/aggregate-recursive-module-c/1.0-SNAPSHOT</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/bd916772/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/control.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/control.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/control.xml
index 223d090..ef8eba4 100644
--- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/control.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/control.xml
@@ -19,11 +19,11 @@
   -->
 
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="check-dependencies-features">
-    <feature description="dependency-module-c" version="1.0-SNAPSHOT" name="dependency-module-c">
+    <feature description="dependency-module-c" version="1.0.0.SNAPSHOT" name="dependency-module-c">
         <bundle>mvn:test/dependency-module-a/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/dependency-module-b/1.0-SNAPSHOT</bundle>
     </feature>
-    <feature description="dependency-module-d" version="1.0-SNAPSHOT" name="dependency-module-d">
+    <feature description="dependency-module-d" version="1.0.0.SNAPSHOT" name="dependency-module-d">
         <bundle>mvn:test/dependency-module-c/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/dependency-module-a/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/dependency-module-b/1.0-SNAPSHOT</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/bd916772/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml
index 223d090..ef8eba4 100644
--- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml
@@ -19,11 +19,11 @@
   -->
 
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="check-dependencies-features">
-    <feature description="dependency-module-c" version="1.0-SNAPSHOT" name="dependency-module-c">
+    <feature description="dependency-module-c" version="1.0.0.SNAPSHOT" name="dependency-module-c">
         <bundle>mvn:test/dependency-module-a/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/dependency-module-b/1.0-SNAPSHOT</bundle>
     </feature>
-    <feature description="dependency-module-d" version="1.0-SNAPSHOT" name="dependency-module-d">
+    <feature description="dependency-module-d" version="1.0.0.SNAPSHOT" name="dependency-module-d">
         <bundle>mvn:test/dependency-module-c/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/dependency-module-a/1.0-SNAPSHOT</bundle>
         <bundle>mvn:test/dependency-module-b/1.0-SNAPSHOT</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/bd916772/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml b/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml
index 08e8f0e..9310cf7 100644
--- a/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml
@@ -19,7 +19,7 @@
   -->
 
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="test-input-file">
-    <feature description="Test Description" version="1.0-SNAPSHOT" name="test-input-file">
+    <feature description="Test Description" version="1.0.0.SNAPSHOT" name="test-input-file">
         <details>Test Description</details>
         <bundle>mvn:test/test-input-file/1.0-SNAPSHOT</bundle>
     </feature>