From 682722fadd581d3ffd5d47011cccf4fbf32d84d4 Mon Sep 17 00:00:00 2001 From: Tomas Olvecky Date: Tue, 22 Oct 2013 20:13:10 +0200 Subject: [PATCH] Bump version of netconf-subsystem to 0.2.2-SNAPSHOT. Also clean up poms in netconf subsystem. Change-Id: I419700edbdf4051ea4fed6cbffc1a558635a5548 Signed-off-by: Tomas Olvecky --- opendaylight/commons/opendaylight/pom.xml | 1 + .../distribution/opendaylight/pom.xml | 14 +-- .../netconf/config-netconf-connector/pom.xml | 16 +--- .../netconf/config-persister-impl/pom.xml | 8 +- opendaylight/netconf/netconf-api/pom.xml | 4 +- opendaylight/netconf/netconf-client/pom.xml | 6 +- opendaylight/netconf/netconf-impl/pom.xml | 13 +-- opendaylight/netconf/netconf-it/pom.xml | 19 +--- .../netconf/netconf-mapping-api/pom.xml | 5 +- opendaylight/netconf/netconf-util/pom.xml | 8 +- opendaylight/netconf/pom.xml | 87 ++++++++++++++++--- 11 files changed, 91 insertions(+), 90 deletions(-) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 68f17281af..77edba5b38 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -76,6 +76,7 @@ 0.4.1-SNAPSHOT 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT 1.0-SNAPSHOT 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 05867335b5..803d90253e 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -188,37 +188,37 @@ org.opendaylight.controller netconf-api - ${config.version} + ${netconf.version} org.opendaylight.controller netconf-impl - ${config.version} + ${netconf.version} org.opendaylight.controller netconf-util - ${config.version} + ${netconf.version} org.opendaylight.controller netconf-client - ${config.version} + ${netconf.version} org.opendaylight.controller netconf-mapping-api - ${config.version} + ${netconf.version} org.opendaylight.controller config-netconf-connector - ${config.version} + ${netconf.version} org.opendaylight.controller config-persister-impl - ${config.version} + ${netconf.version} diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml index f8bc7720d1..e3bcf504c0 100755 --- a/opendaylight/netconf/config-netconf-connector/pom.xml +++ b/opendaylight/netconf/config-netconf-connector/pom.xml @@ -5,7 +5,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} config-netconf-connector ${project.artifactId} @@ -20,7 +20,6 @@ ${project.groupId} netconf-api - ${project.version} org.slf4j @@ -32,28 +31,23 @@ ${project.groupId} - yang-jmx-generator ${project.groupId} - config-util ${project.groupId} netconf-util - ${project.version} ${project.groupId} - yang-store-api ${project.groupId} netconf-mapping-api - ${project.version} org.osgi @@ -63,47 +57,39 @@ ${project.groupId} netconf-util - ${project.version} test test-jar ${project.groupId} - yang-test test ${project.groupId} - config-manager - ${config.version} test test-jar ${project.groupId} - config-manager test ${project.groupId} netconf-impl - ${project.version} test ${project.groupId} - yang-store-impl test org.opendaylight.bgpcep mockito-configuration - ${bgpcep.version} test diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml index a69c87f0a4..668d7d905b 100644 --- a/opendaylight/netconf/config-persister-impl/pom.xml +++ b/opendaylight/netconf/config-persister-impl/pom.xml @@ -5,7 +5,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} config-persister-impl ${project.artifactId} @@ -16,22 +16,18 @@ org.opendaylight.controller config-persister-api - 0.2.1-SNAPSHOT ${project.groupId} netconf-api - ${project.version} ${project.groupId} netconf-client - ${project.version} ${project.groupId} netconf-util - ${project.version} org.slf4j @@ -48,14 +44,12 @@ org.opendaylight.controller config-persister-file-adapter - 0.2.1-SNAPSHOT org.opendaylight.bgpcep mockito-configuration - ${bgpcep.version} test diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml index 5c18eddcf5..8d800be2f7 100644 --- a/opendaylight/netconf/netconf-api/pom.xml +++ b/opendaylight/netconf/netconf-api/pom.xml @@ -6,7 +6,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} 4.0.0 netconf-api @@ -17,12 +17,10 @@ org.opendaylight.controller config-api - 0.2.1-SNAPSHOT org.opendaylight.bgpcep framework - ${bgpcep.version} diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml index d8dee68253..f557a21aed 100644 --- a/opendaylight/netconf/netconf-client/pom.xml +++ b/opendaylight/netconf/netconf-client/pom.xml @@ -5,7 +5,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} netconf-client ${project.artifactId} @@ -16,19 +16,15 @@ ${project.groupId} netconf-util - ${project.version} ${project.groupId} netconf-api - ${project.version} org.opendaylight.bgpcep framework - ${bgpcep.version} - com.google.guava guava diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml index 8e0d493c27..2b3ddc1038 100644 --- a/opendaylight/netconf/netconf-impl/pom.xml +++ b/opendaylight/netconf/netconf-impl/pom.xml @@ -5,7 +5,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} 4.0.0 netconf-impl @@ -18,34 +18,28 @@ ${project.groupId} netconf-api - ${project.version} ${project.groupId} netconf-util - ${project.version} org.opendaylight.controller config-util - 0.2.1-SNAPSHOT ${project.groupId} netconf-mapping-api - ${project.version} org.opendaylight.bgpcep util - ${bgpcep.version} org.opendaylight.bgpcep framework - ${bgpcep.version} @@ -65,7 +59,6 @@ org.opendaylight.bgpcep mockito-configuration - ${bgpcep.version} test @@ -76,27 +69,23 @@ ${project.groupId} - yang-store-api test xmlunit xmlunit - 1.4 test ${project.groupId} netconf-util - ${project.version} test test-jar ${project.groupId} netconf-client - ${project.version} test diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml index fc777bc885..a64d7f3de5 100644 --- a/opendaylight/netconf/netconf-it/pom.xml +++ b/opendaylight/netconf/netconf-it/pom.xml @@ -7,7 +7,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} netconf-it @@ -18,43 +18,36 @@ ${project.groupId} config-api - ${config.version} test ${project.groupId} config-util - ${config.version} test ${project.groupId} yang-store-api - ${config.version} test ${project.groupId} netconf-api - ${project.version} test org.opendaylight.bgpcep util - ${bgpcep.version} test ${project.groupId} netconf-client - ${project.version} test ${project.groupId} config-netconf-connector - ${project.version} test @@ -70,32 +63,27 @@ ${project.groupId} config-persister-impl - ${project.version} test ${project.groupId} config-manager - ${config.version} test test-jar ${project.groupId} netconf-impl - ${project.version} test ${project.groupId} netconf-mapping-api - ${project.version} test ${project.groupId} netconf-util - ${project.version} test test-jar @@ -107,25 +95,20 @@ ${project.groupId} yang-store-impl - ${config.version} test test-jar org.opendaylight.controller logback-config - 0.2.1-SNAPSHOT - org.slf4j slf4j-api - org.opendaylight.bgpcep mockito-configuration - ${bgpcep.version} test diff --git a/opendaylight/netconf/netconf-mapping-api/pom.xml b/opendaylight/netconf/netconf-mapping-api/pom.xml index 5b6003f185..a9928a6dc6 100644 --- a/opendaylight/netconf/netconf-mapping-api/pom.xml +++ b/opendaylight/netconf/netconf-mapping-api/pom.xml @@ -6,7 +6,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} 4.0.0 netconf-mapping-api @@ -18,7 +18,6 @@ ${project.groupId} netconf-api - ${project.version} @@ -50,4 +49,4 @@ - \ No newline at end of file + diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml index f9b4fddb25..0dbb45cbdf 100644 --- a/opendaylight/netconf/netconf-util/pom.xml +++ b/opendaylight/netconf/netconf-util/pom.xml @@ -5,7 +5,7 @@ netconf-subsystem org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} netconf-util ${project.artifactId} @@ -17,27 +17,22 @@ ${project.groupId} netconf-api - ${project.version} ${project.groupId} netconf-mapping-api - ${project.version} org.opendaylight.controller config-api - 0.2.1-SNAPSHOT org.opendaylight.bgpcep framework - ${bgpcep.version} org.opendaylight.bgpcep util - ${bgpcep.version} @@ -55,7 +50,6 @@ io.netty netty-handler - ${netconf.netty.version} diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml index 1d7d552094..840f557f51 100644 --- a/opendaylight/netconf/pom.xml +++ b/opendaylight/netconf/pom.xml @@ -9,8 +9,7 @@ ../commons/opendaylight - org.opendaylight.controller - 0.2.1-SNAPSHOT + ${netconf.version} netconf-subsystem pom ${project.artifactId} @@ -75,6 +74,12 @@ config-manager ${config.version} + + ${project.groupId} + config-manager + ${config.version} + test-jar + ${project.groupId} yang-jmx-generator @@ -95,11 +100,78 @@ yang-store-impl ${config.version} + + ${project.groupId} + yang-store-impl + ${config.version} + test-jar + ${project.groupId} yang-test ${config.version} + + ${project.groupId} + netconf-api + ${netconf.version} + + + ${project.groupId} + netconf-util + ${netconf.version} + + + ${project.groupId} + netconf-util + ${netconf.version} + test-jar + + + ${project.groupId} + netconf-mapping-api + ${netconf.version} + + + ${project.groupId} + netconf-impl + ${netconf.version} + + + org.opendaylight.controller + config-persister-api + ${config.version} + + + org.opendaylight.controller + config-persister-file-adapter + ${config.version} + + + ${project.groupId} + netconf-client + ${netconf.version} + + + xmlunit + xmlunit + 1.4 + + + ${project.groupId} + config-netconf-connector + ${netconf.version} + + + ${project.groupId} + config-persister-impl + ${netconf.version} + + + org.opendaylight.controller + logback-config + ${config.version} + @@ -135,15 +207,4 @@ - -- 2.36.6