Fix for SFC-UI initial commit

Change-Id: Ia68677f302494dd3b0a81e913c64f251b810e990
Signed-off-by: Andrej Kincel <[email protected]>

diff --git a/pom.xml b/pom.xml
index 8d027f2392f7440203d5d240585e054570dc2f5c..08f3108b810114e50393b5bf584a08ef16e13af6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,8 @@
         <module>sfc-model</module>
         <module>sfc-provider</module>
         <module>sfc-test-consumer</module>
-        <module>sfc-distribution</module>
         <module>sfc-ui</module>
+        <module>sfc-distribution</module>
     </modules>
 
     <build>

diff --git a/sfc-distribution/pom.xml b/sfc-distribution/pom.xml
index ef90e9944eb1270eafdef40b5b9ee8dc612f39bd..bc8d8ab38819f8aa2bfa784b923ef1d8c2bfc096 100755 (executable)
--- a/sfc-distribution/pom.xml
+++ b/sfc-distribution/pom.xml
@@ -42,6 +42,12 @@ see https://git.opendaylight.org/gerrit/#/c/390/
             <version>${project.parent.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>sfc-ui</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
         <!-- controller base distribution -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/sfc-ui/pom.xml b/sfc-ui/pom.xml
index 5648045b7f9ba2145cce8a4bd37b79b934c492ae..acf8dbe5aa268fa2846b5e6258b3f3b6ec513fa6 100644 (file)
--- a/sfc-ui/pom.xml
+++ b/sfc-ui/pom.xml
@@ -47,12 +47,12 @@
         </dependency>
     </dependencies>
 
-    <!--<scm>-->
-        <!--<connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>-->
-        <!--<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>-->
-        <!--<tag>HEAD</tag>-->
-        <!--<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>-->
-    <!--</scm>-->
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    </scm>
 
     <repositories>
         <!-- Opendaylight public group -->