diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-03-17 14:42:56 +0100 |
---|---|---|
committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-03-24 08:03:43 +0000 |
commit | c7299c6ea39c1888a3497a889ee9b55c44b54dac (patch) | |
tree | 91bc7c9b22eaf2118857351052bddfaeb304fb95 /vpp-common | |
parent | 66f5caa2704503335cbce2a42bad3d99bd205f88 (diff) |
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>
Diffstat (limited to 'vpp-common')
-rw-r--r-- | vpp-common/naming-context-api/pom.xml | 3 | ||||
-rw-r--r-- | vpp-common/naming-context-impl/pom.xml | 3 | ||||
-rw-r--r-- | vpp-common/pom.xml | 7 | ||||
-rw-r--r-- | vpp-common/vpp-common-integration/pom.xml | 4 | ||||
-rw-r--r-- | vpp-common/vpp-impl-parent/pom.xml | 3 | ||||
-rw-r--r-- | vpp-common/vpp-translate-test/pom.xml | 2 | ||||
-rw-r--r-- | vpp-common/vpp-translate-utils/pom.xml | 2 |
7 files changed, 14 insertions, 10 deletions
diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml index 6c16db4d2..5e686d43a 100644 --- 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 5b0870dc8..e34d95af2 100644 --- 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 a457d393a..cc0c1f8dd 100644 --- 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 2f2ad297e..cca821f3f 100644 --- 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 d2cdc5d14..254e2c757 100644 --- 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 39059156f..1276ee578 100644 --- 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 4094a293a..08a1c4de1 100644 --- 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> |