summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-10-09 09:07:31 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-10-09 15:44:36 +0000
commitdcd1a657bd96691fcaee1ec6c0fb2f49b09b4530 (patch)
treefb339a5fd46c633f06ea508c09caed4cc2167871 /common
parentf5e347768e9503285c41346c646351c2bd3e11f5 (diff)
HONEYCOMB-393 - Enable site plugin for yang-whitelist projects
Change-Id: I744ca366a81aecb5b79da7041e47db9c2363bd6e Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'common')
-rw-r--r--common/yang-whitelist/yang-whitelist-api/pom.xml24
-rw-r--r--common/yang-whitelist/yang-whitelist-impl/pom.xml24
2 files changed, 14 insertions, 34 deletions
diff --git a/common/yang-whitelist/yang-whitelist-api/pom.xml b/common/yang-whitelist/yang-whitelist-api/pom.xml
index 80b8d35..b0d0b2d 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 b2d8f66..b40fad1 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>