From dcd1a657bd96691fcaee1ec6c0fb2f49b09b4530 Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Mon, 9 Oct 2017 09:07:31 +0200
Subject: HONEYCOMB-393 - Enable site plugin for yang-whitelist projects

Change-Id: I744ca366a81aecb5b79da7041e47db9c2363bd6e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---
 common/yang-whitelist/yang-whitelist-api/pom.xml  | 24 +++++++----------------
 common/yang-whitelist/yang-whitelist-impl/pom.xml | 24 +++++++----------------
 2 files changed, 14 insertions(+), 34 deletions(-)

(limited to 'common')

diff --git a/common/yang-whitelist/yang-whitelist-api/pom.xml b/common/yang-whitelist/yang-whitelist-api/pom.xml
index 80b8d3507..b0d0b2db0 100644
--- a/common/yang-whitelist/yang-whitelist-api/pom.xml
+++ b/common/yang-whitelist/yang-whitelist-api/pom.xml
@@ -18,7 +18,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <!-- Cannot have parent , to break cycle, its used in build -->
+    <parent>
+        <groupId>io.fd.honeycomb.common</groupId>
+        <artifactId>honeycomb-parent</artifactId>
+        <version>1.18.01-SNAPSHOT</version>
+        <relativePath>../../honeycomb-parent</relativePath>
+    </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.honeycomb.yang</groupId>
@@ -31,22 +37,6 @@
         <jaxb-api.version>2.2.12</jaxb-api.version>
     </properties>
 
-    <!-- workaround for HONEYCOMB-393 -->
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                        <skipDeploy>true</skipDeploy>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/common/yang-whitelist/yang-whitelist-impl/pom.xml b/common/yang-whitelist/yang-whitelist-impl/pom.xml
index b2d8f66fc..b40fad14f 100644
--- a/common/yang-whitelist/yang-whitelist-impl/pom.xml
+++ b/common/yang-whitelist/yang-whitelist-impl/pom.xml
@@ -18,7 +18,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <!-- Cannot have parent , to break cycle, its used in build -->
+    <parent>
+        <groupId>io.fd.honeycomb.common</groupId>
+        <artifactId>honeycomb-parent</artifactId>
+        <version>1.18.01-SNAPSHOT</version>
+        <relativePath>../../honeycomb-parent</relativePath>
+    </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.honeycomb.yang</groupId>
@@ -32,22 +38,6 @@
         <slf4j-simple.version>1.7.25</slf4j-simple.version>
     </properties>
 
-    <!-- workaround for HONEYCOMB-393 -->
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                        <skipDeploy>true</skipDeploy>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>io.fd.honeycomb.yang</groupId>
-- 
cgit 1.2.3-korg