X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=artifacts%2Fupstream%2Fsingle-features%2Fpom.xml;h=37d2188d18b8a85079eaa923abe78551e4e19d15;hb=b8949af4f2de393f811b61e68b9e4853552d56ec;hp=a994dc83262e5607a8fd4f974c7e917389bc72b0;hpb=a435e11303052cae0d5cd0368b54855f9682ebc2;p=integration%2Fdistribution.git

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index a994dc83..37d2188d 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.9.0-SNAPSHOT</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>single-feature-artifacts</artifactId>
@@ -116,7 +116,6 @@
         <profile>
             <id>bier</id>
             <activation>
-                <!-- Disabled due to failed merge job -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
@@ -153,7 +152,7 @@
         <profile>
             <id>dluxapps</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -289,11 +288,29 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <!-- JSON RPC -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>false</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>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -325,7 +342,7 @@
         <profile>
             <id>nemo</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -416,7 +433,6 @@
         <profile>
             <id>ofconfig</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
@@ -435,7 +451,6 @@
         <profile>
             <id>p4plugin</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
@@ -454,7 +469,7 @@
         <profile>
             <id>packetcable</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -525,13 +540,6 @@
                         <type>xml</type>
                         <classifier>features</classifier>
                     </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-ui</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.sfc</groupId>
                         <artifactId>odl-sfc-vpp-renderer</artifactId>
@@ -560,7 +568,7 @@
         <profile>
             <id>snmp</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -578,7 +586,6 @@
         <profile>
             <id>snmp4sdn</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
@@ -597,7 +604,7 @@
         <profile>
             <id>sxp</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -634,7 +641,6 @@
         <profile>
             <id>usc</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
@@ -653,7 +659,6 @@
         <profile>
             <id>vtn</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>