Remove eman due to karaf 4 failures

Change-Id: I2fd5bc3da2a10a18edac01cd75637f9e689306e9
Signed-off-by: Thanh Ha <zxiiro@linux.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 260e7599adaba93391ac4276ead3de4119f94d89..31639752e45dd34ed6a0427354ddbff19087ff55 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -182,6 +182,7 @@
                 <type>xml</type>
             </dependency>
             <!-- Eman -->
+            <!-- Temporary remove because of karaf 
             <dependency>
                 <groupId>org.opendaylight.eman</groupId>
                 <artifactId>eman-features</artifactId>
@@ -189,6 +190,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
             <!-- Faas -->
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 449dba615756fd8e25e66388f03d44cc2d0bdaeb..0686a3d6a6e2dce961fe3e2d1ba09aea8623cba9 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -56,7 +56,9 @@
         <didm.version>0.4.0-SNAPSHOT</didm.version>
         <dlux.version>0.5.0-SNAPSHOT</dlux.version>
         <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
+        <!-- Temporary remove because of karaf 4
         <eman.version>1.1.0-SNAPSHOT</eman.version>
+        -->
         <faas.version>1.2.0-SNAPSHOT</faas.version>
         <federation.version>0.2.0-SNAPSHOT</federation.version>
         <flow.version>1.5.0-SNAPSHOT</flow.version>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 9d66588ec7f0014969941dc606f783d95c7a5922..882404f3cd0a4033853d4726b6759e47e3234f47 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -174,12 +174,14 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Temporary remove because karaf 4
         <dependency>
             <groupId>org.opendaylight.eman</groupId>
             <artifactId>eman-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.faas</groupId>
             <artifactId>features-faas</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index f31ef4851b4cc2faef1f1e6cf5f55f71a72fe715..aecb08a24b08502fea016e1f0793331a6ea93bb5 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -52,7 +52,9 @@
     -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
+    <!-- Temporary remove because of karaf 4
     <repository>mvn:org.opendaylight.eman/eman-features/{{VERSION}}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.faas/features-faas/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.federation/federation-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.genius/genius-features/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index fc785d8a79deabc3dc8161046bea41fccbe6d179..8acae834e3d07870018391343200f7737f7597a6 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -71,9 +71,11 @@
         -->
         <feature>odl-dlux-core</feature>
         <feature>odl-distribution-version</feature>
+        <!-- Temporary remove because of karaf 4
         <feature>odl-eman</feature>
         <feature>odl-eman-rest</feature>
         <feature>odl-eman-ui</feature>
+        -->
         <feature>odl-lispflowmapping-msmr</feature>
         <feature>odl-lispflowmapping-ui</feature>
         <feature>odl-mdsal-benchmark</feature>