From: Richard Kosegi <richard.kosegi@gmail.com>
Date: Fri, 22 Nov 2019 12:05:19 +0000 (+0100)
Subject: Fix JSONRPC feature artifact
X-Git-Tag: release/magnesium~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=78aba105dfd9fd5aec3f7fb3088dcb3212aed274

Fix JSONRPC feature artifact

Problem was introduced by https://git.opendaylight.org/gerrit/c/jsonrpc/+/85840

Also add jsonrpc feature into compatible-with-all

Change-Id: I3f3671a02898d545e1570861caa181487934c017
Signed-off-by: Richard Kosegi <richard.kosegi@gmail.com>
---

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 5684f1fa..c5f8e146 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -208,7 +208,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.jsonrpc</groupId>
-                    <artifactId>jsonrpc-features</artifactId>
+                    <artifactId>features-jsonrpc</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index e973bab5..57241856 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -129,6 +129,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- jsonrpc -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>odl-jsonrpc-all</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- LISP Flow Mapping -->
         <profile>
             <id>lispflowmapping</id>