From 93cc9aa399738c2c73ef3073936cfbf08c42d0e9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 30 Mar 2015 13:37:36 +0200 Subject: [PATCH] Start openflowplugin-artifacts Inter-project dependencies are better tracked through a single artifact. All our upstream projects already define one, so let's follow their lead. Change-Id: Iead4c5653bab895a5b0b404f24fffb01975f44f2 Signed-off-by: Robert Varga --- applications/features/pom.xml | 13 +- artifacts/pom.xml | 190 ++++++++++++++++++ distribution/karaf/pom.xml | 2 - drop-test-karaf/pom.xml | 1 - drop-test/pom.xml | 17 +- extension/features/pom.xml | 6 - .../openflowplugin-extension-nicira/pom.xml | 2 - extension/pom.xml | 15 -- extension/test-extension/pom.xml | 4 - features/pom.xml | 39 +--- legacy/features-legacy/pom.xml | 2 - model/model-flow-service/pom.xml | 1 - model/model-flow-statistics/pom.xml | 2 - openflowplugin-impl/pom.xml | 8 - openflowplugin-it/pom.xml | 5 - openflowplugin/pom.xml | 2 - pom.xml | 33 +-- 17 files changed, 220 insertions(+), 122 deletions(-) create mode 100644 artifacts/pom.xml diff --git a/applications/features/pom.xml b/applications/features/pom.xml index 2ab1e0a7d5..8369d9055a 100644 --- a/applications/features/pom.xml +++ b/applications/features/pom.xml @@ -24,28 +24,24 @@ xml - + org.opendaylight.openflowplugin.applications statistics-manager-config - ${project.version} xml config - + org.opendaylight.openflowplugin.model model-flow-base - ${project.version} org.opendaylight.openflowplugin.model model-flow-service - ${project.version} org.opendaylight.openflowplugin.model model-flow-statistics - ${project.version} org.opendaylight.controller.model @@ -60,27 +56,22 @@ org.opendaylight.openflowplugin.applications topology-manager - ${project.version} org.opendaylight.openflowplugin.applications topology-lldp-discovery - ${project.version} org.opendaylight.openflowplugin.applications statistics-manager - ${project.version} org.opendaylight.openflowplugin.applications inventory-manager - ${project.version} org.opendaylight.openflowplugin.applications forwardingrules-manager - ${project.version} diff --git a/artifacts/pom.xml b/artifacts/pom.xml new file mode 100644 index 0000000000..3b0a854673 --- /dev/null +++ b/artifacts/pom.xml @@ -0,0 +1,190 @@ + + + + + + 4.0.0 + org.opendaylight.openflowplugin + openflowplugin-artifacts + 0.1.0-SNAPSHOT + pom + + + + + + ${project.groupId} + openflowplugin + ${project.version} + + + ${project.groupId} + openflowplugin-api + ${project.version} + + + ${project.groupId} + openflowplugin-extension-api + ${project.version} + + + ${project.groupId} + openflowplugin-extension-nicira + ${project.version} + + + ${project.groupId} + openflowjava-extension-nicira + ${project.version} + + + ${project.groupId} + openflowjava-extension-nicira-api + ${project.version} + + + ${project.groupId}.model + model-flow-base + ${project.version} + + + ${project.groupId}.model + model-flow-service + ${project.version} + + + ${project.groupId}.model + model-flow-statistics + ${project.version} + + + ${project.groupId}.applications + forwardingrules-manager + ${project.version} + + + ${project.groupId}.applications + inventory-manager + ${project.version} + + + ${project.groupId}.applications + lldp-speaker + ${project.version} + + + ${project.groupId}.applications + statistics-manager + ${project.version} + + + ${project.groupId}.applications + table-miss-enforcer + ${project.version} + + + ${project.groupId}.applications + topology-lldp-discovery + ${project.version} + + + ${project.groupId}.applications + topology-manager + ${project.version} + + + ${project.groupId}.applications + of-switch-config-pusher + ${project.version} + + + ${project.groupId} + drop-test-karaf + ${project.version} + + + ${project.groupId}.legacy + sal-compatibility + ${project.version} + + + + ${project.groupId} + test-common + ${project.version} + + + + ${project.groupId}.applications + of-switch-config-pusher + ${project.version} + xml + config + + + ${project.groupId}.applications + statistics-manager-config + ${project.version} + config + xml + + + ${project.groupId}.applications + table-miss-enforcer + ${project.version} + xml + config + + + ${project.groupId}.applications + lldp-speaker + ${project.version} + xml + config + + + ${project.groupId} + openflowplugin-controller-config + ${project.version} + xml + config + + + ${project.groupId} + openflowplugin-controller-config + ${project.version} + xml + configmsgspy + + + ${project.groupId} + openflowplugin-extension-nicira-config + ${project.version} + xml + config + + + + ${project.groupId} + features-openflowplugin + ${project.version} + features + xml + + + ${project.groupId} + features-openflowplugin-extension + ${project.version} + features + xml + + + + + diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml index f107a12b42..4dc58411f7 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -57,7 +57,6 @@ features-openflowplugin org.opendaylight.openflowplugin - ${project.version} features xml runtime @@ -75,7 +74,6 @@ org.opendaylight.openflowplugin features-openflowplugin-extension - ${project.version} features xml runtime diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml index 89288fbaa5..b8ac62e438 100644 --- a/drop-test-karaf/pom.xml +++ b/drop-test-karaf/pom.xml @@ -17,7 +17,6 @@ org.opendaylight.openflowplugin test-common - ${project.version} com.google.guava diff --git a/drop-test/pom.xml b/drop-test/pom.xml index 55f449f232..88ee816322 100644 --- a/drop-test/pom.xml +++ b/drop-test/pom.xml @@ -16,7 +16,6 @@ org.opendaylight.openflowplugin test-common - ${project.version} com.google.guava @@ -30,19 +29,19 @@ org.opendaylight.openflowplugin.model model-flow-service - - org.opendaylight.openflowplugin.model - model-flow-base - + + org.opendaylight.openflowplugin.model + model-flow-base + org.opendaylight.controller.model model-inventory - equinoxSDK381 - org.eclipse.osgi - - + equinoxSDK381 + org.eclipse.osgi + + commons-lang commons-lang diff --git a/extension/features/pom.xml b/extension/features/pom.xml index f941532adc..0134d30774 100644 --- a/extension/features/pom.xml +++ b/extension/features/pom.xml @@ -21,7 +21,6 @@ org.opendaylight.openflowplugin features-openflowplugin - ${project.version} features xml @@ -30,31 +29,26 @@ org.opendaylight.openflowplugin openflowplugin-extension-api - ${project.version} org.opendaylight.openflowplugin openflowplugin-extension-nicira-config - ${project.version} xml config org.opendaylight.openflowplugin openflowplugin-extension-nicira - ${project.version} org.opendaylight.openflowplugin openflowjava-extension-nicira-api - ${project.version} org.opendaylight.openflowplugin openflowjava-extension-nicira - ${project.version} diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml index 13dc7c064b..cf7571edf7 100644 --- a/extension/openflowplugin-extension-nicira/pom.xml +++ b/extension/openflowplugin-extension-nicira/pom.xml @@ -76,7 +76,6 @@ ${project.groupId} openflowplugin-extension-api - ${project.version} ${project.groupId} @@ -90,7 +89,6 @@ org.opendaylight.openflowplugin openflowplugin - ${project.version} diff --git a/extension/pom.xml b/extension/pom.xml index a7efcf4097..f4cbb6be03 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -21,19 +21,4 @@ features test-extension - - - - - ${project.groupId} - openflowjava-extension-nicira - ${project.version} - - - ${project.groupId} - openflowjava-extension-nicira-api - ${project.version} - - - diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml index 08dc703c9f..60c1bcb839 100644 --- a/extension/test-extension/pom.xml +++ b/extension/test-extension/pom.xml @@ -76,23 +76,19 @@ org.opendaylight.openflowplugin openflowplugin-extension-nicira - ${project.version} org.opendaylight.openflowplugin openflowplugin-extension-api - ${project.version} org.opendaylight.openflowplugin openflowjava-extension-nicira - ${project.version} org.opendaylight.openflowplugin openflowplugin - ${project.version} diff --git a/features/pom.xml b/features/pom.xml index c79cc89161..2d44e31e44 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -75,27 +75,22 @@ org.opendaylight.openflowplugin.applications forwardingrules-manager - ${project.version} org.opendaylight.openflowplugin.applications inventory-manager - ${project.version} org.opendaylight.openflowplugin.applications lldp-speaker - ${project.version} org.opendaylight.openflowplugin.applications statistics-manager - ${project.version} org.opendaylight.openflowplugin.applications statistics-manager-config - ${project.version} config xml @@ -120,27 +115,22 @@ org.opendaylight.openflowplugin openflowplugin-api - ${project.version} org.opendaylight.openflowplugin openflowplugin-extension-api - ${project.version} org.opendaylight.openflowplugin openflowplugin - ${project.version} org.opendaylight.openflowplugin.applications table-miss-enforcer - ${project.version} org.opendaylight.openflowplugin.applications table-miss-enforcer - ${project.version} xml config @@ -148,31 +138,26 @@ org.opendaylight.openflowplugin.applications topology-lldp-discovery - ${project.version} org.opendaylight.openflowplugin.applications topology-manager - ${project.version} - - org.opendaylight.openflowplugin.applications - of-switch-config-pusher - ${project.version} - - - org.opendaylight.openflowplugin.applications - of-switch-config-pusher - ${project.version} - xml - config - + + org.opendaylight.openflowplugin.applications + of-switch-config-pusher + + + org.opendaylight.openflowplugin.applications + of-switch-config-pusher + xml + config + org.opendaylight.openflowplugin.applications lldp-speaker - ${project.version} xml config @@ -180,24 +165,20 @@ org.opendaylight.openflowplugin drop-test-karaf - ${project.version} org.opendaylight.openflowplugin test-common - ${project.version} org.opendaylight.openflowplugin openflowplugin-controller-config - ${project.version} xml config org.opendaylight.openflowplugin openflowplugin-controller-config - ${project.version} xml configmsgspy diff --git a/legacy/features-legacy/pom.xml b/legacy/features-legacy/pom.xml index 1ba0eafcfc..4c7bae065a 100644 --- a/legacy/features-legacy/pom.xml +++ b/legacy/features-legacy/pom.xml @@ -73,7 +73,6 @@ org.opendaylight.openflowplugin features-openflowplugin - ${project.version} features xml @@ -98,7 +97,6 @@ org.opendaylight.openflowplugin.legacy sal-compatibility - ${project.version} org.opendaylight.openflowplugin openflowplugin - ${project.version} org.opendaylight.openflowplugin openflowplugin-extension-api - ${project.version} org.opendaylight.openflowplugin.model diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml index f1aba0f667..1e2e727377 100644 --- a/openflowplugin-it/pom.xml +++ b/openflowplugin-it/pom.xml @@ -84,19 +84,16 @@ org.opendaylight.openflowplugin openflowplugin-api - ${project.version} test org.opendaylight.openflowplugin openflowplugin - ${project.version} test org.opendaylight.openflowplugin openflowplugin-extension-api - ${project.version} test @@ -252,13 +249,11 @@ org.opendaylight.openflowplugin.applications forwardingrules-manager test - ${project.version} org.opendaylight.openflowplugin.applications inventory-manager test - ${project.version} diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml index 8764cb8aad..bd9f57d64f 100644 --- a/openflowplugin/pom.xml +++ b/openflowplugin/pom.xml @@ -73,12 +73,10 @@ org.opendaylight.openflowplugin openflowplugin-api - ${project.version} org.opendaylight.openflowplugin openflowplugin-extension-api - ${project.version} org.opendaylight.openflowplugin.model diff --git a/pom.xml b/pom.xml index 86690d70ba..74ea79e78b 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ utf-8 http://nexus.opendaylight.org/content 0.6.0-SNAPSHOT - ${project.version} + 0.1.0-SNAPSHOT 0.9.0-SNAPSHOT 1.8 src/main/yang-gen-config @@ -74,6 +74,14 @@ + + org.opendaylight.openflowplugin + openflowplugin-artifacts + ${openflowplugin.version} + import + pom + + org.opendaylight.yangtools yangtools-artifacts @@ -116,28 +124,6 @@ test - - org.opendaylight.openflowplugin - openflowplugin-api - ${project.version} - - - - org.opendaylight.openflowplugin.model - model-flow-base - ${openflowplugin.model.version} - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.model.version} - - - org.opendaylight.openflowplugin.model - model-flow-statistics - ${openflowplugin.model.version} - - org.opendaylight.controller liblldp @@ -486,6 +472,7 @@ + artifacts openflowplugin-api openflowplugin openflowplugin-impl -- 2.36.6