Revert "Remove eman due to karaf 4 failures"

This reverts commit 7a4daa81b44105e88074e3036a1a9b6e88c4fc2c.

Change-Id: I2c171cda608ac62fd4fa1f3952429500f694f1e2
Signed-off-by: Colin Dixon <colin@colindixon.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 02b09dcad25d052c025a88d9e1243d3809de75ca..102ef9dd7eb9594a4f346157ec7e9db4081aa4a9 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -182,7 +182,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Eman -->
                 <type>xml</type>
             </dependency>
             <!-- Eman -->

-            <!-- Temporary remove because of karaf 

             <dependency>
                 <groupId>org.opendaylight.eman</groupId>
                 <artifactId>eman-features</artifactId>
             <dependency>
                 <groupId>org.opendaylight.eman</groupId>
                 <artifactId>eman-features</artifactId>


@@ -190,7 +189,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>

-            -->

             <!-- Faas -->
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>
             <!-- Faas -->
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 0686a3d6a6e2dce961fe3e2d1ba09aea8623cba9..449dba615756fd8e25e66388f03d44cc2d0bdaeb 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -56,9 +56,7 @@
         <didm.version>0.4.0-SNAPSHOT</didm.version>
         <dlux.version>0.5.0-SNAPSHOT</dlux.version>
         <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
         <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>
         <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>
         <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 48f1f76692a3a70deee4156243fc15795c8f8562..5fe4df59455cb1ac8436e7757f7db71fd9932257 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -174,14 +174,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
             <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.eman</groupId>
             <artifactId>eman-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

-        -->

         <dependency>
             <groupId>org.opendaylight.faas</groupId>
             <artifactId>features-faas</artifactId>
         <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 4e9bcdd58ef9a91510f58e90478173760a2b6854..ba093a41536481ef87ccec145e9218c6d69cd397 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -52,9 +52,7 @@
     -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
     -->
     <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.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>
     <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 f3ec31e8b2f3176c2811a20ada42b17efa021531..26702ce8deb3feb0b3744ed911d112cfcf2fe800 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -71,11 +71,9 @@
         -->
         <feature>odl-dlux-core</feature>
         <feature>odl-distribution-version</feature>
         -->
         <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-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>
         <feature>odl-lispflowmapping-msmr</feature>
         <feature>odl-lispflowmapping-ui</feature>
         <feature>odl-mdsal-benchmark</feature>