From 8e257ba82470f60242943f53bc4dfa5ac3d1ea57 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Mon, 7 Sep 2015 12:30:22 +0200 Subject: [PATCH] Bug 4202: Migration to use mdsal project Migrated controller to use MD-SAL provided Java Binding instead of YANG-Tools provided JAVA Binding. This migration deals only with compile time and in runtime. Updated following features - features-config - features-config-netty - features-config-persister - features-mdsal - features-extras - features-protocol-framework to use - Java Binding hosted in MD-SAL project - features-parent from odlparent Change-Id: Iba40d74d118e212c9a57fa28711bbbe339fe1bbd Signed-off-by: Tony Tkacik --- features/akka/src/main/resources/features.xml | 45 --- features/config-netty/pom.xml | 91 ++---- .../main/{resources => features}/features.xml | 0 features/config-persister/pom.xml | 104 +++---- .../main/{resources => features}/features.xml | 32 +-- features/config/pom.xml | 134 ++++----- .../config/src/main/features/features.xml | 45 +++ .../config/src/main/resources/features.xml | 49 ---- features/extras/pom.xml | 94 +----- .../main/{resources => features}/features.xml | 2 +- features/mdsal/pom.xml | 269 +++++------------- .../main/{resources => features}/features.xml | 103 ++++--- features/protocol-framework/pom.xml | 84 +----- .../main/{resources => features}/features.xml | 5 +- karaf/opendaylight-karaf/pom.xml | 15 +- .../features/src/main/features/features.xml | 1 + opendaylight/commons/opendaylight/pom.xml | 53 +++- .../commons/protocol-framework/pom.xml | 2 +- opendaylight/config/config-api/pom.xml | 4 +- .../config/config-manager-facade-xml/pom.xml | 4 +- opendaylight/config/config-manager/pom.xml | 4 +- opendaylight/config/config-parent/pom.xml | 9 +- opendaylight/config/pom.xml | 4 +- .../config/yang-jmx-generator-plugin/pom.xml | 4 +- .../config/yang-jmx-generator/pom.xml | 18 +- opendaylight/config/yang-test/pom.xml | 2 +- opendaylight/md-sal/messagebus-api/pom.xml | 4 +- opendaylight/md-sal/sal-binding-api/pom.xml | 2 +- .../md-sal/sal-binding-broker/pom.xml | 20 +- .../md-sal/sal-binding-config/pom.xml | 8 +- .../md-sal/sal-binding-dom-it/pom.xml | 4 +- opendaylight/md-sal/sal-binding-it/pom.xml | 10 +- .../test/sal/binding/it/TestHelper.java | 26 +- .../md-sal/sal-clustering-commons/pom.xml | 4 - opendaylight/md-sal/sal-connector-api/pom.xml | 2 +- .../md-sal/sal-distributed-datastore/pom.xml | 2 +- .../md-sal/sal-dom-broker-config/pom.xml | 4 + opendaylight/md-sal/sal-dom-broker/pom.xml | 5 - opendaylight/md-sal/sal-dom-xsql/pom.xml | 7 +- .../md-sal/sal-inmemory-datastore/pom.xml | 6 +- opendaylight/md-sal/sal-remote/pom.xml | 2 +- opendaylight/md-sal/sal-test-model/pom.xml | 6 +- .../samples/clustering-test-app/model/pom.xml | 13 +- .../clustering-test-app/provider/pom.xml | 3 +- .../md-sal/samples/toaster-it/pom.xml | 2 +- .../md-sal/samples/toaster-provider/pom.xml | 8 +- opendaylight/md-sal/samples/toaster/pom.xml | 7 +- opendaylight/model/model-topology/pom.xml | 2 +- opendaylight/model/pom.xml | 44 ++- 49 files changed, 515 insertions(+), 853 deletions(-) rename features/config-netty/src/main/{resources => features}/features.xml (100%) rename features/config-persister/src/main/{resources => features}/features.xml (66%) create mode 100644 features/config/src/main/features/features.xml delete mode 100644 features/config/src/main/resources/features.xml rename features/extras/src/main/{resources => features}/features.xml (94%) rename features/mdsal/src/main/{resources => features}/features.xml (69%) rename features/protocol-framework/src/main/{resources => features}/features.xml (67%) diff --git a/features/akka/src/main/resources/features.xml b/features/akka/src/main/resources/features.xml index cc62e36f07..6a9b5888f2 100644 --- a/features/akka/src/main/resources/features.xml +++ b/features/akka/src/main/resources/features.xml @@ -14,14 +14,6 @@ Necessary TODO: Please read the features guidelines: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Best_Practices --> - mvn:org.scala-lang/scala-library/${scala.version}.${scala.micro.version} @@ -112,6 +69,4 @@ mvn:com.typesafe.akka/akka-persistence-experimental_${scala.version}/${akka.version} wrap:mvn:com.google.protobuf/protobuf-java/${protobuf.version}$overwrite=merge&DynamicImport-Package=org.opendaylight.controller.protobuff.messages.*;org.opendaylight.controller.cluster.raft.protobuff.client.messages.* - - diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml index f703b48c0f..f5aa4c1c17 100644 --- a/features/config-netty/pom.xml +++ b/features/config-netty/pom.xml @@ -2,19 +2,33 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.4.0-SNAPSHOT - ../../opendaylight/config/ + org.opendaylight.odlparent + features-parent + 1.6.0-SNAPSHOT + - features-config-netty + org.opendaylight.controller + features-config-netty + 0.4.0-SNAPSHOT jar - features.xml + 0.4.0-SNAPSHOT + + + + org.opendaylight.controller + config-artifacts + ${config.version} + import + pom + + + + org.opendaylight.controller @@ -54,72 +68,9 @@ xml config - - - org.opendaylight.odlparent - features-test - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.opendaylight.controller - opendaylight-karaf-empty - ${commons.opendaylight.version} - - - org.opendaylight.odlparent:features-test - - - - - + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/config-netty/src/main/resources/features.xml b/features/config-netty/src/main/features/features.xml similarity index 100% rename from features/config-netty/src/main/resources/features.xml rename to features/config-netty/src/main/features/features.xml diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml index 3a0f9f49d3..5c98382791 100644 --- a/features/config-persister/pom.xml +++ b/features/config-persister/pom.xml @@ -2,24 +2,47 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.4.0-SNAPSHOT - ../../opendaylight/config/ + org.opendaylight.odlparent + features-parent + 1.6.0-SNAPSHOT + - features-config-persister + org.opendaylight.controller + features-config-persister + 0.4.0-SNAPSHOT jar + 2.0.0-SNAPSHOT + 0.4.0-SNAPSHOT features.xml + + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + import + pom + + + org.opendaylight.controller + config-artifacts + ${config.version} + import + pom + + + + - org.opendaylight.yangtools - features-yangtools - ${yangtools.version} + org.opendaylight.mdsal + features-mdsal + ${mdsal.version} features xml @@ -73,72 +96,9 @@ org.eclipse.persistence org.eclipse.persistence.moxy - - - org.opendaylight.odlparent - features-test - + - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.opendaylight.controller - opendaylight-karaf-empty - ${commons.opendaylight.version} - - - org.opendaylight.odlparent:features-test - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/config-persister/src/main/resources/features.xml b/features/config-persister/src/main/features/features.xml similarity index 66% rename from features/config-persister/src/main/resources/features.xml rename to features/config-persister/src/main/features/features.xml index 59b498b07d..6243cbdb02 100644 --- a/features/config-persister/src/main/resources/features.xml +++ b/features/config-persister/src/main/features/features.xml @@ -3,8 +3,8 @@ - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-config/${config.version}/xml/features + mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features + mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features odl-config-persister odl-config-startup @@ -13,26 +13,26 @@ odl-config-api odl-config-core odl-config-manager - odl-yangtools-binding-generator - mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} - mvn:org.opendaylight.controller/config-persister-api/${project.version} - mvn:org.opendaylight.controller/config-util/${project.version} - mvn:org.opendaylight.controller/config-manager-facade-xml/${project.version} - mvn:org.opendaylight.controller/config-persister-file-xml-adapter/${project.version} - mvn:org.opendaylight.controller/config-persister-impl/${project.version} - mvn:org.opendaylight.controller/config-persister-feature-adapter/${project.version} + odl-mdsal-binding-runtime + mvn:org.opendaylight.controller/yang-jmx-generator/{{VERSION}} + mvn:org.opendaylight.controller/config-persister-api/{{VERSION}} + mvn:org.opendaylight.controller/config-util/{{VERSION}} + mvn:org.opendaylight.controller/config-manager-facade-xml/{{VERSION}} + mvn:org.opendaylight.controller/config-persister-file-xml-adapter/{{VERSION}} + mvn:org.opendaylight.controller/config-persister-impl/{{VERSION}} + mvn:org.opendaylight.controller/config-persister-feature-adapter/{{VERSION}} - mvn:com.google.guava/guava/${guava.version} - mvn:commons-io/commons-io/${commons.io.version} - mvn:org.apache.commons/commons-lang3/${commons.lang3.version} - mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipse.persistence.version} - mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipse.persistence.version} + mvn:com.google.guava/guava/{{VERSION}} + mvn:commons-io/commons-io/{{VERSION}} + mvn:org.apache.commons/commons-lang3/{{VERSION}} + mvn:org.eclipse.persistence/org.eclipse.persistence.core/{{VERSION}} + mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/{{VERSION}} odl-config-persister odl-config-core - mvn:org.opendaylight.controller/config-manager-facade-xml/${project.version} + mvn:org.opendaylight.controller/config-manager-facade-xml/{{VERSION}} diff --git a/features/config/pom.xml b/features/config/pom.xml index b850d65be3..e6d9426a82 100644 --- a/features/config/pom.xml +++ b/features/config/pom.xml @@ -2,35 +2,69 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.4.0-SNAPSHOT - ../../opendaylight/config/ + org.opendaylight.odlparent + features-parent + 1.6.0-SNAPSHOT + - features-config + org.opendaylight.controller + features-config + 0.4.0-SNAPSHOT jar + 0.8.0-SNAPSHOT + 2.0.0-SNAPSHOT + 0.4.0-SNAPSHOT features.xml + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + import + pom + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + import + pom + + + org.opendaylight.controller + config-artifacts + ${config.version} + import + pom + + + + + - - - org.opendaylight.controller - opendaylight-karaf-empty - 1.6.0-SNAPSHOT - zip - test - + + org.opendaylight.yangtools features-yangtools - ${yangtools.version} features xml + + org.opendaylight.mdsal + features-mdsal + features + xml + + + org.opendaylight.controller config-api @@ -47,6 +81,14 @@ io.netty netty-common + + io.netty + netty-codec + + + io.netty + netty-handler + io.netty netty-buffer @@ -83,72 +125,8 @@ org.opendaylight.controller config-manager - - - org.opendaylight.odlparent - features-test - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.opendaylight.controller - opendaylight-karaf-empty - ${commons.opendaylight.version} - - - org.opendaylight.odlparent:features-test - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/config/src/main/features/features.xml b/features/config/src/main/features/features.xml new file mode 100644 index 0000000000..e23d5f5df5 --- /dev/null +++ b/features/config/src/main/features/features.xml @@ -0,0 +1,45 @@ + + + + + mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features + + + odl-config-api + odl-config-netty-config-api + odl-config-core + odl-config-manager + + + + odl-mdsal-binding-base + mvn:org.opendaylight.controller/config-api/{{VERSION}} + + + + odl-config-api + mvn:org.opendaylight.controller/netty-config-api/{{VERSION}} + mvn:io.netty/netty-transport/{{VERSION}} + mvn:io.netty/netty-common/{{VERSION}} + mvn:io.netty/netty-buffer/{{VERSION}} + mvn:io.netty/netty-codec/{{VERSION}} + mvn:io.netty/netty-handler/{{VERSION}} + + + + odl-yangtools-common + + odl-mdsal-binding-runtime + odl-config-api + mvn:org.opendaylight.controller/config-util/{{VERSION}} + mvn:org.opendaylight.controller/yang-jmx-generator/{{VERSION}} + mvn:org.opendaylight.controller/shutdown-api/{{VERSION}} + mvn:org.opendaylight.controller/shutdown-impl/{{VERSION}} + + + odl-config-core + mvn:org.opendaylight.controller/config-manager/{{VERSION}} + + diff --git a/features/config/src/main/resources/features.xml b/features/config/src/main/resources/features.xml deleted file mode 100644 index 0b7e4641eb..0000000000 --- a/features/config/src/main/resources/features.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - - - odl-config-api - odl-config-netty-config-api - odl-config-core - odl-config-manager - - - - mvn:org.opendaylight.controller/config-api/${project.version} - odl-yangtools-common - odl-yangtools-binding - - - - odl-config-api - mvn:org.opendaylight.controller/netty-config-api/${project.version} - mvn:io.netty/netty-transport/${netty.version} - mvn:io.netty/netty-common/${netty.version} - mvn:io.netty/netty-buffer/${netty.version} - mvn:io.netty/netty-codec/${netty.version} - mvn:io.netty/netty-handler/${netty.version} - - - - odl-yangtools-common - odl-yangtools-binding - odl-yangtools-binding-generator - odl-config-api - mvn:org.opendaylight.yangtools/yang-model-api/${yangtools.version} - mvn:org.opendaylight.controller/config-util/${project.version} - mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} - mvn:org.opendaylight.controller/shutdown-api/${project.version} - mvn:org.opendaylight.controller/shutdown-impl/${project.version} - mvn:org.osgi/org.osgi.core/${osgi.core.version} - mvn:com.google.guava/guava/${guava.version} - mvn:org.javassist/javassist/${javassist.version} - - - odl-config-core - mvn:org.opendaylight.controller/config-manager/${project.version} - - diff --git a/features/extras/pom.xml b/features/extras/pom.xml index 3586477ef8..563f1281b8 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -8,103 +8,29 @@ 4.0.0 - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + features-parent 1.6.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + - features-extras + org.opendaylight.controller + features-extras + 1.6.0-SNAPSHOT jar - features.xml - - 1.2.0-SNAPSHOT - 1.6.0-SNAPSHOT - 3.0.3 - 1.6.0-SNAPSHOT - 2.16 + 0.2.0-SNAPSHOT + 1.1.4 + org.jolokia jolokia-osgi ${jolokia.version} - - org.opendaylight.odlparent - features-test - test - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${karaf.empty.version} - zip - - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - generate-resources - - resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - org.opendaylight.controller - opendaylight-karaf-empty - ${karaf.empty.version} - - - org.opendaylight.odlparent:features-test - - - - - + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/extras/src/main/resources/features.xml b/features/extras/src/main/features/features.xml similarity index 94% rename from features/extras/src/main/resources/features.xml rename to features/extras/src/main/features/features.xml index e7423ea17e..d83b378f98 100644 --- a/features/extras/src/main/resources/features.xml +++ b/features/extras/src/main/features/features.xml @@ -20,6 +20,6 @@ http - mvn:org.jolokia/jolokia-osgi/${jolokia.version} + mvn:org.jolokia/jolokia-osgi/{{VERSION}} diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index 182ee268e3..ca5b0b2514 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -2,104 +2,85 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT - ../../opendaylight/md-sal + org.opendaylight.odlparent + features-parent + 1.6.0-SNAPSHOT + + + org.opendaylight.controller features-mdsal + 1.3.0-SNAPSHOT jar + 0.8.0-SNAPSHOT + 2.0.0-SNAPSHOT + 0.8.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.4.0-SNAPSHOT + 1.6.0-SNAPSHOT + 2.3.10 features.xml 20131018 - - - - org.json - json - - - - - com.google.code.gson - gson - + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + import + pom + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + import + pom + + + org.opendaylight.controller + config-artifacts + ${config.version} + import + pom + + + org.opendaylight.controller + mdsal-artifacts + ${controller.mdsal.version} + import + pom + + + - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-json-org - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-servlet - + - + - io.netty - netty-buffer - - - io.netty - netty-codec - - - io.netty - netty-codec-http - - - io.netty - netty-common + org.opendaylight.yangtools + features-yangtools + features + xml - io.netty - netty-handler + org.opendaylight.mdsal + features-mdsal + features + xml - io.netty - netty-transport + org.opendaylight.mdsal.model + features-mdsal-model + features + ${mdsal.model.version} + xml - - org.opendaylight.controller features-akka @@ -126,10 +107,11 @@ xml + org.opendaylight.controller md-sal-config - ${mdsal.version} + ${controller.mdsal.version} xml config @@ -137,7 +119,7 @@ org.opendaylight.controller sal-akka-raft - ${mdsal.version} + ${controller.mdsal.version} org.opendaylight.controller @@ -204,42 +186,42 @@ org.opendaylight.controller sal-clustering-config - ${mdsal.version} + ${controller.mdsal.version} xml moduleshardconf org.opendaylight.controller sal-clustering-config - ${mdsal.version} + ${controller.mdsal.version} xml moduleconf org.opendaylight.controller sal-clustering-config - ${mdsal.version} + ${controller.mdsal.version} xml akkaconf org.opendaylight.controller sal-clustering-config - ${mdsal.version} + ${controller.mdsal.version} xml config org.opendaylight.controller sal-clustering-config - ${mdsal.version} + ${controller.mdsal.version} xml entityownershipconfig org.opendaylight.controller sal-clustering-config - ${mdsal.version} + ${controller.mdsal.version} cfg datastore @@ -260,7 +242,7 @@ org.opendaylight.controller messagebus-config - ${mdsal.version} + ${controller.mdsal.version} xml config @@ -269,10 +251,6 @@ org.opendaylight.controller sal-inmemory-datastore - - org.opendaylight.controller - sal-remote - org.opendaylight.controller sal-remoterpc-connector @@ -286,33 +264,33 @@ org.opendaylight.controller.samples clustering-it-config - ${mdsal.version} + ${controller.mdsal.version} xml config org.opendaylight.controller.samples clustering-it-config - ${mdsal.version} + ${controller.mdsal.version} xml testmoduleconf org.opendaylight.controller.samples clustering-it-config - ${mdsal.version} + ${controller.mdsal.version} xml testmoduleshardconf org.opendaylight.controller.samples clustering-it-model - ${mdsal.version} + ${controller.mdsal.version} org.opendaylight.controller.samples clustering-it-provider - ${mdsal.version} + ${controller.mdsal.version} @@ -332,106 +310,13 @@ org.opendaylight.controller.samples toaster-config - ${mdsal.version} + ${controller.mdsal.version} xml config - - - org.opendaylight.yangtools - features-yangtools - features - xml - - - - - org.opendaylight.odlparent - features-test - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.opendaylight.controller - opendaylight-karaf-empty - ${commons.opendaylight.version} - - - org.opendaylight.odlparent:features-test - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - unpack-static-documentation - - unpack-dependencies - - generate-resources - - ${project.build.directory}/generated-resources/swagger-api-documentation - sal-rest-docgen - **/explorer/css/**/*, **/explorer/images/**/*, **/explorer/lib/**/*, **/explorer/static/**/*, - true - false - - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/features/features.xml similarity index 69% rename from features/mdsal/src/main/resources/features.xml rename to features/mdsal/src/main/features/features.xml index 410ef80b71..dfe39c4ed2 100644 --- a/features/mdsal/src/main/resources/features.xml +++ b/features/mdsal/src/main/features/features.xml @@ -3,81 +3,89 @@ - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-config/${config.version}/xml/features - mvn:org.opendaylight.controller/features-config-persister/${config.version}/xml/features - mvn:org.opendaylight.controller/features-config-netty/${config.version}/xml/features - mvn:org.opendaylight.controller/features-akka/${commons.opendaylight.version}/xml/features + + mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features + + mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features + mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features + + mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features + mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features + mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features + mvn:org.opendaylight.controller/features-akka/{{VERSION}}/xml/features odl-mdsal-broker odl-mdsal-broker-local odl-mdsal-xsql odl-toaster - - odl-yangtools-data-binding + + odl-yangtools-yang-data odl-config-api - mvn:org.opendaylight.controller/sal-common-api/${mdsal.version} - mvn:org.opendaylight.controller/sal-common-impl/${mdsal.version} - mvn:org.opendaylight.controller/sal-common-util/${mdsal.version} + odl-mdsal-binding-runtime + mvn:org.opendaylight.controller/sal-common-api/{{VERSION}} + mvn:org.opendaylight.controller/sal-common-impl/{{VERSION}} + mvn:org.opendaylight.controller/sal-common-util/{{VERSION}} odl-yangtools-common - odl-yangtools-binding - odl-yangtools-models - odl-mdsal-common + odl-mdsal-binding-runtime + odl-mdsal-models + odl-mdsal-common odl-config-startup odl-config-netty - mvn:com.lmax/disruptor/${lmax.version} - mvn:org.opendaylight.controller/sal-core-api/${project.version} - mvn:org.opendaylight.controller/sal-core-spi/${project.version} - mvn:org.opendaylight.controller/sal-broker-impl/${project.version} - mvn:org.opendaylight.controller/sal-binding-api/${project.version} - mvn:org.opendaylight.controller/sal-binding-broker-impl/${project.version} - mvn:org.opendaylight.controller/sal-binding-util/${project.version} - mvn:org.opendaylight.controller/sal-connector-api/${project.version} - mvn:org.opendaylight.controller/sal-dom-config/${project.version} - mvn:org.opendaylight.controller/sal-binding-config/${project.version} - mvn:org.opendaylight.controller/sal-inmemory-datastore/${project.version} - mvn:org.opendaylight.controller/sal-dom-broker-config/${project.version} - mvn:org.opendaylight.controller/md-sal-config/${mdsal.version}/xml/config + + + mvn:com.lmax/disruptor/{{VERSION}} + mvn:org.opendaylight.controller/sal-core-api/{{VERSION}} + mvn:org.opendaylight.controller/sal-core-spi/{{VERSION}} + mvn:org.opendaylight.controller/sal-broker-impl/{{VERSION}} + mvn:org.opendaylight.controller/sal-binding-api/{{VERSION}} + mvn:org.opendaylight.controller/sal-binding-broker-impl/{{VERSION}} + mvn:org.opendaylight.controller/sal-binding-util/{{VERSION}} + mvn:org.opendaylight.controller/sal-connector-api/{{VERSION}} + mvn:org.opendaylight.controller/sal-dom-config/{{VERSION}} + mvn:org.opendaylight.controller/sal-binding-config/{{VERSION}} + mvn:org.opendaylight.controller/sal-inmemory-datastore/{{VERSION}} + mvn:org.opendaylight.controller/sal-dom-broker-config/{{VERSION}} + mvn:org.opendaylight.controller/md-sal-config/{{VERSION}}/xml/config odl-yangtools-common odl-yangtools-binding odl-mdsal-broker - mvn:org.opendaylight.controller.samples/sample-toaster/${project.version} - mvn:org.opendaylight.controller.samples/sample-toaster-consumer/${project.version} - mvn:org.opendaylight.controller.samples/sample-toaster-provider/${project.version} - mvn:org.opendaylight.controller.samples/toaster-config/${project.version}/xml/config + mvn:org.opendaylight.controller.samples/sample-toaster/{{VERSION}} + mvn:org.opendaylight.controller.samples/sample-toaster-consumer/{{VERSION}} + mvn:org.opendaylight.controller.samples/sample-toaster-provider/{{VERSION}} + mvn:org.opendaylight.controller.samples/toaster-config/{{VERSION}}/xml/config odl-mdsal-broker - mvn:org.opendaylight.controller/sal-dom-xsql/${project.version} - mvn:org.opendaylight.controller/sal-karaf-xsql/${project.version} - mvn:org.opendaylight.controller/sal-dom-xsql-config/${project.version}/xml/config + mvn:org.opendaylight.controller/sal-dom-xsql/{{VERSION}} + mvn:org.opendaylight.controller/sal-karaf-xsql/{{VERSION}} + mvn:org.opendaylight.controller/sal-dom-xsql-config/{{VERSION}}/xml/config odl-mdsal-broker-local odl-akka-system odl-akka-persistence - mvn:org.opendaylight.controller/sal-clustering-commons/${project.version} - mvn:org.opendaylight.controller/sal-akka-raft/${project.version} + mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}} + mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}} mvn:com.codahale.metrics/metrics-core/3.0.1 odl-mdsal-broker-local odl-mdsal-clustering-commons odl-akka-clustering - mvn:org.opendaylight.controller/sal-distributed-datastore/${project.version} + mvn:org.opendaylight.controller/sal-distributed-datastore/{{VERSION}} odl-mdsal-broker-local odl-mdsal-clustering-commons odl-akka-clustering odl-akka-leveldb - mvn:org.opendaylight.controller/sal-remoterpc-connector/${project.version} + mvn:org.opendaylight.controller/sal-remoterpc-connector/{{VERSION}} odl-mdsal-remoterpc-connector @@ -93,20 +101,21 @@ odl-mdsal-broker - odl-yangtools-models + odl-mdsal-models odl-mdsal-broker - mvn:org.opendaylight.controller.samples/clustering-it-model/${project.version} - mvn:org.opendaylight.controller.samples/clustering-it-provider/${project.version} - mvn:org.opendaylight.controller.samples/clustering-it-config/${project.version}/xml/config + mvn:org.opendaylight.controller.samples/clustering-it-model/{{VERSION}} + mvn:org.opendaylight.controller.samples/clustering-it-provider/{{VERSION}} + mvn:org.opendaylight.controller.samples/clustering-it-config/{{VERSION}}/xml/config - mvn:org.opendaylight.controller.model/model-inventory/${mdsal.version} + + mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}} odl-mdsal-broker - mvn:org.opendaylight.controller/messagebus-api/${project.version} - mvn:org.opendaylight.controller/messagebus-spi/${project.version} - mvn:org.opendaylight.controller/messagebus-util/${project.version} - mvn:org.opendaylight.controller/messagebus-impl/${project.version} - mvn:org.opendaylight.controller/messagebus-config/${project.version}/xml/config + mvn:org.opendaylight.controller/messagebus-api/{{VERSION}} + mvn:org.opendaylight.controller/messagebus-spi/{{VERSION}} + mvn:org.opendaylight.controller/messagebus-util/{{VERSION}} + mvn:org.opendaylight.controller/messagebus-impl/{{VERSION}} + mvn:org.opendaylight.controller/messagebus-config/{{VERSION}}/xml/config diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml index fc486e7f57..170e0e9ad1 100644 --- a/features/protocol-framework/pom.xml +++ b/features/protocol-framework/pom.xml @@ -2,17 +2,19 @@ 4.0.0 - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + features-parent 1.6.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + + + org.opendaylight.controller features-protocol-framework - ${protocol-framework.version} + 0.7.0-SNAPSHOT jar - features.xml + 0.4.0-SNAPSHOT @@ -20,78 +22,22 @@ org.opendaylight.controller features-config features + ${config.version} xml org.opendaylight.controller - protocol-framework + features-config-netty + ${config.version} + features + xml - - org.opendaylight.odlparent - features-test + org.opendaylight.controller + protocol-framework + ${project.version} - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.opendaylight.controller - opendaylight-karaf-empty - ${commons.opendaylight.version} - - - org.opendaylight.odlparent:features-test - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/protocol-framework/src/main/resources/features.xml b/features/protocol-framework/src/main/features/features.xml similarity index 67% rename from features/protocol-framework/src/main/resources/features.xml rename to features/protocol-framework/src/main/features/features.xml index 46510bca46..25d19220cc 100644 --- a/features/protocol-framework/src/main/resources/features.xml +++ b/features/protocol-framework/src/main/features/features.xml @@ -3,10 +3,11 @@ - mvn:org.opendaylight.controller/features-config/${config.version}/xml/features + mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features + mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features odl-config-api odl-config-netty-config-api - mvn:org.opendaylight.controller/protocol-framework/${protocol-framework.version} + mvn:org.opendaylight.controller/protocol-framework/{{VERSION}} \ No newline at end of file diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml index 831108accd..fb57e25afd 100644 --- a/karaf/opendaylight-karaf/pom.xml +++ b/karaf/opendaylight-karaf/pom.xml @@ -66,13 +66,22 @@ runtime - org.opendaylight.controller - features-restconf - 1.3.0-SNAPSHOT + org.opendaylight.mdsal + features-mdsal + 2.0.0-SNAPSHOT + features + xml + runtime + + + org.opendaylight.mdsal.model + features-mdsal-model + 0.8.0-SNAPSHOT features xml runtime + odl-yangtools-models mvn:${groupId}/${artifactId}-api/${symbol_dollar}{project.version} diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 1256e0b3a4..cb2ea5cc29 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -14,7 +14,8 @@ pom - + 2.0.0-SNAPSHOT + 0.8.0-SNAPSHOT 2.3.10 0.6.0-SNAPSHOT 0.2.0-SNAPSHOT @@ -190,6 +191,44 @@ + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + + + + org.opendaylight.mdsal + mdsal-artifacts + 2.0.0-SNAPSHOT + pom + import + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + pom + import + + + + org.opendaylight.controller + config-artifacts + ${config.version} + pom + import + + org.opendaylight.controller @@ -1196,14 +1235,6 @@ 1.0.2 - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - openexi @@ -1611,9 +1642,9 @@ ${yangtools.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin - ${yangtools.version} + 0.8.0-SNAPSHOT jar diff --git a/opendaylight/commons/protocol-framework/pom.xml b/opendaylight/commons/protocol-framework/pom.xml index a39791710d..6a3ba8378f 100644 --- a/opendaylight/commons/protocol-framework/pom.xml +++ b/opendaylight/commons/protocol-framework/pom.xml @@ -148,7 +148,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} diff --git a/opendaylight/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml index 163cb57b28..89c1db0001 100644 --- a/opendaylight/config/config-api/pom.xml +++ b/opendaylight/config/config-api/pom.xml @@ -7,7 +7,7 @@ config-subsystem 0.4.0-SNAPSHOT - + config-api bundle ${project.artifactId} @@ -18,7 +18,7 @@ jsr305 - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/opendaylight/config/config-manager-facade-xml/pom.xml b/opendaylight/config/config-manager-facade-xml/pom.xml index 4477052102..e1c32d6704 100644 --- a/opendaylight/config/config-manager-facade-xml/pom.xml +++ b/opendaylight/config/config-manager-facade-xml/pom.xml @@ -26,8 +26,8 @@ yang-data-api - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl org.slf4j diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml index 0bc068083f..d90cd0fe21 100644 --- a/opendaylight/config/config-manager/pom.xml +++ b/opendaylight/config/config-manager/pom.xml @@ -28,8 +28,8 @@ - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl org.opendaylight.yangtools diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml index fa8a4385e3..52b5ca28e2 100644 --- a/opendaylight/config/config-parent/pom.xml +++ b/opendaylight/config/config-parent/pom.xml @@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.yangtools + org.opendaylight.mdsal binding-parent 0.8.0-SNAPSHOT @@ -53,6 +53,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html pom import + + org.opendaylight.mdsal + mdsal-artifacts + 2.0.0-SNAPSHOT + pom + import + diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 0b0c760e38..8f8998c3bf 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -109,9 +109,9 @@ ${yangtools.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin - ${yangtools.version} + 0.8.0-SNAPSHOT jar diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml index 7e1a7c52fa..5a1390610d 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml +++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml @@ -32,8 +32,8 @@ - org.opendaylight.yangtools - binding-type-provider + org.opendaylight.mdsal + mdsal-binding-generator-impl diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml index 1b3397dbd3..49cf5e5e06 100644 --- a/opendaylight/config/yang-jmx-generator/pom.xml +++ b/opendaylight/config/yang-jmx-generator/pom.xml @@ -21,18 +21,9 @@ com.google.guava guava - - - org.opendaylight.yangtools - binding-generator-spi - - - org.opendaylight.yangtools - binding-generator-util - - org.opendaylight.yangtools - binding-type-provider + org.opendaylight.mdsal + mdsal-binding-generator-impl org.opendaylight.yangtools @@ -52,11 +43,6 @@ commons-lang3 test - - org.opendaylight.yangtools - binding-generator-impl - test - org.opendaylight.yangtools yang-parser-impl diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml index 687e35fb25..b8cec8ee13 100644 --- a/opendaylight/config/yang-test/pom.xml +++ b/opendaylight/config/yang-test/pom.xml @@ -25,7 +25,7 @@ mockito-configuration - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml index d3586fb8ed..d367c5f9b8 100644 --- a/opendaylight/md-sal/messagebus-api/pom.xml +++ b/opendaylight/md-sal/messagebus-api/pom.xml @@ -28,11 +28,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html model-inventory - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index c70115e7e3..52843cf23a 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -23,7 +23,7 @@ concepts - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index e0714eb151..616df49b8f 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -44,12 +44,12 @@ sal-core-api - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl - org.opendaylight.yangtools - binding-data-codec + org.opendaylight.mdsal + mdsal-binding-dom-codec org.opendaylight.yangtools @@ -59,10 +59,6 @@ org.opendaylight.yangtools yang-model-util - - org.opendaylight.yangtools.model - ietf-inet-types - org.slf4j slf4j-api @@ -87,13 +83,7 @@ yang-parser-impl test - + org.opendaylight.controller sal-test-model diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index ae9b92431f..854a6a49e0 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -27,8 +27,12 @@ sal-binding-broker-impl - org.opendaylight.yangtools - binding-data-codec + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.mdsal.model + ietf-yang-types diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 88e9c1a9c6..2c5e9e4adf 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -15,7 +15,7 @@ junit - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -49,7 +49,7 @@ sal-test-model - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model opendaylight-l2-types diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index c5c03f7060..04283e75c3 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -129,7 +129,15 @@ ${mdsal.version} - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model + ietf-yang-types + + + org.opendaylight.mdsal.model + ietf-inet-types + + + org.opendaylight.mdsal.model opendaylight-l2-types diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index f810d6240b..6647711dce 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -19,16 +19,17 @@ import org.ops4j.pax.exam.util.PathUtils; public class TestHelper { public static final String CONTROLLER = "org.opendaylight.controller"; + public static final String MDSAL = "org.opendaylight.mdsal"; public static final String YANGTOOLS = "org.opendaylight.yangtools"; public static final String CONTROLLER_MODELS = "org.opendaylight.controller.model"; - public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model"; + public static final String MDSAL_MODELS = "org.opendaylight.mdsal.model"; public static Option mdSalCoreBundles() { return new DefaultCompositeOption( // mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // // mavenBundle(YANGTOOLS, "util").versionAsInProject(), // // - mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // // + mavenBundle(MDSAL, "yang-binding").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // // mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // // mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // // @@ -80,16 +81,11 @@ public class TestHelper { mavenBundle(YANGTOOLS, "yang-model-api").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-model-util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-parser-api").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), // // - mavenBundle(YANGTOOLS, "binding-model-api").versionAsInProject(), // // - mavenBundle(YANGTOOLS, "binding-generator-util").versionAsInProject(), // mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-type-provider").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-generator-api").versionAsInProject(), mavenBundle(YANGTOOLS, - "binding-generator-spi").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-generator-impl").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-data-codec").versionAsInProject(), + mavenBundle(MDSAL, "mdsal-binding-generator-api").versionAsInProject(), // + mavenBundle(MDSAL, "mdsal-binding-generator-util").versionAsInProject(), // + mavenBundle(MDSAL, "mdsal-binding-generator-impl").versionAsInProject(), + mavenBundle(MDSAL, "mdsal-binding-dom-codec").versionAsInProject(), mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-binding-util").versionAsInProject(), // @@ -161,10 +157,10 @@ public class TestHelper { public static Option baseModelBundles() { return new DefaultCompositeOption( // - mavenBundle(YANGTOOLS_MODELS, "yang-ext").versionAsInProject(), // // - mavenBundle(YANGTOOLS_MODELS, "ietf-inet-types").versionAsInProject(), // // - mavenBundle(YANGTOOLS_MODELS, "ietf-yang-types").versionAsInProject(), // // - mavenBundle(YANGTOOLS_MODELS, "opendaylight-l2-types").versionAsInProject() // // + mavenBundle(MDSAL+".model", "yang-ext").versionAsInProject(), // // + mavenBundle(MDSAL_MODELS, "ietf-inet-types").versionAsInProject(), // // + mavenBundle(MDSAL_MODELS, "ietf-yang-types").versionAsInProject(), // // + mavenBundle(MDSAL_MODELS, "opendaylight-l2-types").versionAsInProject() // // ); } diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index 485a7470bd..8a32507ada 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -106,10 +106,6 @@ org.opendaylight.yangtools util - - org.opendaylight.yangtools - yang-binding - org.opendaylight.yangtools yang-common diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml index f25423f1c2..e89f759e4c 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -16,7 +16,7 @@ sal-core-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index 14f530213b..cdf8325aa2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -143,7 +143,7 @@ concepts - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/opendaylight/md-sal/sal-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml index 601743b5cf..c044e9b722 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml @@ -22,6 +22,10 @@ org.opendaylight.controller sal-broker-impl + + org.opendaylight.mdsal.model + ietf-yang-types + diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index 3a02107f0a..9487a6b732 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -51,11 +51,6 @@ yang-parser-impl - - org.opendaylight.yangtools.model - ietf-yang-types - - junit junit diff --git a/opendaylight/md-sal/sal-dom-xsql/pom.xml b/opendaylight/md-sal/sal-dom-xsql/pom.xml index 665c0a1c20..61e6b3e19a 100644 --- a/opendaylight/md-sal/sal-dom-xsql/pom.xml +++ b/opendaylight/md-sal/sal-dom-xsql/pom.xml @@ -6,6 +6,7 @@ sal-parent 1.3.0-SNAPSHOT + sal-dom-xsql bundle sal-dom-xsql @@ -37,7 +38,7 @@ yang-jmx-generator-plugin - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -64,9 +65,9 @@ yang-maven-plugin - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin - ${yangtools.version} + 0.8.0-SNAPSHOT jar diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index a1ba2ecdd6..6fd9070a7c 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -59,7 +59,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -108,8 +108,8 @@ test - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl test diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml index e32f703dcf..1af1fdabca 100644 --- a/opendaylight/md-sal/sal-remote/pom.xml +++ b/opendaylight/md-sal/sal-remote/pom.xml @@ -26,7 +26,7 @@ yang-maven-plugin - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml index 446e167155..854fdf1f7a 100644 --- a/opendaylight/md-sal/sal-test-model/pom.xml +++ b/opendaylight/md-sal/sal-test-model/pom.xml @@ -14,11 +14,11 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext @@ -80,4 +80,4 @@ https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - \ No newline at end of file + diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml index 7fbff152e6..f4271ab05e 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml @@ -6,6 +6,7 @@ org.opendaylight.controller.samples 1.3.0-SNAPSHOT + clustering-it-model bundle @@ -46,9 +47,9 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin - ${yangtools.version} + 0.8.0-SNAPSHOT jar @@ -87,7 +88,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding ${yangtools.version} @@ -97,17 +98,17 @@ ${yangtools.version} - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types ${ietf-inet-types.version} - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types ${ietf-yang-types.version} - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext ${yang-ext.version} diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml index 850160e8ba..210da14269 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml @@ -6,6 +6,7 @@ org.opendaylight.controller.samples 1.3.0-SNAPSHOT + clustering-it-provider bundle @@ -58,7 +59,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml index 3aa1e4ca59..e8ddc8ba9a 100644 --- a/opendaylight/md-sal/samples/toaster-it/pom.xml +++ b/opendaylight/md-sal/samples/toaster-it/pom.xml @@ -27,7 +27,7 @@ sample-toaster-consumer - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index 0a8428a8f4..a60ec1c002 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -69,19 +69,19 @@ guava - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model opendaylight-l2-types diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml index 7a3a742c45..bfdc8eef23 100644 --- a/opendaylight/md-sal/samples/toaster/pom.xml +++ b/opendaylight/md-sal/samples/toaster/pom.xml @@ -6,11 +6,12 @@ sal-samples 1.3.0-SNAPSHOT + sample-toaster bundle - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -26,9 +27,9 @@ yang-maven-plugin - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin - ${yangtools.version} + 0.8.0-SNAPSHOT jar diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml index 0763a04f55..4ef527f215 100644 --- a/opendaylight/model/model-topology/pom.xml +++ b/opendaylight/model/model-topology/pom.xml @@ -18,7 +18,7 @@ ${project.version} - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml index df0b87f147..db68c4f5bb 100644 --- a/opendaylight/model/pom.xml +++ b/opendaylight/model/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - org.opendaylight.yangtools + org.opendaylight.mdsal binding-parent 0.8.0-SNAPSHOT @@ -14,19 +14,43 @@ 1.3.0-SNAPSHOT pom - - model-inventory - model-topology - - 2.4.0 + 2.0.0-SNAPSHOT + 0.8.0-SNAPSHOT UTF-8 + + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + pom + import + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + pom + import + + + + + + model-inventory + model-topology + + - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -34,15 +58,15 @@ yang-common - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext -- 2.36.6