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 7b924e4dc7e2bddf22f8e6381541628dbe31d996..b9f9884d77aabb3369863f3255f72a1a56b3573d 100644 (file)
--- 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 6215b977676f9c366d3eac0c612022839cefd5b6..f3723875ac03dcf39c84f995f3673a419233a6b2 100644 (file)
--- 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 0780fb714090b6d00360f25b9c7efbc58cd9a395..a54979af8978392ba7921e7514be60c46ed94393 100644 (file)
--- 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>