Add hc2vpp common parents

- provides single root (hc2vpp-parent) for all projects to make
  site plugin work
- fixes relative links in child poms
- adds missing project names

Partially based on https://gerrit.fd.io/r/#/c/4720

To test:
- mvn clean install && mvn site site:stage
- open
  hc2vpp/target/staging/hc2vpp-parent/hc2vpp-aggregator/index.html

Change-Id: Ife5a8555748221cd8bcc8ad2fa48f1d0e98fff1d
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml
index feed86b..8c200ce 100644 (file)
--- a/acl/acl-api/pom.xml
+++ b/acl/acl-api/pom.xml
@@ -14,9 +14,10 @@
  limitations under the License.
 --><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">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 6f27755..c524a2d 100644 (file)
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -18,9 +18,10 @@
          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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>impl-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/impl-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/acl/pom.xml b/acl/pom.xml
index 6b3643e..14b9e0b 100644 (file)
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -17,15 +17,17 @@
   <groupId>io.fd.hc2vpp.acl</groupId>
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
   <artifactId>acl-aggregator</artifactId>
   <version>1.17.04-SNAPSHOT</version>
   <name>acl-aggregator</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
+  <description>Aggregator for Hc2vpp ACL plugin</description>
 
   <modules>
     <module>acl-api</module>

diff --git a/common/api-parent/asciidoc/Readme.adoc b/common/api-parent/asciidoc/Readme.adoc
new file mode 100644 (file)
index 0000000..73d5624
--- /dev/null
+++ b/common/api-parent/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= api-parent
+
+Maven parent for api projects. Provides common yangtools plugin configuration.
\ No newline at end of file

diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml
new file mode 100644 (file)
index 0000000..f1c899b
--- /dev/null
+++ b/common/api-parent/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
+        <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../hc2vpp-parent</relativePath>
+    </parent>
+
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>api-parent</artifactId>
+    <name>${project.artifactId}</name>
+    <version>1.17.04-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!-- Yangtools, generate yang -->
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <version>${yangtools.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.opendaylight.mdsal</groupId>
+                            <artifactId>maven-sal-api-gen-plugin</artifactId>
+                            <version>0.8.4-Beryllium-SR4</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <id>binding</id>
+                            <goals>
+                                <goal>generate-sources</goal>
+                            </goals>
+                            <configuration>
+                                <codeGenerators>
+                                    <generator>
+                                        <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                        <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                    </generator>
+                                </codeGenerators>
+                                <inspectDependencies>true</inspectDependencies>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <configuration>
+                        <filesets>
+                            <fileset>
+                                <directory>${salGeneratorPath}</directory>
+                                <includes>
+                                    <include>**</include>
+                                </includes>
+                            </fileset>
+                        </filesets>
+                    </configuration>
+                </plugin>
+                <!-- add generated yang classes to build -->
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>add-yang-sources</id>
+                            <phase>generate-sources</phase>
+                            <goals>
+                                <goal>add-source</goal>
+                            </goals>
+                            <configuration>
+                                <sources>
+                                    <source>${salGeneratorPath}</source>
+                                </sources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/common/asciidoc/Readme.adoc b/common/asciidoc/Readme.adoc
new file mode 100644 (file)
index 0000000..8e6964c
--- /dev/null
+++ b/common/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= hc2vpp-common-aggregator
+
+Overview of hc2vpp-common-aggregator
\ No newline at end of file

diff --git a/common/hc2vpp-parent/asciidoc/Readme.adoc b/common/hc2vpp-parent/asciidoc/Readme.adoc
new file mode 100644 (file)
index 0000000..34f2350
--- /dev/null
+++ b/common/hc2vpp-parent/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= hc2vpp-aggregator
+
+Single maven parent for all hc2vpp projects. Provides documentation template used by site plugin.
\ No newline at end of file

diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml
new file mode 100644 (file)
index 0000000..e44777e
--- /dev/null
+++ b/common/hc2vpp-parent/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.fd.honeycomb.common</groupId>
+        <artifactId>honeycomb-parent</artifactId>
+        <version>1.17.04-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
+    <name>${project.artifactId}</name>
+    <version>1.17.04-SNAPSHOT</version>
+    <packaging>pom</packaging>
+</project>
\ No newline at end of file

diff --git a/site.xml b/common/hc2vpp-parent/site.xml
similarity index 100%
rename from site.xml
rename to common/hc2vpp-parent/site.xml

diff --git a/common/impl-parent/asciidoc/Readme.adoc b/common/impl-parent/asciidoc/Readme.adoc
new file mode 100644 (file)
index 0000000..6b81b03
--- /dev/null
+++ b/common/impl-parent/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= impl-parent
+
+Common parent for projects implementing translation layer.
\ No newline at end of file

diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
new file mode 100644 (file)
index 0000000..e51413b
--- /dev/null
+++ b/common/impl-parent/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
+        <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../hc2vpp-parent</relativePath>
+    </parent>
+
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>impl-parent</artifactId>
+    <name>${project.artifactId}</name>
+    <version>1.17.04-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <!-- import dependencies from honeycomb impl-parent  -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.fd.honeycomb.common</groupId>
+                <artifactId>impl-parent</artifactId>
+                <version>1.17.04-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file

diff --git a/common/minimal-distribution-parent/asciidoc/Readme.adoc b/common/minimal-distribution-parent/asciidoc/Readme.adoc
new file mode 100644 (file)
index 0000000..7964867
--- /dev/null
+++ b/common/minimal-distribution-parent/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= minimal-distribution-parent
+
+Maven parent for projects that provide honeycomb distribution.
\ No newline at end of file

diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml
new file mode 100644 (file)
index 0000000..ff077ef
--- /dev/null
+++ b/common/minimal-distribution-parent/pom.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
+        <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../hc2vpp-parent</relativePath>
+    </parent>
+
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>minimal-distribution-parent</artifactId>
+    <version>1.17.04-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <properties>
+        <exec.parameters>-Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m</exec.parameters>
+        <exec.parameters.minimal>-client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify</exec.parameters.minimal>
+        <random.seed.file>/dev/./urandom</random.seed.file>
+    </properties>
+
+    <!-- import dependencies from honeycomb minimal-distribution-parent -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.fd.honeycomb.common</groupId>
+                <artifactId>minimal-distribution-parent</artifactId>
+                <version>1.17.04-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <!-- Generate executable shell script -->
+    <build>
+        <!-- HC2VPP-119: settings copied from honeycomb's minimal-distribution-parent -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.6</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <mainClass>${main.class}</mainClass>
+                                <addClasspath>true</addClasspath>
+                                <classpathPrefix>lib/</classpathPrefix>
+                                <useUniqueVersions>false</useUniqueVersions>
+                                <classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
+                            </manifest>
+                            <manifestEntries>
+                                <Class-Path>config/ cert/ modules/</Class-Path>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+                <!-- Copy all dependencies -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.10</version>
+                    <executions>
+                        <execution>
+                            <id>copy-dependencies</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>copy-dependencies</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                <useBaseVersion>true</useBaseVersion>
+                                <useRepositoryLayout>true</useRepositoryLayout>
+                                <excludeArtifactIds>yang-jmx-generator</excludeArtifactIds>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>unpack-configuration</id>
+                            <phase>prepare-package</phase>
+                            <goals>
+                                <goal>unpack-dependencies</goal>
+                            </goals>
+                            <configuration>
+                                <includes>**/honeycomb-minimal-resources/</includes>
+                                <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- Generate shell script -->
+                <!-- Extract modules started by distribution -->
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>groovy-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>start-scripts-generation</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>execute</goal>
+                            </goals>
+                            <configuration>
+                                <source>
+                                    io.fd.honeycomb.common.scripts.StartupScriptGenerator.generate(project, properties, log)
+                                </source>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>distribution-module-assembly</id>
+                            <!-- phase changed from package to earlier phase to generate module descriptor before distribution jar is created,
+                             to include descriptor in the jar,to be accessible to children distributions-->
+                            <phase>prepare-package</phase>
+                            <goals>
+                                <goal>execute</goal>
+                            </goals>
+                            <configuration>
+                                <source>
+                                    io.fd.honeycomb.common.scripts.ModulesListGenerator.generate(project, properties, log)
+                                </source>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>io.fd.honeycomb.common</groupId>
+                            <artifactId>common-scripts</artifactId>
+                            <version>1.17.04-SNAPSHOT</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <!-- Build archives -->
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.5.3</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>io.fd.honeycomb.common</groupId>
+                            <artifactId>minimal-assembly-descriptor</artifactId>
+                            <version>1.17.04-SNAPSHOT</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <id>create-archive</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <descriptorRefs>
+                                    <descriptorRef>honeycomb-minimal</descriptorRef>
+                                </descriptorRefs>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <!--http://stackoverflow.com/questions/18107375/getting-skipping-jacoco-execution-due-to-missing-execution-data-file-upon-exec-->
+                        <argLine>${argLine} -Djava.security.egd=file:${random.seed.file}</argLine>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
\ No newline at end of file

diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644 (file)
index 0000000..26919e9
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
+        <version>1.17.04-SNAPSHOT</version>
+        <relativePath>hc2vpp-parent</relativePath>
+    </parent>
+
+
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-common-aggregator</artifactId>
+    <version>1.17.04-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+    <description>Aggregator for common maven parents providing base configuration for Hc2vpp modules</description>
+
+    <modules>
+        <module>hc2vpp-parent</module>
+        <module>api-parent</module>
+        <module>impl-parent</module>
+        <module>minimal-distribution-parent</module>
+    </modules>
+
+    <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/dhcp/dhcp-api/pom.xml b/dhcp/dhcp-api/pom.xml
index bbeb988..e92df5f 100644 (file)
--- a/dhcp/dhcp-api/pom.xml
+++ b/dhcp/dhcp-api/pom.xml
@@ -14,9 +14,10 @@
  limitations under the License.
 --><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">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/dhcp/pom.xml b/dhcp/pom.xml
index 79d4d65..b9db1b9 100644 (file)
--- a/dhcp/pom.xml
+++ b/dhcp/pom.xml
@@ -17,15 +17,17 @@
   <groupId>io.fd.hc2vpp.dhcp</groupId>
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
   <artifactId>dhcp-aggregator</artifactId>
   <version>1.17.04-SNAPSHOT</version>
   <name>dhcp-aggregator</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
+  <description>Aggregator for Hc2vpp DHCP plugin</description>
 
   <modules>
     <module>dhcp-api</module>

diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml
index 200a06c..37d24f1 100644 (file)
--- a/ioam/api/pom.xml
+++ b/ioam/api/pom.xml
@@ -16,10 +16,10 @@
 <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">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
-
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index e88a040..2c061b1 100644 (file)
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -16,9 +16,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/ioam/pom.xml b/ioam/pom.xml
index 90852df..1bb7037 100644 (file)
--- a/ioam/pom.xml
+++ b/ioam/pom.xml
@@ -16,9 +16,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.ioam</groupId>
@@ -27,7 +28,7 @@
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb iOAM plugin</description>
+  <description>Aggregator for Hc2vpp iOAM plugin</description>
 
   <modules>
     <module>api</module>

diff --git a/l3/api/pom.xml b/l3/api/pom.xml
index df9d9e4..265268a 100644 (file)
--- a/l3/api/pom.xml
+++ b/l3/api/pom.xml
@@ -20,13 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-api</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>

diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml
index 11e7bb9..d57d0cb 100644 (file)
--- a/l3/impl/pom.xml
+++ b/l3/impl/pom.xml
@@ -28,6 +28,7 @@
 
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-impl</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>

diff --git a/l3/pom.xml b/l3/pom.xml
index f2c4fb4..cc8d886 100644 (file)
--- a/l3/pom.xml
+++ b/l3/pom.xml
@@ -19,15 +19,18 @@
          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">
     <parent>
-        <artifactId>hc2vpp-aggregator</artifactId>
-        <groupId>io.fd.hc2vpp</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-aggregator</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Aggregator for Hc2vpp L3 plugin</description>
 
     <modules>
         <module>api</module>

diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml
index 0f7e7f9..3e9dbc1 100644 (file)
--- a/l3/utils/pom.xml
+++ b/l3/utils/pom.xml
@@ -28,6 +28,7 @@
 
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-utils</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>

diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml
index 6dc8d41..3be0799 100755 (executable)
--- a/lisp/api/pom.xml
+++ b/lisp/api/pom.xml
@@ -16,9 +16,10 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/lisp/pom.xml b/lisp/pom.xml
index 6610282..0fd7c03 100755 (executable)
--- a/lisp/pom.xml
+++ b/lisp/pom.xml
@@ -17,9 +17,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>honeycomb-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.lisp</groupId>
@@ -28,7 +29,7 @@
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
-    <description>Aggregator for Honeycomb LISP plugin</description>
+    <description>Aggregator for Hc2vpp LISP plugin</description>
 
     <modules>
         <module>api</module>

diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml
index 74a7253..c29d400 100644 (file)
--- a/nat/nat-api/pom.xml
+++ b/nat/nat-api/pom.xml
@@ -15,9 +15,10 @@
 --><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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/nat/pom.xml b/nat/pom.xml
index 4765cf3..3f24e21 100644 (file)
--- a/nat/pom.xml
+++ b/nat/pom.xml
@@ -16,9 +16,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.nat</groupId>
@@ -27,6 +28,7 @@
   <name>nat-aggregator</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
+  <description>Aggregator for Hc2vpp NAT plugin</description>
 
   <modules>
     <module>nat-api</module>

diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml
index f5cf374..edc0ef9 100644 (file)
--- a/nsh/api/pom.xml
+++ b/nsh/api/pom.xml
@@ -16,9 +16,10 @@
 <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">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index c6de030..beefe37 100644 (file)
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -15,10 +15,10 @@
 -->
 <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">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
-
+    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/nsh/pom.xml b/nsh/pom.xml
index 25c0231..a458481 100644 (file)
--- a/nsh/pom.xml
+++ b/nsh/pom.xml
@@ -16,9 +16,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.nsh</groupId>
@@ -27,7 +28,7 @@
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb NSH_SFC plugin</description>
+  <description>Aggregator for Hc2vpp NSH_SFC plugin</description>
 
   <modules>
     <module>api</module>

diff --git a/pom.xml b/pom.xml
index 6032cc8..3b702ab 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,10 @@
 --><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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp</groupId>
@@ -34,6 +35,7 @@
   </scm>
 
   <modules>
+    <module>common</module>
     <module>vpp-common</module>
     <module>v3po</module>
     <module>ioam</module>

diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 5f2b2bf..4a6b76e 100644 (file)
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -17,9 +17,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp</groupId>
@@ -28,7 +29,7 @@
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <description>Release notes</description>
+  <description>Hc2vpp release notes</description>
 
   <!-- Do not push, this is just a documentation producer -->
   <build>

diff --git a/routing/pom.xml b/routing/pom.xml
index e239569..468a2ec 100644 (file)
--- a/routing/pom.xml
+++ b/routing/pom.xml
@@ -17,9 +17,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>honeycomb-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.routing</groupId>
@@ -31,7 +32,7 @@
     <prerequisites>
         <maven>3.1.1</maven>
     </prerequisites>
-    <description>Aggregator for Honeycomb Routing plugin</description>
+    <description>Aggregator for Hc2vpp Routing plugin</description>
 
     <modules>
         <module>routing-api</module>

diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml
index 97552ac..ab084b5 100644 (file)
--- a/routing/routing-api/pom.xml
+++ b/routing/routing-api/pom.xml
@@ -16,9 +16,10 @@
 <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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/samples/pom.xml b/samples/pom.xml
index a2e058e..1d57450 100644 (file)
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,15 +3,18 @@
          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">
     <parent>
-        <artifactId>hc2vpp-aggregator</artifactId>
-        <groupId>io.fd.hc2vpp</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.hc2vpp.samples</groupId>
     <artifactId>samples</artifactId>
+    <name>${project.artifactId}</name>
     <packaging>pom</packaging>
+    <description>Sample plugin for Hc2vpp</description>
 
     <modules>
         <module>samples-api</module>

diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml
index e1cf9b8..c78dc60 100644 (file)
--- a/samples/samples-api/pom.xml
+++ b/samples/samples-api/pom.xml
@@ -3,14 +3,16 @@
          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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/api-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>samples-api</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 

diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml
index 80d83cc..d4932fd 100644 (file)
--- a/samples/samples-impl/pom.xml
+++ b/samples/samples-impl/pom.xml
@@ -11,6 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>samples-impl</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>

diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml
index 700669e..1eca455 100644 (file)
--- a/v3po/api/pom.xml
+++ b/v3po/api/pom.xml
@@ -15,9 +15,10 @@
 -->
 <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">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/v3po/pom.xml b/v3po/pom.xml
index 35ae858..405d849 100644 (file)
--- a/v3po/pom.xml
+++ b/v3po/pom.xml
@@ -16,9 +16,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.v3po</groupId>
@@ -27,7 +28,7 @@
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb V3PO(VPP core APIs) plugin</description>
+  <description>Aggregator for Hc2vpp V3PO(VPP core APIs) plugin</description>
 
   <modules>
     <module>api</module>

diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml
index ed79610..6bd15a5 100644 (file)
--- a/vpp-classifier/api/pom.xml
+++ b/vpp-classifier/api/pom.xml
@@ -19,14 +19,16 @@
          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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/api-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
     <artifactId>vpp-classifier-api</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 

diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml
index 92c0a6f..69c06e3 100644 (file)
--- a/vpp-classifier/impl/pom.xml
+++ b/vpp-classifier/impl/pom.xml
@@ -29,6 +29,7 @@
 
     <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
     <artifactId>vpp-classifier-impl</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>

diff --git a/vpp-classifier/pom.xml b/vpp-classifier/pom.xml
index 0ff49b6..f08e2ac 100644 (file)
--- a/vpp-classifier/pom.xml
+++ b/vpp-classifier/pom.xml
@@ -19,15 +19,18 @@
          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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>honeycomb-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
     <artifactId>vpp-classifier-aggregator</artifactId>
+    <name>${project.artifactId}</name>
     <packaging>pom</packaging>
+    <description>Aggregator for Hc2vpp vpp-classifier plugin</description>
 
     <modules>
         <module>api</module>

diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml
index 6c16db4..5e686d4 100644 (file)
--- a/vpp-common/naming-context-api/pom.xml
+++ b/vpp-common/naming-context-api/pom.xml
@@ -16,9 +16,10 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml
index 5b0870d..e34d95a 100644 (file)
--- a/vpp-common/naming-context-impl/pom.xml
+++ b/vpp-common/naming-context-impl/pom.xml
@@ -17,9 +17,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml
index a457d39..cc0c1f8 100644 (file)
--- a/vpp-common/pom.xml
+++ b/vpp-common/pom.xml
@@ -16,9 +16,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>honeycomb-parent</artifactId>
+    <groupId>io.fd.hc2vpp.common</groupId>
+    <artifactId>hc2vpp-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.common</groupId>
@@ -27,7 +28,7 @@
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb common code used by Honeycomb plugins for VPP</description>
+  <description>Aggregator for Hc2vpp common code used by plugins for VPP</description>
 
   <modules>
     <module>vpp-translate-utils</module>

diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index 2f2ad29..cca821f 100644 (file)
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -17,9 +17,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>impl-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -102,7 +103,6 @@
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-testlib</artifactId>
-            <version>${guice.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
index d2cdc5d..254e2c7 100644 (file)
--- a/vpp-common/vpp-impl-parent/pom.xml
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -17,9 +17,10 @@
 <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">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml
index 3905915..1276ee5 100644 (file)
--- a/vpp-common/vpp-translate-test/pom.xml
+++ b/vpp-common/vpp-translate-test/pom.xml
@@ -21,7 +21,7 @@
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
-        <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
+        <relativePath>../vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml
index 4094a29..08a1c4d 100644 (file)
--- a/vpp-common/vpp-translate-utils/pom.xml
+++ b/vpp-common/vpp-translate-utils/pom.xml
@@ -20,7 +20,7 @@
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
-        <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
+        <relativePath>../vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 2ae8b5e..91af2b8 100644 (file)
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -17,9 +17,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
+    <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
     <version>1.17.04-SNAPSHOT</version>
+    <relativePath>../../common/minimal-distribution-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml
index 5027172..ddfff67 100644 (file)
--- a/vpp-integration/pom.xml
+++ b/vpp-integration/pom.xml
@@ -17,9 +17,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>honeycomb-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.integration</groupId>
@@ -28,7 +29,7 @@
     <version>1.17.04-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
-    <description>Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins.</description>
+    <description>Aggregator for Honeycomb's VPP distribution. Aggregating all Hc2vpp plugins.</description>
 
     <modules>
         <module>minimal-distribution</module>

diff --git a/vpp-management/api/pom.xml b/vpp-management/api/pom.xml
index 8168257..0337328 100644 (file)
--- a/vpp-management/api/pom.xml
+++ b/vpp-management/api/pom.xml
@@ -21,9 +21,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
+        <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.management</groupId>

diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml
index a87af1d..e8f5cc4 100644 (file)
--- a/vpp-management/pom.xml
+++ b/vpp-management/pom.xml
@@ -19,9 +19,10 @@
          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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>honeycomb-parent</artifactId>
+        <groupId>io.fd.hc2vpp.common</groupId>
+        <artifactId>hc2vpp-parent</artifactId>
         <version>1.17.04-SNAPSHOT</version>
+        <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <packaging>pom</packaging>
@@ -29,7 +30,9 @@
 
     <groupId>io.fd.hc2vpp.management</groupId>
     <artifactId>vpp-management-aggregator</artifactId>
+    <name>${project.artifactId}</name>
     <version>1.17.04-SNAPSHOT</version>
+    <description>Aggregator for Hc2vpp vpp-management plugin</description>
 
     <modules>
         <module>api</module>