From d824d38db4c6cab0599bc8c1c62534b265651f21 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 30 Jan 2018 11:42:07 -0800
Subject: [PATCH] Restore p4plugin in distribution

Change-Id: I92ee5b96db24054fbb99ea680b56e24ff35b05e0
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/upstream/feature-repos/pom.xml     | 1 -
 artifacts/upstream/single-features/pom.xml   | 3 +--
 features/repos/index/pom.xml                 | 5 ++---
 features/singles/odl-integration-all/pom.xml | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 152bd73d..50f616f0 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -348,7 +348,6 @@
         <profile>
             <id>p4plugin</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 029c47b3..0633e49f 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -434,8 +434,7 @@
         <profile>
             <id>p4plugin</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 14bb8846..c7b3ce5f 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -249,7 +249,7 @@
         </profile>
         <!-- Eman -->
         <profile>
-            <id>emacs</id>
+            <id>eman</id>
             <activation>
                 <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
@@ -569,8 +569,7 @@
         <profile>
             <id>p4plugin</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 3bcfeb4f..432fa468 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -366,8 +366,7 @@
         <profile>
             <id>p4plugin</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-- 
2.36.6