Code Review / integration / distribution.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: feab52f)
Restore p4plugin in distribution 37/67737/2
authorLuis Gomez <ecelgp@gmail.com>
Tue, 30 Jan 2018 19:42:07 +0000 (11:42 -0800)
committerLuis Gomez <ecelgp@gmail.com>
Wed, 31 Jan 2018 19:30:34 +0000 (19:30 +0000)
Change-Id: I92ee5b96db24054fbb99ea680b56e24ff35b05e0
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
artifacts/upstream/feature-repos/pom.xml patch | blob | history
artifacts/upstream/single-features/pom.xml patch | blob | history
features/repos/index/pom.xml patch | blob | history
features/singles/odl-integration-all/pom.xml patch | blob | history

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 152bd73d973403413edcb9486cdc3cfeb00b3ab4..50f616f0ef54bd2a0d6ee42f5ec5646604b88b97 100644 (file)
--- 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 029c47b3d21f432b789814ff7c08f2139117a9b6..0633e49f2b7c1aa2b28b1dac74bd96110a49724f 100644 (file)
--- 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 14bb8846f84a85ee717f0e1ee3bd6bec4cb131a7..c7b3ce5fc455200c88af596ee69ba58f5729c0db 100644 (file)
--- 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 3bcfeb4f75f0336d92629d90a7242569785b44ec..432fa468cdc47d60136e749798996242eb59f2c3 100644 (file)
--- 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>
Integration distribution