From: Sam Hague Date: Wed, 18 Feb 2015 03:36:45 +0000 (-0500) Subject: Clean up pom files. X-Git-Tag: release/lithium~378 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=93bc8d822fb91c0978ef5089e39f021942f8a912;p=ovsdb.git Clean up pom files. - Add missing Copyright headers. - Remove duplicated properties that are pulled from odlparent Change-Id: Ia36dd455de988fb6be4f1a2d90cd7291878fe7d5 Signed-off-by: Sam Hague --- diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml index b88423ec5..ccaf699e9 100644 --- a/commons/integrationtest/pom.xml +++ b/commons/integrationtest/pom.xml @@ -1,14 +1,25 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../parent + commons.integrationtest - OVSDB Integration Test Parent POM + ${project.artifactId}.parent 1.3.0-SNAPSHOT pom @@ -666,7 +677,7 @@ org.opendaylight.ovsdb - plugin + northbound org.opendaylight.ovsdb @@ -674,15 +685,15 @@ org.opendaylight.ovsdb - northbound + plugin org.opendaylight.ovsdb - schema.openvswitch + schema.hardwarevtep org.opendaylight.ovsdb - schema.hardwarevtep + schema.openvswitch @@ -715,7 +726,7 @@ logback.configurationFile - ${project.parent.parent.basedir}/logback.xml + diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 764232c96..a3b3b7afd 100755 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -1,83 +1,87 @@ - + + 4.0.0 org.opendaylight.odlparent odlparent 1.5.0-SNAPSHOT - org.opendaylight.ovsdb commons - OVSDB Parent POM + ${project.artifactId}.parent 1.3.0-SNAPSHOT pom + - 3.0 + 3.1.1 + 0.1.0-SNAPSHOT 1.0.0 http://nexus.opendaylight.org/content -Xmx1024m -XX:MaxPermSize=256m - - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT 0.7.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 0.1.0-SNAPSHOT 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT - 0.1.0-SNAPSHOT true + false true false - false - + ${env.PWD} - - target/code-coverage/jacoco.exec ${root.directory}/target/code-coverage/jacoco-it.exec reuseReports - - 0.6.4.201312101107 + 0.6.0-SNAPSHOT 0.6.0-SNAPSHOT + 0.3.0-SNAPSHOT 0.7.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.9.0-SNAPSHOT + 2010.09.24.7-SNAPSHOT + 2013.07.15.7-SNAPSHOT 1.2.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 1.5.0-SNAPSHOT 2013.08.27.7-SNAPSHOT - 0.1.0-SNAPSHOT 0.1.0-SNAPSHOT 0.1.0-SNAPSHOT 0.6.0-SNAPSHOT - 0.3.0-SNAPSHOT + 0.1.0-SNAPSHOT + 0.9.0-SNAPSHOT 0.8.0-SNAPSHOT 0.7.0-SNAPSHOT 2013.09.07.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.07.15.7-SNAPSHOT - 0.5.0-SNAPSHOT - 0.1.0-SNAPSHOT 1.0 + 4.2.1 2.0 1.5.2 - 4.2.1 - 3.0.0 - 1.5.0-SNAPSHOT - 0.5.0-SNAPSHOT @@ -102,35 +106,20 @@ httpcore-nio ${httpcomponents.version} - - org.powermock - powermock-module-junit4 - ${powermock.version} - - - org.powermock - powermock-api-mockito - ${powermock.version} - - - org.powermock - powermock-core - ${powermock.version} - org.opendaylight.controller - clustering.services - ${clustering.services.version} + commons.northbound + ${northbound.commons.version} org.opendaylight.controller - sal - ${sal.version} + config-api + ${controller.config.version} org.opendaylight.controller - sal-common-api - ${mdsal.version} + clustering.services + ${clustering.services.version} org.opendaylight.controller @@ -147,6 +136,17 @@ networkconfig.neutron ${networkconfig.neutron.version} + + org.opendaylight.controller + opendaylight-karaf-empty + 1.5.0-SNAPSHOT + zip + + + org.opendaylight.controller + sal + ${sal.version} + org.opendaylight.controller sal-binding-api @@ -157,6 +157,11 @@ sal-binding-config ${mdsal.version} + + org.opendaylight.controller + sal-common-api + ${mdsal.version} + org.opendaylight.controller sal-common-util @@ -174,12 +179,12 @@ org.opendaylight.controller.model - model-flow-statistics + model-flow-service ${mdsal.version} org.opendaylight.controller.model - model-flow-service + model-flow-statistics ${mdsal.version} @@ -223,81 +228,65 @@ ietf-yang-types-20130715 ${ietf.yang.types.version} - - org.opendaylight.yangtools.model - yang-ext - ${yang-ext.version} - org.opendaylight.yangtools.model opendaylight-l2-types ${opendaylight-l2-types.version} - org.opendaylight.controller - opendaylight-karaf-empty - 1.5.0-SNAPSHOT - zip - - - org.opendaylight.controller - commons.northbound - ${northbound.commons.version} + org.opendaylight.yangtools.model + yang-ext + ${yang-ext.version} - org.opendaylight.controller - config-api - ${controller.config.version} + org.opendaylight.openflowjava + openflow-protocol-api + ${openflowjava.version} - org.opendaylight.openflowjava - openflow-protocol-api - ${openflowjava.version} + org.opendaylight.openflowjava + openflow-protocol-impl + ${openflowjava.version} - org.opendaylight.openflowjava - openflow-protocol-spi - ${openflowjava.version} + org.opendaylight.openflowjava + openflow-protocol-spi + ${openflowjava.version} - - org.opendaylight.openflowjava - openflow-protocol-impl - ${openflowjava.version} - - org.opendaylight.openflowjava - util - ${openflowjava.version} + org.opendaylight.openflowjava + util + ${openflowjava.version} - org.opendaylight.openflowplugin - openflowjava-extension-nicira-api - ${openflowjava-nicira.version} + org.opendaylight.openflowplugin + openflowplugin + ${openflowplugin.version} - org.opendaylight.openflowplugin - openflowjava-extension-nicira - ${openflowjava-nicira.version} + org.opendaylight.openflowplugin + openflowjava-extension-nicira + ${openflowjava-nicira.version} - org.opendaylight.openflowplugin - openflowplugin-extension-api - ${openflowplugin.version} + org.opendaylight.openflowplugin + openflowjava-extension-nicira-api + ${openflowjava-nicira.version} - org.opendaylight.openflowplugin - openflowplugin-extension-nicira - ${openflowplugin.version} + org.opendaylight.openflowplugin + openflowplugin-extension-api + ${openflowplugin.version} - org.opendaylight.openflowplugin - openflowplugin-extension-nicira-config - ${openflowplugin.version} + org.opendaylight.openflowplugin + openflowplugin-extension-nicira + ${openflowplugin.version} - org.opendaylight.openflowplugin - openflowplugin - ${openflowplugin.version} + org.opendaylight.openflowplugin + openflowplugin-extension-nicira-config + ${openflowplugin.version} org.opendaylight.ovsdb @@ -306,13 +295,8 @@ org.opendaylight.ovsdb - plugin - ${ovsdb.plugin.version} - - - org.opendaylight.ovsdb - plugin-shell - ${plugin.shell.version} + northbound + ${ovsdb.northbound.version} org.opendaylight.ovsdb @@ -326,8 +310,18 @@ org.opendaylight.ovsdb - northbound - ${ovsdb.northbound.version} + plugin + ${ovsdb.plugin.version} + + + org.opendaylight.ovsdb + plugin-mdsal-adapter + ${ovsdb.plugin.version} + + + org.opendaylight.ovsdb + plugin-shell + ${plugin.shell.version} org.opendaylight.ovsdb @@ -339,11 +333,6 @@ schema.openvswitch ${schema.openvswitch.version} - - org.opendaylight.ovsdb - plugin-mdsal-adapter - ${ovsdb.plugin.version} - org.opendaylight.ovsdb utils.config @@ -354,6 +343,21 @@ utils.mdsal-openflow ${utils.mdsal.openflow.version} + + org.powermock + powermock-module-junit4 + ${powermock.version} + + + org.powermock + powermock-api-mockito + ${powermock.version} + + + org.powermock + powermock-core + ${powermock.version} + @@ -517,12 +521,10 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.version} org.apache.maven.plugins maven-failsafe-plugin - ${failsafe.version} failsafe-integration-tests @@ -594,7 +596,7 @@ - https://wiki.opendaylight.org/view/OVSDB_Integration:Main + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git scm:git:ssh://git.opendaylight.org:29418/ovsdb.git @@ -602,86 +604,6 @@ https://wiki.opendaylight.org/view/OVSDB_Integration:Main - - - - opendaylight-public - opendaylight-public - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - opendaylight-release - opendaylight-release - http://nexus.opendaylight.org/content/repositories/opendaylight.release/ - - false - - - true - - - - - opendaylight-snapshot - opendaylight-snapshot - http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - true - - - false - - - - - - - - opendaylight-public - opendaylight-public - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - opendaylight-release - opendaylight-release - http://nexus.opendaylight.org/content/repositories/opendaylight.release/ - - false - - - true - - - - - opendaylight-snapshot - opendaylight-snapshot - http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - true - - - false - - - - integrationtest diff --git a/distribution/opendaylight-karaf/pom.xml b/distribution/opendaylight-karaf/pom.xml index b542ba71a..7dc7a0b1c 100644 --- a/distribution/opendaylight-karaf/pom.xml +++ b/distribution/opendaylight-karaf/pom.xml @@ -1,23 +1,34 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../../commons/parent/ + distribution-karaf org.opendaylight.ovsdb - OpenDaylight OVSDB Karaf Distribution pom + - 3.0 + 3.1.1 + 1.1.0-SNAPSHOT 1.5.0-SNAPSHOT - 3.0.1 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml index ac2e1d63f..978de63b0 100644 --- a/features/ovs-sfc/pom.xml +++ b/features/ovs-sfc/pom.xml @@ -1,31 +1,31 @@ +Copyright (C) 2014 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, +and is available at http://www.eclipse.org/legal/epl-v10.html +--> + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../../commons/parent + features-ovs-sfc - OpenDaylight OVSDB OVS Service Function Chaining Karaf Features 0.1.0-SNAPSHOT jar + features.xml + org.opendaylight.yangtools @@ -37,6 +37,7 @@ zip + @@ -84,10 +85,4 @@ - - scm:git:ssh://git.opendaylight.org:29418/ovsdb.git - scm:git:ssh://git.opendaylight.org:29418/ovsdb.git - HEAD - https://wiki.opendaylight.org/view/OVSDB_Integration:Main - diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml index 519177104..510184d39 100644 --- a/features/ovsdb/pom.xml +++ b/features/ovsdb/pom.xml @@ -1,19 +1,31 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../../commons/parent + features-ovsdb - OpenDaylight OVSDB Project Karaf Features 1.1.0-SNAPSHOT jar + features.xml + org.opendaylight.controller diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 740edb19d..259c55f73 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -1,9 +1,16 @@ + - 4.0.0 + org.opendaylight.ovsdb commons.integrationtest @@ -13,7 +20,6 @@ integrationtest 1.3.0-SNAPSHOT - OpenDaylight OVSDB Integration Tests jar diff --git a/library/pom.xml b/library/pom.xml index 1c74d6555..8f8067241 100755 --- a/library/pom.xml +++ b/library/pom.xml @@ -1,6 +1,16 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons @@ -10,7 +20,6 @@ library 1.1.0-SNAPSHOT - OVSDB Library bundle diff --git a/northbound/pom.xml b/northbound/pom.xml index 2e5b5d7ee..594fd4cc5 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -1,15 +1,25 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../commons/parent + northbound 0.7.0-SNAPSHOT - OpenDaylight OVSDB Northbound APIs bundle @@ -134,10 +144,12 @@ + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git scm:git:ssh://git.opendaylight.org:29418/ovsdb.git HEAD https://wiki.opendaylight.org/view/OVSDB_Integration:Main + diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml index e3974a13a..94db57b9a 100644 --- a/openstack/net-virt-providers/pom.xml +++ b/openstack/net-virt-providers/pom.xml @@ -1,164 +1,178 @@ + - - commons - org.opendaylight.ovsdb - 1.3.0-SNAPSHOT - ../../commons/parent/pom.xml - - 4.0.0 + + commons + org.opendaylight.ovsdb + 1.3.0-SNAPSHOT + ../../commons/parent/pom.xml + + 4.0.0 + + openstack.net-virt-providers + 1.1.0-SNAPSHOT + bundle + + + + org.apache.felix + org.apache.felix.dependencymanager + + + org.osgi + org.osgi.core + + + com.google.guava + guava + + + org.opendaylight.controller + networkconfig.neutron + + + org.opendaylight.controller + sal + + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller.model + model-flow-base + + + org.opendaylight.controller.model + model-flow-service + + + org.opendaylight.controller.model + model-inventory + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + org.opendaylight.yangtools.model + opendaylight-l2-types + + + org.opendaylight.ovsdb + library + + + org.opendaylight.ovsdb + plugin + + + org.opendaylight.ovsdb + openstack.net-virt + + + org.opendaylight.ovsdb + schema.openvswitch + + + org.opendaylight.ovsdb + utils.mdsal-openflow + + + org.opendaylight.openflowplugin + openflowjava-extension-nicira + + + org.opendaylight.openflowplugin + openflowplugin-extension-nicira + + + org.slf4j + slf4j-api + + + junit + junit + compile + + - openstack.net-virt-providers - 1.1.0-SNAPSHOT - Opendaylight OVS Network Virtualization Providers - bundle + + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + true + + + + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.action, + org.opendaylight.ovsdb.plugin.api, + org.opendaylight.ovsdb.lib.notation, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.*;resolution:="optional", + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.*;resolution:="optional", + org.opendaylight.controller.sal.binding.api, + org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819, + org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes, + org.opendaylight.yangtools.yang.binding, + org.apache.felix.dm, + org.slf4j, + org.osgi.framework, + * + + utils.config,utils.mdsal-openflow;type=!pom;inline=false + true + org.opendaylight.ovsdb.openstack.netvirt.providers.Activator + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.jacoco + jacoco-maven-plugin + + + - - - org.apache.felix - org.apache.felix.dependencymanager - - - org.osgi - org.osgi.core - - - com.google.guava - guava - - - org.opendaylight.controller - networkconfig.neutron - - - org.opendaylight.controller - sal - - - org.opendaylight.controller - sal-common-api - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller.model - model-flow-base - - - org.opendaylight.controller.model - model-flow-service - - - org.opendaylight.controller.model - model-inventory - - - org.opendaylight.yangtools - yang-binding - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - ietf-yang-types - - - org.opendaylight.yangtools.model - opendaylight-l2-types - - - org.opendaylight.ovsdb - library - - - org.opendaylight.ovsdb - plugin - - - org.opendaylight.ovsdb - openstack.net-virt - - - org.opendaylight.ovsdb - schema.openvswitch - - - org.opendaylight.ovsdb - utils.mdsal-openflow - - - org.opendaylight.openflowplugin - openflowjava-extension-nicira - - - org.opendaylight.openflowplugin - openflowplugin-extension-nicira - - - org.slf4j - slf4j-api - - - junit - junit - compile - - + + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git + HEAD + https://wiki.opendaylight.org/view/OVSDB_Integration:Main + - - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - true - - - - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.action, - org.opendaylight.ovsdb.plugin.api, - org.opendaylight.ovsdb.lib.notation, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.*;resolution:="optional", - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.*;resolution:="optional", - org.opendaylight.controller.sal.binding.api, - org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819, - org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes, - org.opendaylight.yangtools.yang.binding, - org.apache.felix.dm, - org.slf4j, - org.osgi.framework, - * - - utils.config,utils.mdsal-openflow;type=!pom;inline=false - true - org.opendaylight.ovsdb.openstack.netvirt.providers.Activator - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.jacoco - jacoco-maven-plugin - - - diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml index 67320d441..291f3039d 100644 --- a/openstack/net-virt/pom.xml +++ b/openstack/net-virt/pom.xml @@ -1,6 +1,16 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons @@ -10,7 +20,6 @@ openstack.net-virt 1.1.0-SNAPSHOT - Opendaylight OVS Network Virtualization bundle @@ -115,4 +124,5 @@ HEAD https://wiki.opendaylight.org/view/OVSDB_Integration:Main + diff --git a/ovs-sfc/pom.xml b/ovs-sfc/pom.xml index b0b2842c0..60a3e008b 100644 --- a/ovs-sfc/pom.xml +++ b/ovs-sfc/pom.xml @@ -1,198 +1,206 @@ + - 4.0.0 - - org.opendaylight.ovsdb - commons - 1.3.0-SNAPSHOT - ../commons/parent - - ovssfc - OpenDaylight OVS Service Function Chaining - 0.1.0-SNAPSHOT - bundle + 4.0.0 - - target/generated-sources/config - + + org.opendaylight.ovsdb + commons + 1.3.0-SNAPSHOT + ../commons/parent + - - - org.osgi - org.osgi.core - - - com.google.guava - guava - - - junit - junit - test - - - org.mockito - mockito-all - test - - - org.opendaylight.controller - config-api - - - org.opendaylight.controller - sal - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-binding-config - - + ovssfc + 0.1.0-SNAPSHOT + bundle + + + target/generated-sources/config + + + + + org.osgi + org.osgi.core + + + com.google.guava + guava + + + junit + junit + test + + + org.mockito + mockito-all + test + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + sal + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-binding-config + + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.controller.model + model-flow-base + + + org.opendaylight.controller.model + model-flow-service + + + org.opendaylight.controller.model + model-inventory + + + org.opendaylight.ovsdb + library + + + org.opendaylight.ovsdb + plugin + + + org.opendaylight.ovsdb + schema.openvswitch + + + org.opendaylight.ovsdb + utils.mdsal-openflow + + + org.opendaylight.sfc + sfc-model + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + opendaylight-l2-types + + + org.slf4j + slf4j-api + + + + + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + + + utils.mdsal-openflow;type=!pom;inline=false + true + + /OSGI-OPT/ovs-sfc/53-ovssfc-provider.xml=${project.basedir}/src/main/resources/initial/53-ovssfc-provider.xml,{maven-resources} + + + ${project.basedir}/META-INF + + + + org.opendaylight.yangtools + yang-maven-plugin + + + config + + generate-sources + + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + + ${jmxGeneratorPath} + + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + + true + + + + + org.opendaylight.controller - sal-common-api - - - org.opendaylight.controller.model - model-flow-base - - - org.opendaylight.controller.model - model-flow-service - - - org.opendaylight.controller.model - model-inventory - - - org.opendaylight.ovsdb - library - - - org.opendaylight.ovsdb - plugin - - - org.opendaylight.ovsdb - schema.openvswitch - - - org.opendaylight.ovsdb - utils.mdsal-openflow - - - org.opendaylight.sfc - sfc-model - - - org.opendaylight.yangtools - concepts - - + yang-jmx-generator-plugin + ${controller.config.version} + + org.opendaylight.yangtools - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - opendaylight-l2-types - - - org.slf4j - slf4j-api - - - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - utils.mdsal-openflow;type=!pom;inline=false - true - - /OSGI-OPT/ovs-sfc/53-ovssfc-provider.xml=${project.basedir}/src/main/resources/initial/53-ovssfc-provider.xml,{maven-resources} - - - ${project.basedir}/META-INF - - - - org.opendaylight.yangtools - yang-maven-plugin - - - config - - generate-sources - - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - - ${jmxGeneratorPath} - - - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - - - - - true - - - - - - org.opendaylight.controller - yang-jmx-generator-plugin - ${controller.config.version} - - - org.opendaylight.yangtools - maven-sal-api-gen-plugin - ${yangtools.version} - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - org.jacoco - jacoco-maven-plugin - - - + maven-sal-api-gen-plugin + ${yangtools.version} + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.jacoco + jacoco-maven-plugin + + + - - scm:git:ssh://git.opendaylight.org:29418/ovsdb.git - scm:git:ssh://git.opendaylight.org:29418/ovsdb.git - HEAD - https://wiki.opendaylight.org/view/OVSDB_Integration:Main - + + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git + HEAD + https://wiki.opendaylight.org/view/OVSDB_Integration:Main + diff --git a/plugin-mdsal-adapter/pom.xml b/plugin-mdsal-adapter/pom.xml index ecd8374f0..c17b035e9 100644 --- a/plugin-mdsal-adapter/pom.xml +++ b/plugin-mdsal-adapter/pom.xml @@ -1,17 +1,24 @@ + + 4.0.0 + - commons org.opendaylight.ovsdb + commons 1.3.0-SNAPSHOT - ../commons/parent/pom.xml + ../commons/parent - 4.0.0 plugin-mdsal-adapter - OpenDaylight OVSDB Plugin MD_SAL Adapter 1.1.0-SNAPSHOT bundle diff --git a/plugin-shell/pom.xml b/plugin-shell/pom.xml index 7f3ec1d96..3cd6a7290 100644 --- a/plugin-shell/pom.xml +++ b/plugin-shell/pom.xml @@ -1,6 +1,16 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons @@ -10,7 +20,6 @@ plugin-shell 1.1.0-SNAPSHOT - OpenDaylight OVSDB Plugin Shell bundle @@ -22,7 +31,7 @@ org.apache.karaf.shell org.apache.karaf.shell.console - ${karaf.shell.version} + ${karaf.version} com.fasterxml.jackson.core diff --git a/plugin/pom.xml b/plugin/pom.xml index 86b15e713..ea28686db 100755 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -1,6 +1,16 @@ - + + 4.0.0 + org.opendaylight.ovsdb commons @@ -10,7 +20,6 @@ plugin 1.1.0-SNAPSHOT - OpenDaylight OVSDB Plugin bundle diff --git a/pom.xml b/pom.xml index e3fa6285f..f0de5661d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,14 @@ - + + 4.0.0 @@ -11,40 +20,48 @@ ovsdb 1.1.0-SNAPSHOT - ovsdb + ${project.artifactId} pom - 3.0 + 3.1.1 commons/parent commons/integrationtest + distribution/opendaylight-karaf + features/ovsdb + features/ovs-sfc library - schemas/openvswitch - schemas/hardwarevtep + northbound + openstack/net-virt + openstack/net-virt-providers plugin plugin-shell plugin-mdsal-adapter - northbound + schemas/hardwarevtep + schemas/openvswitch + southbound utils/config utils/mdsal-openflow - openstack/net-virt - openstack/net-virt-providers - southbound integrationtest - - - features/ovsdb - features/ovs-sfc - - distribution/opendaylight-karaf + + + + maven-deploy-plugin + + true + + + + + scm:git:ssh://git.opendaylight.org:29418/ovsdb.git scm:git:ssh://git.opendaylight.org:29418/ovsdb.git diff --git a/schemas/hardwarevtep/pom.xml b/schemas/hardwarevtep/pom.xml index 3c0392aa0..e9b4d92cb 100755 --- a/schemas/hardwarevtep/pom.xml +++ b/schemas/hardwarevtep/pom.xml @@ -1,17 +1,25 @@ + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../../commons/parent + schema.hardwarevtep 1.1.0-SNAPSHOT - OVSDB hardware_vtep Schema bundle diff --git a/schemas/openvswitch/pom.xml b/schemas/openvswitch/pom.xml index 14f2292e7..89b862c2d 100755 --- a/schemas/openvswitch/pom.xml +++ b/schemas/openvswitch/pom.xml @@ -1,17 +1,25 @@ + 4.0.0 + org.opendaylight.ovsdb commons 1.3.0-SNAPSHOT ../../commons/parent + schema.openvswitch 1.1.0-SNAPSHOT - OVSDB Open_vSwitch Schema bundle @@ -31,7 +39,6 @@ org.apache.felix maven-bundle-plugin - ${bundle.plugin.version} true diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml index b2c060ebe..b8b644661 100644 --- a/southbound/southbound-features/pom.xml +++ b/southbound/southbound-features/pom.xml @@ -10,6 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent features-parent 1.5.0-SNAPSHOT + org.opendaylight.ovsdb southbound-features @@ -62,12 +63,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL features - ${groupId} + ${project.groupId} southbound-impl ${project.version} - ${groupId} + ${project.groupId} southbound-api ${project.version} diff --git a/utils/config/pom.xml b/utils/config/pom.xml index 8cf6e1fba..349a1b7de 100644 --- a/utils/config/pom.xml +++ b/utils/config/pom.xml @@ -1,17 +1,25 @@ + + 4.0.0 + commons org.opendaylight.ovsdb 1.3.0-SNAPSHOT ../../commons/parent/pom.xml - 4.0.0 utils.config - OpenDaylight OVS configuration utility + ${project.artifactId} 1.1.0-SNAPSHOT jar diff --git a/utils/mdsal-openflow/pom.xml b/utils/mdsal-openflow/pom.xml index fbf1fdd7a..29a4dcba9 100644 --- a/utils/mdsal-openflow/pom.xml +++ b/utils/mdsal-openflow/pom.xml @@ -1,17 +1,25 @@ + + 4.0.0 + commons org.opendaylight.ovsdb 1.3.0-SNAPSHOT ../../commons/parent/pom.xml - 4.0.0 utils.mdsal-openflow - OpenDaylight OVS utility for md-sal based OpenFlow + ${project.artifactId} 1.1.0-SNAPSHOT jar