From c7299c6ea39c1888a3497a889ee9b55c44b54dac Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 17 Mar 2017 14:42:56 +0100 Subject: 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 --- acl/acl-api/pom.xml | 3 +- acl/acl-impl/pom.xml | 3 +- acl/pom.xml | 6 +- common/api-parent/asciidoc/Readme.adoc | 3 + common/api-parent/pom.xml | 110 +++++++++++++ common/asciidoc/Readme.adoc | 3 + common/hc2vpp-parent/asciidoc/Readme.adoc | 3 + common/hc2vpp-parent/pom.xml | 19 +++ common/hc2vpp-parent/site.xml | 39 +++++ common/impl-parent/asciidoc/Readme.adoc | 3 + common/impl-parent/pom.xml | 32 ++++ .../asciidoc/Readme.adoc | 3 + common/minimal-distribution-parent/pom.xml | 176 +++++++++++++++++++++ common/pom.xml | 49 ++++++ dhcp/dhcp-api/pom.xml | 3 +- dhcp/pom.xml | 6 +- ioam/api/pom.xml | 4 +- ioam/impl/pom.xml | 3 +- ioam/pom.xml | 7 +- l3/api/pom.xml | 4 +- l3/impl/pom.xml | 1 + l3/pom.xml | 7 +- l3/utils/pom.xml | 1 + lisp/api/pom.xml | 3 +- lisp/pom.xml | 7 +- nat/nat-api/pom.xml | 3 +- nat/pom.xml | 6 +- nsh/api/pom.xml | 3 +- nsh/impl/pom.xml | 4 +- nsh/pom.xml | 7 +- pom.xml | 6 +- release-notes/pom.xml | 7 +- routing/pom.xml | 7 +- routing/routing-api/pom.xml | 3 +- samples/pom.xml | 7 +- samples/samples-api/pom.xml | 4 +- samples/samples-impl/pom.xml | 1 + site.xml | 39 ----- v3po/api/pom.xml | 3 +- v3po/pom.xml | 7 +- vpp-classifier/api/pom.xml | 4 +- vpp-classifier/impl/pom.xml | 1 + vpp-classifier/pom.xml | 7 +- vpp-common/naming-context-api/pom.xml | 3 +- vpp-common/naming-context-impl/pom.xml | 3 +- vpp-common/pom.xml | 7 +- vpp-common/vpp-common-integration/pom.xml | 4 +- vpp-common/vpp-impl-parent/pom.xml | 3 +- vpp-common/vpp-translate-test/pom.xml | 2 +- vpp-common/vpp-translate-utils/pom.xml | 2 +- vpp-integration/minimal-distribution/pom.xml | 3 +- vpp-integration/pom.xml | 7 +- vpp-management/api/pom.xml | 3 +- vpp-management/pom.xml | 7 +- 54 files changed, 557 insertions(+), 104 deletions(-) create mode 100644 common/api-parent/asciidoc/Readme.adoc create mode 100644 common/api-parent/pom.xml create mode 100644 common/asciidoc/Readme.adoc create mode 100644 common/hc2vpp-parent/asciidoc/Readme.adoc create mode 100644 common/hc2vpp-parent/pom.xml create mode 100644 common/hc2vpp-parent/site.xml create mode 100644 common/impl-parent/asciidoc/Readme.adoc create mode 100644 common/impl-parent/pom.xml create mode 100644 common/minimal-distribution-parent/asciidoc/Readme.adoc create mode 100644 common/minimal-distribution-parent/pom.xml create mode 100644 common/pom.xml delete mode 100644 site.xml diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index feed86bf1..8c200ce9d 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -14,9 +14,10 @@ limitations under the License. --> - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 6f2775561..c524a2d59 100644 --- 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"> - io.fd.honeycomb.common + io.fd.hc2vpp.common impl-parent 1.17.04-SNAPSHOT + ../../common/impl-parent 4.0.0 diff --git a/acl/pom.xml b/acl/pom.xml index 6b3643ebb..14b9e0b40 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -17,15 +17,17 @@ io.fd.hc2vpp.acl - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent acl-aggregator 1.17.04-SNAPSHOT acl-aggregator pom 4.0.0 + Aggregator for Hc2vpp ACL plugin acl-api diff --git a/common/api-parent/asciidoc/Readme.adoc b/common/api-parent/asciidoc/Readme.adoc new file mode 100644 index 000000000..73d562439 --- /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 index 000000000..f1c899b8c --- /dev/null +++ b/common/api-parent/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + + io.fd.hc2vpp.common + hc2vpp-parent + 1.17.04-SNAPSHOT + ../hc2vpp-parent + + + io.fd.hc2vpp.common + api-parent + ${project.artifactId} + 1.17.04-SNAPSHOT + pom + + + + + + + org.opendaylight.yangtools + yang-maven-plugin + ${yangtools.version} + + + org.opendaylight.mdsal + maven-sal-api-gen-plugin + 0.8.4-Beryllium-SR4 + jar + + + + + binding + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + maven-clean-plugin + + + + ${salGeneratorPath} + + ** + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-yang-sources + generate-sources + + add-source + + + + ${salGeneratorPath} + + + + + + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.yangtools + yang-common + + + diff --git a/common/asciidoc/Readme.adoc b/common/asciidoc/Readme.adoc new file mode 100644 index 000000000..8e6964cc4 --- /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 index 000000000..34f235045 --- /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 index 000000000..e44777e99 --- /dev/null +++ b/common/hc2vpp-parent/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + + io.fd.honeycomb.common + honeycomb-parent + 1.17.04-SNAPSHOT + + + + io.fd.hc2vpp.common + hc2vpp-parent + ${project.artifactId} + 1.17.04-SNAPSHOT + pom + \ No newline at end of file diff --git a/common/hc2vpp-parent/site.xml b/common/hc2vpp-parent/site.xml new file mode 100644 index 000000000..dcd60a1a7 --- /dev/null +++ b/common/hc2vpp-parent/site.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + org.apache.maven.skins + maven-fluido-skin + 1.5 + + \ No newline at end of file diff --git a/common/impl-parent/asciidoc/Readme.adoc b/common/impl-parent/asciidoc/Readme.adoc new file mode 100644 index 000000000..6b81b03bc --- /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 index 000000000..e51413b1a --- /dev/null +++ b/common/impl-parent/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + + io.fd.hc2vpp.common + hc2vpp-parent + 1.17.04-SNAPSHOT + ../hc2vpp-parent + + + io.fd.hc2vpp.common + impl-parent + ${project.artifactId} + 1.17.04-SNAPSHOT + pom + + + + + + io.fd.honeycomb.common + impl-parent + 1.17.04-SNAPSHOT + pom + import + + + + \ 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 index 000000000..7964867a3 --- /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 index 000000000..ff077ef0b --- /dev/null +++ b/common/minimal-distribution-parent/pom.xml @@ -0,0 +1,176 @@ + + + 4.0.0 + + + io.fd.hc2vpp.common + hc2vpp-parent + 1.17.04-SNAPSHOT + ../hc2vpp-parent + + + io.fd.hc2vpp.common + minimal-distribution-parent + 1.17.04-SNAPSHOT + ${project.artifactId} + pom + + + -Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m + -client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify + /dev/./urandom + + + + + + + io.fd.honeycomb.common + minimal-distribution-parent + 1.17.04-SNAPSHOT + pom + import + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + + ${main.class} + true + lib/ + false + true + + + config/ cert/ modules/ + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/lib + true + true + yang-jmx-generator + + + + unpack-configuration + prepare-package + + unpack-dependencies + + + **/honeycomb-minimal-resources/ + ${project.build.outputDirectory}/ + + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + + + start-scripts-generation + package + + execute + + + + io.fd.honeycomb.common.scripts.StartupScriptGenerator.generate(project, properties, log) + + + + + distribution-module-assembly + + prepare-package + + execute + + + + io.fd.honeycomb.common.scripts.ModulesListGenerator.generate(project, properties, log) + + + + + + + io.fd.honeycomb.common + common-scripts + 1.17.04-SNAPSHOT + + + + + + + maven-assembly-plugin + 2.5.3 + + + io.fd.honeycomb.common + minimal-assembly-descriptor + 1.17.04-SNAPSHOT + + + + + create-archive + package + + single + + + + honeycomb-minimal + + + + + + + + maven-surefire-plugin + + + ${argLine} -Djava.security.egd=file:${random.seed.file} + + + + + + \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 000000000..26919e97b --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + + io.fd.hc2vpp.common + hc2vpp-parent + 1.17.04-SNAPSHOT + hc2vpp-parent + + + + io.fd.hc2vpp.common + hc2vpp-common-aggregator + 1.17.04-SNAPSHOT + ${project.artifactId} + pom + Aggregator for common maven parents providing base configuration for Hc2vpp modules + + + hc2vpp-parent + api-parent + impl-parent + minimal-distribution-parent + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + + diff --git a/dhcp/dhcp-api/pom.xml b/dhcp/dhcp-api/pom.xml index bbeb988f3..e92df5f2b 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -14,9 +14,10 @@ limitations under the License. --> - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 79d4d6587..b9db1b935 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -17,15 +17,17 @@ io.fd.hc2vpp.dhcp - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent dhcp-aggregator 1.17.04-SNAPSHOT dhcp-aggregator pom 4.0.0 + Aggregator for Hc2vpp DHCP plugin dhcp-api diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 200a06ccd..37d24f151 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -16,10 +16,10 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT - + ../../common/api-parent 4.0.0 diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index e88a040f6..2c061b1a8 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common impl-parent 1.17.04-SNAPSHOT + ../../common/impl-parent 4.0.0 diff --git a/ioam/pom.xml b/ioam/pom.xml index 90852df8c..1bb703715 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.ioam @@ -27,7 +28,7 @@ ${project.artifactId} pom 4.0.0 - Aggregator for Honeycomb iOAM plugin + Aggregator for Hc2vpp iOAM plugin api diff --git a/l3/api/pom.xml b/l3/api/pom.xml index df9d9e4ab..265268aaa 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -20,13 +20,15 @@ 4.0.0 - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent io.fd.hc2vpp.l3 l3-api + ${project.artifactId} 1.17.04-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 11e7bb97b..d57d0cb94 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -28,6 +28,7 @@ io.fd.hc2vpp.l3 l3-impl + ${project.artifactId} 1.17.04-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index f2c4fb4c2..cc8d88670 100644 --- 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"> - hc2vpp-aggregator - io.fd.hc2vpp + hc2vpp-parent + io.fd.hc2vpp.common 1.17.04-SNAPSHOT + ../common/hc2vpp-parent pom 4.0.0 io.fd.hc2vpp.l3 l3-aggregator + ${project.artifactId} + Aggregator for Hc2vpp L3 plugin api diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 0f7e7f91b..3e9dbc196 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -28,6 +28,7 @@ io.fd.hc2vpp.l3 l3-utils + ${project.artifactId} 1.17.04-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 6dc8d41ad..3be0799c9 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/lisp/pom.xml b/lisp/pom.xml index 661028286..0fd7c0355 100755 --- 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"> - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.lisp @@ -28,7 +29,7 @@ ${project.artifactId} pom 4.0.0 - Aggregator for Honeycomb LISP plugin + Aggregator for Hc2vpp LISP plugin api diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 74a725370..c29d40010 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -15,9 +15,10 @@ --> - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/nat/pom.xml b/nat/pom.xml index 4765cf394..3f24e214a 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.nat @@ -27,6 +28,7 @@ nat-aggregator pom 4.0.0 + Aggregator for Hc2vpp NAT plugin nat-api diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index f5cf3747a..edc0ef9c5 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index c6de030e9..beefe370b 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -15,10 +15,10 @@ --> - io.fd.honeycomb.common + io.fd.hc2vpp.common impl-parent 1.17.04-SNAPSHOT - + ../../common/impl-parent 4.0.0 diff --git a/nsh/pom.xml b/nsh/pom.xml index 25c023123..a4584814c 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.nsh @@ -27,7 +28,7 @@ ${project.artifactId} pom 4.0.0 - Aggregator for Honeycomb NSH_SFC plugin + Aggregator for Hc2vpp NSH_SFC plugin api diff --git a/pom.xml b/pom.xml index 6032cc843..3b702abe7 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,10 @@ --> - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + common/hc2vpp-parent io.fd.hc2vpp @@ -34,6 +35,7 @@ + common vpp-common v3po ioam diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 5f2b2bf4f..4a6b76ebe 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -17,9 +17,10 @@ - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp @@ -28,7 +29,7 @@ ${project.artifactId} pom 4.0.0 - Release notes + Hc2vpp release notes diff --git a/routing/pom.xml b/routing/pom.xml index e23956972..468a2ec98 100644 --- 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"> - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.routing @@ -31,7 +32,7 @@ 3.1.1 - Aggregator for Honeycomb Routing plugin + Aggregator for Hc2vpp Routing plugin routing-api diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 97552ac41..ab084b549 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/samples/pom.xml b/samples/pom.xml index a2e058e49..1d5745098 100644 --- 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"> - hc2vpp-aggregator - io.fd.hc2vpp + hc2vpp-parent + io.fd.hc2vpp.common 1.17.04-SNAPSHOT + ../common/hc2vpp-parent 4.0.0 io.fd.hc2vpp.samples samples + ${project.artifactId} pom + Sample plugin for Hc2vpp samples-api diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index e1cf9b817..c78dc6091 100644 --- 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"> - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 io.fd.hc2vpp.common samples-api + ${project.artifactId} 1.17.04-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 80d83cc88..d4932fd68 100644 --- a/samples/samples-impl/pom.xml +++ b/samples/samples-impl/pom.xml @@ -11,6 +11,7 @@ 4.0.0 samples-impl + ${project.artifactId} 1.17.04-SNAPSHOT diff --git a/site.xml b/site.xml deleted file mode 100644 index dcd60a1a7..000000000 --- a/site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - org.apache.maven.skins - maven-fluido-skin - 1.5 - - \ No newline at end of file diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 700669e7b..1eca45549 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -15,9 +15,10 @@ --> - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 diff --git a/v3po/pom.xml b/v3po/pom.xml index 35ae858c1..405d849df 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -16,9 +16,10 @@ - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.v3po @@ -27,7 +28,7 @@ ${project.artifactId} pom 4.0.0 - Aggregator for Honeycomb V3PO(VPP core APIs) plugin + Aggregator for Hc2vpp V3PO(VPP core APIs) plugin api diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index ed79610ab..6bd15a5c8 100644 --- 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"> - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 io.fd.hc2vpp.vpp.classifier vpp-classifier-api + ${project.artifactId} 1.17.04-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 92c0a6f3b..69c06e327 100644 --- a/vpp-classifier/impl/pom.xml +++ b/vpp-classifier/impl/pom.xml @@ -29,6 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl + ${project.artifactId} 1.17.04-SNAPSHOT diff --git a/vpp-classifier/pom.xml b/vpp-classifier/pom.xml index 0ff49b6a7..f08e2ac51 100644 --- 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"> - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent 4.0.0 io.fd.hc2vpp.vpp.classifier vpp-classifier-aggregator + ${project.artifactId} pom + Aggregator for Hc2vpp vpp-classifier plugin api 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 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent 4.0.0 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 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common impl-parent 1.17.04-SNAPSHOT + ../../common/impl-parent 4.0.0 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 @@ - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.common @@ -27,7 +28,7 @@ ${project.artifactId} pom 4.0.0 - Aggregator for Honeycomb common code used by Honeycomb plugins for VPP + Aggregator for Hc2vpp common code used by plugins for VPP vpp-translate-utils 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"> - io.fd.honeycomb.common + io.fd.hc2vpp.common impl-parent 1.17.04-SNAPSHOT + ../../common/impl-parent 4.0.0 @@ -102,7 +103,6 @@ com.google.inject.extensions guice-testlib - ${guice.version} test 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 @@ - io.fd.honeycomb.common + io.fd.hc2vpp.common impl-parent 1.17.04-SNAPSHOT + ../../common/impl-parent 4.0.0 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 @@ io.fd.hc2vpp.common vpp-impl-parent 1.17.04-SNAPSHOT - ../../vpp-common/vpp-impl-parent + ../vpp-impl-parent 4.0.0 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 @@ io.fd.hc2vpp.common vpp-impl-parent 1.17.04-SNAPSHOT - ../../vpp-common/vpp-impl-parent + ../vpp-impl-parent 4.0.0 diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 2ae8b5e1f..91af2b83f 100644 --- 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"> - io.fd.honeycomb.common + io.fd.hc2vpp.common minimal-distribution-parent 1.17.04-SNAPSHOT + ../../common/minimal-distribution-parent 4.0.0 diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 502717221..ddfff6730 100644 --- 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"> - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent io.fd.hc2vpp.integration @@ -28,7 +29,7 @@ 1.17.04-SNAPSHOT pom 4.0.0 - Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins. + Aggregator for Honeycomb's VPP distribution. Aggregating all Hc2vpp plugins. minimal-distribution diff --git a/vpp-management/api/pom.xml b/vpp-management/api/pom.xml index 8168257e2..033732892 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -21,9 +21,10 @@ 4.0.0 - io.fd.honeycomb.common + io.fd.hc2vpp.common api-parent 1.17.04-SNAPSHOT + ../../common/api-parent io.fd.hc2vpp.management diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index a87af1d9d..e8f5cc445 100644 --- 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"> - io.fd.honeycomb.common - honeycomb-parent + io.fd.hc2vpp.common + hc2vpp-parent 1.17.04-SNAPSHOT + ../common/hc2vpp-parent pom @@ -29,7 +30,9 @@ io.fd.hc2vpp.management vpp-management-aggregator + ${project.artifactId} 1.17.04-SNAPSHOT + Aggregator for Hc2vpp vpp-management plugin api -- cgit 1.2.3-korg