From: Michal Cmarada <michal.cmarada@pantheon.tech>
Date: Fri, 9 Feb 2018 13:05:08 +0000 (+0100)
Subject: Restore Groupbasedpolicy to distribution
X-Git-Tag: release/oxygen~7
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F68107%2F9;p=integration%2Fdistribution.git

Restore Groupbasedpolicy to distribution

Remove tsdr as it is not using latest netty version.

Change-Id: Ie781579975c7f7b70dff7f20f74dd77a9d203e62
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
---

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 7b924e4d..b9f9884d 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -128,8 +128,7 @@
         <profile>
             <id>groupbasedpolicy</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 6215b977..f3723875 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -297,8 +297,7 @@
         <profile>
             <id>groupbasedpolicy</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 0780fb71..a54979af 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -427,7 +427,8 @@
         <profile>
             <id>tsdr</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <!-- Removed because tsdr is not using latest netty version -->
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>