From f389e4c8f3ee8b07fc819738e6487759b1b0b482 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 14 Apr 2016 14:21:05 +0200 Subject: [PATCH] BUG-5737: enable OVSDB Maven site This is a first pass: * enable the Maven site * fix up all the URLs * fix the Javadoc error We need to give useful names to all the modules next. Change-Id: Ia9f1ad00210a58c8cc786f68dd8c0047de9a4b48 Signed-off-by: Stephen Kitt --- commons/it/pom.xml | 19 ++++++- commons/pom.xml | 19 ++++++- deploy-site.xml | 50 +++++++++++++++++ hwvtepsouthbound/hwvtepsouthbound-api/pom.xml | 17 +++++- .../hwvtepsouthbound-artifacts/pom.xml | 18 ++++++- .../hwvtepsouthbound-features/pom.xml | 18 ++++++- .../hwvtepsouthbound-impl/pom.xml | 18 ++++++- hwvtepsouthbound/hwvtepsouthbound-it/pom.xml | 18 ++++++- .../hwvtepsouthbound-karaf/pom.xml | 18 ++++++- hwvtepsouthbound/pom.xml | 18 ++++++- library/artifacts/pom.xml | 18 ++++++- library/features/pom.xml | 18 ++++++- library/impl/pom.xml | 17 +++++- library/it/pom.xml | 17 +++++- .../lib/it/LibraryIntegrationTestBase.java | 4 +- library/karaf/pom.xml | 18 ++++++- library/pom.xml | 19 ++++++- pom.xml | 53 ++++++++++++++++++- schemas/hardwarevtep/pom.xml | 21 ++++++-- schemas/openvswitch/pom.xml | 19 ++++++- schemas/pom.xml | 19 ++++++- southbound/pom.xml | 19 ++++++- southbound/southbound-api/pom.xml | 18 ++++++- southbound/southbound-artifacts/pom.xml | 19 ++++++- southbound/southbound-features/pom.xml | 19 ++++++- southbound/southbound-impl/pom.xml | 19 ++++++- southbound/southbound-it/pom.xml | 19 ++++++- southbound/southbound-karaf/pom.xml | 19 ++++++- src/site/site.xml | 15 ++++++ utils/config/pom.xml | 19 ++++++- utils/hwvtepsouthbound-utils/pom.xml | 25 ++++++++- utils/mdsal-node/pom.xml | 19 ++++++- utils/mdsal-openflow/pom.xml | 19 ++++++- utils/mdsal-utils/pom.xml | 23 ++++++++ utils/ovsdb-it-utils/pom.xml | 18 ++++++- utils/pom.xml | 19 ++++++- utils/servicehelper/pom.xml | 19 ++++++- utils/southbound-utils/pom.xml | 23 ++++++++ utils/yang-utils/pom.xml | 23 ++++++++ 39 files changed, 735 insertions(+), 55 deletions(-) create mode 100644 deploy-site.xml create mode 100644 src/site/site.xml diff --git a/commons/it/pom.xml b/commons/it/pom.xml index ef2a15f46..02f528029 100644 --- a/commons/it/pom.xml +++ b/commons/it/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/commons/pom.xml b/commons/pom.xml index 9cd00fa40..81cb79fa9 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/deploy-site.xml b/deploy-site.xml new file mode 100644 index 000000000..2bcd59f0c --- /dev/null +++ b/deploy-site.xml @@ -0,0 +1,50 @@ + + + + + 4.0.0 + + org.opendaylight.ovsdb + deploy-site + 1.6.0-SNAPSHOT + pom + + + master + dav:https://nexus.opendaylight.org/content/sites/site/${project.groupId}/${stream}/ + + + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.9 + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.4 + + ${project.build.directory}/staged-site + + + + + + + + opendaylight-site + ${nexus.site.url} + + + diff --git a/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml index 35c2784d0..d868c4638 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml index 4d443cc9f..1d1b838bf 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml index 3f8ab5200..d1c2348fb 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml index 111194428..044db9b87 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + \ No newline at end of file diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml index 060cb591b..1f7ae1a00 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml index 55bfcb164..d043e9e4b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml index 7bb90e3e8..37ec63e04 100644 --- a/hwvtepsouthbound/pom.xml +++ b/hwvtepsouthbound/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml index 69c69ca2a..cc570c736 100644 --- a/library/artifacts/pom.xml +++ b/library/artifacts/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/library/features/pom.xml b/library/features/pom.xml index 6ab17f4ce..94cf39a8a 100644 --- a/library/features/pom.xml +++ b/library/features/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/library/impl/pom.xml b/library/impl/pom.xml index df742883c..65e82bb49 100644 --- a/library/impl/pom.xml +++ b/library/impl/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/library/it/pom.xml b/library/it/pom.xml index fc6a7a2d9..2b1548d51 100644 --- a/library/it/pom.xml +++ b/library/it/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + \ No newline at end of file diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java index bc801a56b..189e89992 100644 --- a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java +++ b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright © 2015 Red Hat, Inc. and others. All rights reserved. + * Copyright © 2015, 2016 Red Hat, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -222,7 +222,7 @@ public abstract class LibraryIntegrationTestBase extends AbstractMdsalTestBase { * As per RFC 7047, section 4.1.5, if a Monitor request is sent without any columns, the update response will not include * the _uuid column. * ---------------------------------------------------------------------------------------------------------------------------------- - * Each specifies one or more columns and the manner in which the columns (or the entire table) are to be monitored. + * Each <monitor-request> specifies one or more columns and the manner in which the columns (or the entire table) are to be monitored. * The "columns" member specifies the columns whose values are monitored. It MUST NOT contain duplicates. * If "columns" is omitted, all columns in the table, except for "_uuid", are monitored. * ---------------------------------------------------------------------------------------------------------------------------------- diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml index 86f275e05..94e0da059 100644 --- a/library/karaf/pom.xml +++ b/library/karaf/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/library/pom.xml b/library/pom.xml index 4cfb2a205..4392a3711 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/pom.xml b/pom.xml index 4d62095cb..0808bc0e0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ pom The OVSDB Plugin integration project is a project for OpenDaylight that will implement the Open vSwitch Database RFC 7047 management protocol allowing the Southbound configuration of vSwitches and a network virtualization implementation. - https://wiki.opendaylight.org/view/OVSDB_Integration:Main Eclipse Public License v1.0 @@ -77,4 +76,54 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + + + + maven-site + + + ${user.dir}/deploy-site.xml + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + false + + + aggregate + + aggregate + + package + + + + + + + + + + ${odl.site.url}/${project.groupId}/${stream}/ + + + + opendaylight-site + ${nexus.site.url}/ + + \ No newline at end of file diff --git a/schemas/hardwarevtep/pom.xml b/schemas/hardwarevtep/pom.xml index 5e4573bf7..d08551377 100755 --- a/schemas/hardwarevtep/pom.xml +++ b/schemas/hardwarevtep/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/schemas/openvswitch/pom.xml b/schemas/openvswitch/pom.xml index a6c10dfa5..e1ba3e8df 100755 --- a/schemas/openvswitch/pom.xml +++ b/schemas/openvswitch/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/schemas/pom.xml b/schemas/pom.xml index 05859d156..29953c3fd 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/pom.xml b/southbound/pom.xml index 85b2527cf..c5efc5a9b 100644 --- a/southbound/pom.xml +++ b/southbound/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/southbound-api/pom.xml b/southbound/southbound-api/pom.xml index 44b412795..af0bf1774 100644 --- a/southbound/southbound-api/pom.xml +++ b/southbound/southbound-api/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml index f4a25c116..eb75ca349 100644 --- a/southbound/southbound-artifacts/pom.xml +++ b/southbound/southbound-artifacts/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml index f80eeb265..989df44ab 100644 --- a/southbound/southbound-features/pom.xml +++ b/southbound/southbound-features/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml index 062bf28e4..6a229912e 100644 --- a/southbound/southbound-impl/pom.xml +++ b/southbound/southbound-impl/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/southbound-it/pom.xml b/southbound/southbound-it/pom.xml index e7b3bc50d..38bbb1c41 100644 --- a/southbound/southbound-it/pom.xml +++ b/southbound/southbound-it/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml index 34e4eede2..fa0a10a0e 100644 --- a/southbound/southbound-karaf/pom.xml +++ b/southbound/southbound-karaf/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 000000000..5af3252a2 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/utils/config/pom.xml b/utils/config/pom.xml index 029c4c604..53c4692b9 100644 --- a/utils/config/pom.xml +++ b/utils/config/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/hwvtepsouthbound-utils/pom.xml b/utils/hwvtepsouthbound-utils/pom.xml index 0eeb3221b..0c764c375 100644 --- a/utils/hwvtepsouthbound-utils/pom.xml +++ b/utils/hwvtepsouthbound-utils/pom.xml @@ -1,4 +1,11 @@ + @@ -44,4 +51,20 @@ test - \ No newline at end of file + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + diff --git a/utils/mdsal-node/pom.xml b/utils/mdsal-node/pom.xml index 66b5dc786..6f4fa8281 100644 --- a/utils/mdsal-node/pom.xml +++ b/utils/mdsal-node/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/mdsal-openflow/pom.xml b/utils/mdsal-openflow/pom.xml index b44c5d83f..1e3392979 100644 --- a/utils/mdsal-openflow/pom.xml +++ b/utils/mdsal-openflow/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/mdsal-utils/pom.xml b/utils/mdsal-utils/pom.xml index ef5b52c89..2c49e50b3 100644 --- a/utils/mdsal-utils/pom.xml +++ b/utils/mdsal-utils/pom.xml @@ -1,4 +1,11 @@ + @@ -69,4 +76,20 @@ + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/ovsdb-it-utils/pom.xml b/utils/ovsdb-it-utils/pom.xml index aba2cd504..cf5f6dec2 100644 --- a/utils/ovsdb-it-utils/pom.xml +++ b/utils/ovsdb-it-utils/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/pom.xml b/utils/pom.xml index 1ed1de2c5..b1a0a7482 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/servicehelper/pom.xml b/utils/servicehelper/pom.xml index 0e2c58ad1..371b21ade 100644 --- a/utils/servicehelper/pom.xml +++ b/utils/servicehelper/pom.xml @@ -1,6 +1,6 @@ + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/southbound-utils/pom.xml b/utils/southbound-utils/pom.xml index 775fb3603..8d890ab0a 100644 --- a/utils/southbound-utils/pom.xml +++ b/utils/southbound-utils/pom.xml @@ -1,4 +1,11 @@ + @@ -66,4 +73,20 @@ + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/utils/yang-utils/pom.xml b/utils/yang-utils/pom.xml index b8a502d5c..4324341a0 100644 --- a/utils/yang-utils/pom.xml +++ b/utils/yang-utils/pom.xml @@ -1,4 +1,11 @@ + @@ -47,4 +54,20 @@ + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + -- 2.36.6