Add JSON RPC to distribution

Add and enable JSON RPC in distribution

Addresses fix for incorrect upstream version (we do not have
the patch bumping the version to 2.0 in master merged yet, so
we will stick with the current master versioning).

Change-Id: I58007c5e0432b481985359b1717d7c860e4d5bd5
Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index de46b14f908710ee7e7ba4d29a8c21579f748824..683981e8806ba60a7bb3243d79dfd573a575a3c1 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -59,6 +59,7 @@
         <dluxapps.version>0.7.0-SNAPSHOT</dluxapps.version>
         <eman.version>1.3.0-SNAPSHOT</eman.version>
         <faas.version>1.4.0-SNAPSHOT</faas.version>
+        <jsonrpc.version>1.3.2-SNAPSHOT</jsonrpc.version>
         <federation.version>0.4.0-SNAPSHOT</federation.version>
         <flow.version>1.7.0-SNAPSHOT</flow.version>
         <genius.version>0.4.0-SNAPSHOT</genius.version>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 342ac84505fa067b4ee0aab270623733b9f74f97..df55c58c7beac24d4cfc388303d857d087a5a518 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -288,6 +288,24 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <!-- JSON RPC -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.jsonrpc</groupId>
+                        <artifactId>jsonrpc-features</artifactId>
+                        <version>${jsonrpc.version}</version>
+                        <type>xml</type>
+                        <classifier>features</classifier>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <!-- L2switch -->
         <profile>
             <id>l2switch</id>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 3f9285ff707d0c30a3b4d448164143e73a68f08b..8902b09686020e4ec8155425a40cc80a1d7e0a8f 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -339,6 +339,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- JSON RPC -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>jsonrpc-features</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- L2switch -->
         <profile>
             <id>l2switch</id>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index f0c174c63fabf44317e7dd3a7f7b17d8fbf6b58a..bcfa71a68b6eee8e2b461efebfedbf01b6fcbf01 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -237,6 +237,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- jsonrpc -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>jsonrpc-features</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- L2switch -->
         <profile>
             <id>l2switch</id>