From 0ae97da04041d6cb57b07391325fabdf73271d38 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 11 Oct 2017 16:54:31 +0200 Subject: [PATCH] Bump yangtools dependency to 2.0.0 This patch adopts odlparent-3.0.2 and yangtools-2.0.0. As such it is not expected to pass compilation due to the amount of breaking changes in yangtools. It is separated out to allow review of changes at the build system level. Adjustments include: - feature reference updates, so we pull in correct yangtools features - bump scala-maven-plugin to 3.3.1 - bump twirl-maven-plugin to 1.1.0 - bump twirl-api to 1.3.13 Follow-up patch adapts the codebase to the inbound changes, making the compilation pass. Change-Id: I21a3d55969c31b89b56c6ba637593f033b035e14 Signed-off-by: Robert Varga --- binding/binding-parent/pom.xml | 4 +-- binding/maven-sal-api-gen-plugin/pom.xml | 4 +-- binding/mdsal-binding-api/pom.xml | 4 +-- binding/mdsal-binding-dom-adapter/pom.xml | 4 +-- binding/mdsal-binding-dom-codec-osgi/pom.xml | 4 +-- binding/mdsal-binding-dom-codec/pom.xml | 4 +-- binding/mdsal-binding-generator-api/pom.xml | 4 +-- binding/mdsal-binding-generator-impl/pom.xml | 4 +-- binding/mdsal-binding-generator-util/pom.xml | 4 +-- .../mdsal-binding-java-api-generator/pom.xml | 4 +-- binding/mdsal-binding-test-utils/pom.xml | 2 +- binding/mdsal-binding-util/pom.xml | 2 +- binding/pom.xml | 2 +- binding/yang-binding/pom.xml | 4 +-- binding2/mdsal-binding2-api/pom.xml | 4 +-- binding2/mdsal-binding2-dom-adapter/pom.xml | 4 +-- binding2/mdsal-binding2-dom-codec/pom.xml | 4 +-- binding2/mdsal-binding2-generator-api/pom.xml | 4 +-- .../mdsal-binding2-generator-impl/pom.xml | 12 +++---- .../mdsal-binding2-generator-util/pom.xml | 9 +++-- .../mdsal-binding2-java-api-generator/pom.xml | 12 +++---- .../pom.xml | 4 +-- binding2/mdsal-binding2-runtime/pom.xml | 4 +-- binding2/mdsal-binding2-spec/pom.xml | 4 +-- binding2/mdsal-binding2-util/pom.xml | 4 +-- binding2/mdsal-model-binding2-parent/pom.xml | 4 +-- binding2/pom.xml | 2 +- binding2/prototype/pom.xml | 2 +- common/artifacts/pom.xml | 2 +- common/features/features-mdsal/pom.xml | 2 +- common/features/odl-mdsal-binding-api/pom.xml | 20 +++++++---- .../features/odl-mdsal-binding-base/pom.xml | 4 +-- .../odl-mdsal-binding-dom-adapter/pom.xml | 2 +- .../odl-mdsal-binding-runtime/pom.xml | 12 +++++-- common/features/odl-mdsal-binding/pom.xml | 4 +-- .../features/odl-mdsal-binding2-api/pom.xml | 4 +-- .../features/odl-mdsal-binding2-base/pom.xml | 6 ++-- .../odl-mdsal-binding2-dom-adapter/pom.xml | 2 +- .../odl-mdsal-binding2-runtime/pom.xml | 6 ++-- common/features/odl-mdsal-binding2/pom.xml | 2 +- common/features/odl-mdsal-common/pom.xml | 4 +-- common/features/odl-mdsal-dom-api/pom.xml | 12 +++---- common/features/odl-mdsal-dom-broker/pom.xml | 8 ++--- .../odl-mdsal-dom-schema-service-osgi/pom.xml | 35 ++++++++++++++++++- common/features/odl-mdsal-dom/pom.xml | 2 +- common/features/odl-mdsal-eos-binding/pom.xml | 2 +- common/features/odl-mdsal-eos-common/pom.xml | 6 ++-- common/features/odl-mdsal-eos-dom/pom.xml | 2 +- .../odl-mdsal-singleton-common/pom.xml | 2 +- .../features/odl-mdsal-singleton-dom/pom.xml | 2 +- common/features/pom.xml | 2 +- common/mdsal-common-api/pom.xml | 4 +-- common/parent/pom.xml | 10 +++--- common/pom.xml | 2 +- dom/mdsal-dom-api/pom.xml | 4 +-- dom/mdsal-dom-broker/pom.xml | 4 +-- dom/mdsal-dom-inmemory-datastore/pom.xml | 4 +-- dom/mdsal-dom-schema-service-osgi/pom.xml | 4 +-- dom/mdsal-dom-spi/pom.xml | 4 +-- dom/pom.xml | 2 +- .../mdsal-eos-binding-adapter/pom.xml | 4 +-- entityownership/mdsal-eos-binding-api/pom.xml | 4 +-- entityownership/mdsal-eos-common-api/pom.xml | 4 +-- entityownership/mdsal-eos-common-spi/pom.xml | 4 +-- entityownership/mdsal-eos-dom-api/pom.xml | 4 +-- entityownership/mdsal-eos-dom-simple/pom.xml | 4 +-- entityownership/pom.xml | 2 +- model-binding2/pom.xml | 2 +- model/artifacts/pom.xml | 4 +-- model/features/features-mdsal-model/pom.xml | 2 +- model/features/odl-mdsal-models/pom.xml | 2 +- model/features/pom.xml | 2 +- model/iana/pom.xml | 2 +- model/ietf/ietf-type-util/pom.xml | 2 +- model/ietf/pom.xml | 2 +- model/pom.xml | 2 +- pom.xml | 4 +-- .../mdsal-singleton-common-api/pom.xml | 4 +-- .../mdsal-singleton-dom-impl/pom.xml | 4 +-- singleton-service/pom.xml | 2 +- 80 files changed, 207 insertions(+), 157 deletions(-) diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml index eeb194b0ac..7e537cc444 100644 --- a/binding/binding-parent/pom.xml +++ b/binding/binding-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -23,7 +23,7 @@ pom - 1.2.0 + 2.0.0 2.4.0-SNAPSHOT 0.12.0-SNAPSHOT ${project.build.directory}/generated-sources/mdsal-binding diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml index 4dc0132723..551e2aa999 100644 --- a/binding/maven-sal-api-gen-plugin/pom.xml +++ b/binding/maven-sal-api-gen-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml index a26b56cee4..e8b8335cc2 100644 --- a/binding/mdsal-binding-api/pom.xml +++ b/binding/mdsal-binding-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml index 183494b665..44aaded1af 100644 --- a/binding/mdsal-binding-dom-adapter/pom.xml +++ b/binding/mdsal-binding-dom-adapter/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml index ede0c9f6aa..909bf05448 100644 --- a/binding/mdsal-binding-dom-codec-osgi/pom.xml +++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml index ea0f0d964b..408ae92696 100644 --- a/binding/mdsal-binding-dom-codec/pom.xml +++ b/binding/mdsal-binding-dom-codec/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-generator-api/pom.xml b/binding/mdsal-binding-generator-api/pom.xml index 13ba063dc1..b6e0ed3c0f 100644 --- a/binding/mdsal-binding-generator-api/pom.xml +++ b/binding/mdsal-binding-generator-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-generator-impl/pom.xml b/binding/mdsal-binding-generator-impl/pom.xml index d4bf240309..329083929a 100644 --- a/binding/mdsal-binding-generator-impl/pom.xml +++ b/binding/mdsal-binding-generator-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-generator-util/pom.xml b/binding/mdsal-binding-generator-util/pom.xml index 29542d1c64..2bf960ebdc 100644 --- a/binding/mdsal-binding-generator-util/pom.xml +++ b/binding/mdsal-binding-generator-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml index 799f399316..6d98f8d195 100644 --- a/binding/mdsal-binding-java-api-generator/pom.xml +++ b/binding/mdsal-binding-java-api-generator/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml index aa4dba9e6d..a7c361fa0c 100644 --- a/binding/mdsal-binding-test-utils/pom.xml +++ b/binding/mdsal-binding-test-utils/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.2 diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml index d798307014..55afc248ba 100644 --- a/binding/mdsal-binding-util/pom.xml +++ b/binding/mdsal-binding-util/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 diff --git a/binding/pom.xml b/binding/pom.xml index 9ba0a1ef75..3e17b1768f 100644 --- a/binding/pom.xml +++ b/binding/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 4.0.0 diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml index 1bfaf1ddb6..9cf329715f 100644 --- a/binding/yang-binding/pom.xml +++ b/binding/yang-binding/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -29,7 +29,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-api/pom.xml b/binding2/mdsal-binding2-api/pom.xml index a28b906f3f..864feb6f25 100644 --- a/binding2/mdsal-binding2-api/pom.xml +++ b/binding2/mdsal-binding2-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-dom-adapter/pom.xml b/binding2/mdsal-binding2-dom-adapter/pom.xml index bfd9893919..549eafed5d 100644 --- a/binding2/mdsal-binding2-dom-adapter/pom.xml +++ b/binding2/mdsal-binding2-dom-adapter/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -36,7 +36,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-dom-codec/pom.xml b/binding2/mdsal-binding2-dom-codec/pom.xml index 912fd54e62..446f91c7b4 100644 --- a/binding2/mdsal-binding2-dom-codec/pom.xml +++ b/binding2/mdsal-binding2-dom-codec/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -35,7 +35,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-generator-api/pom.xml b/binding2/mdsal-binding2-generator-api/pom.xml index 5b36eef6f9..05080f06e5 100644 --- a/binding2/mdsal-binding2-generator-api/pom.xml +++ b/binding2/mdsal-binding2-generator-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-generator-impl/pom.xml b/binding2/mdsal-binding2-generator-impl/pom.xml index c92d7cab2f..2e8651dbf7 100644 --- a/binding2/mdsal-binding2-generator-impl/pom.xml +++ b/binding2/mdsal-binding2-generator-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -91,8 +91,8 @@ com.typesafe.play - twirl-api_2.11 - 1.1.1 + twirl-api_2.12 + 1.3.13 @@ -118,7 +118,7 @@ com.jakewharton.twirl twirl-maven-plugin - 1.0.5 + 1.1.0 twirl-to-scala-first @@ -134,7 +134,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.3.1 scala-compile-second diff --git a/binding2/mdsal-binding2-generator-util/pom.xml b/binding2/mdsal-binding2-generator-util/pom.xml index e3dfa9a1e3..3b3a377137 100644 --- a/binding2/mdsal-binding2-generator-util/pom.xml +++ b/binding2/mdsal-binding2-generator-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -50,6 +50,10 @@ org.opendaylight.yangtools yang-model-api + + org.opendaylight.yangtools + yang-model-util + org.opendaylight.mdsal mdsal-binding2-spec @@ -61,6 +65,7 @@ org.opendaylight.yangtools yang-parser-impl + test junit diff --git a/binding2/mdsal-binding2-java-api-generator/pom.xml b/binding2/mdsal-binding2-java-api-generator/pom.xml index 2a46f221f1..8750ac5efb 100644 --- a/binding2/mdsal-binding2-java-api-generator/pom.xml +++ b/binding2/mdsal-binding2-java-api-generator/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -66,8 +66,8 @@ com.typesafe.play - twirl-api_2.11 - 1.1.1 + twirl-api_2.12 + 1.3.13 com.google.guava @@ -119,7 +119,7 @@ com.jakewharton.twirl twirl-maven-plugin - 1.0.5 + 1.1.0 twirl-to-scala-first @@ -135,7 +135,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.3.1 scala-compile-second diff --git a/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml b/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml index 8526cc1918..5aaa396b96 100644 --- a/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml +++ b/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-runtime/pom.xml b/binding2/mdsal-binding2-runtime/pom.xml index 4bd819a036..f25197ab53 100644 --- a/binding2/mdsal-binding2-runtime/pom.xml +++ b/binding2/mdsal-binding2-runtime/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -35,7 +35,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-spec/pom.xml b/binding2/mdsal-binding2-spec/pom.xml index c09c9b1bc6..7c8509eefd 100644 --- a/binding2/mdsal-binding2-spec/pom.xml +++ b/binding2/mdsal-binding2-spec/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -29,7 +29,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-binding2-util/pom.xml b/binding2/mdsal-binding2-util/pom.xml index e9fb2a999a..db40cb6cf6 100644 --- a/binding2/mdsal-binding2-util/pom.xml +++ b/binding2/mdsal-binding2-util/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -31,7 +31,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/binding2/mdsal-model-binding2-parent/pom.xml b/binding2/mdsal-model-binding2-parent/pom.xml index 15bab9fe3d..ceb0b0bdc4 100644 --- a/binding2/mdsal-model-binding2-parent/pom.xml +++ b/binding2/mdsal-model-binding2-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -23,7 +23,7 @@ pom - 1.2.0 + 2.0.0 2.4.0-SNAPSHOT 0.12.0-SNAPSHOT ${project.build.directory}/generated-sources/mdsal-binding2 diff --git a/binding2/pom.xml b/binding2/pom.xml index b7ddf12f62..f06c33628c 100644 --- a/binding2/pom.xml +++ b/binding2/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/binding2/prototype/pom.xml b/binding2/prototype/pom.xml index dcae3600b4..8b17b5a518 100644 --- a/binding2/prototype/pom.xml +++ b/binding2/prototype/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yang-common - 1.2.0 + 2.0.0 org.opendaylight.mdsal diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml index ed89321e69..9b1edcc8c3 100644 --- a/common/artifacts/pom.xml +++ b/common/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/common/features/features-mdsal/pom.xml b/common/features/features-mdsal/pom.xml index 9794d8513d..b9ca6525e9 100644 --- a/common/features/features-mdsal/pom.xml +++ b/common/features/features-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-binding-api/pom.xml b/common/features/odl-mdsal-binding-api/pom.xml index 4d9996ff01..989a6255f3 100644 --- a/common/features/odl-mdsal-binding-api/pom.xml +++ b/common/features/odl-mdsal-binding-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 import pom @@ -46,20 +46,26 @@ - org.opendaylight.mdsal - odl-mdsal-common + org.opendaylight.yangtools + odl-yangtools-data-api + xml + features + + + org.opendaylight.yangtools + odl-yangtools-parser-api xml features org.opendaylight.mdsal - odl-mdsal-binding-base + odl-mdsal-common xml features - org.opendaylight.yangtools - odl-yangtools-yang-parser + org.opendaylight.mdsal + odl-mdsal-binding-base xml features diff --git a/common/features/odl-mdsal-binding-base/pom.xml b/common/features/odl-mdsal-binding-base/pom.xml index da64a44c7d..0ad9a6cd7f 100644 --- a/common/features/odl-mdsal-binding-base/pom.xml +++ b/common/features/odl-mdsal-binding-base/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -30,7 +30,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/common/features/odl-mdsal-binding-dom-adapter/pom.xml b/common/features/odl-mdsal-binding-dom-adapter/pom.xml index a94caa015e..c16b6ccda3 100644 --- a/common/features/odl-mdsal-binding-dom-adapter/pom.xml +++ b/common/features/odl-mdsal-binding-dom-adapter/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-binding-runtime/pom.xml b/common/features/odl-mdsal-binding-runtime/pom.xml index 15b72635a9..50094957b6 100644 --- a/common/features/odl-mdsal-binding-runtime/pom.xml +++ b/common/features/odl-mdsal-binding-runtime/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -30,7 +30,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -53,7 +53,13 @@ org.opendaylight.yangtools - odl-yangtools-yang-data + odl-yangtools-data + xml + features + + + org.opendaylight.yangtools + odl-yangtools-parser xml features diff --git a/common/features/odl-mdsal-binding/pom.xml b/common/features/odl-mdsal-binding/pom.xml index 1bf29e1c62..59da71a6cd 100644 --- a/common/features/odl-mdsal-binding/pom.xml +++ b/common/features/odl-mdsal-binding/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/common/features/odl-mdsal-binding2-api/pom.xml b/common/features/odl-mdsal-binding2-api/pom.xml index 6ec4607cb3..1a0b7d8c3d 100644 --- a/common/features/odl-mdsal-binding2-api/pom.xml +++ b/common/features/odl-mdsal-binding2-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 import pom diff --git a/common/features/odl-mdsal-binding2-base/pom.xml b/common/features/odl-mdsal-binding2-base/pom.xml index 2ae431b210..6601a0a281 100644 --- a/common/features/odl-mdsal-binding2-base/pom.xml +++ b/common/features/odl-mdsal-binding2-base/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -30,7 +30,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -60,7 +60,7 @@ org.opendaylight.yangtools - odl-yangtools-yang-parser + odl-yangtools-parser-api xml features diff --git a/common/features/odl-mdsal-binding2-dom-adapter/pom.xml b/common/features/odl-mdsal-binding2-dom-adapter/pom.xml index e143c0397c..7336465652 100644 --- a/common/features/odl-mdsal-binding2-dom-adapter/pom.xml +++ b/common/features/odl-mdsal-binding2-dom-adapter/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-binding2-runtime/pom.xml b/common/features/odl-mdsal-binding2-runtime/pom.xml index 11a1b36a27..0997ec0d72 100644 --- a/common/features/odl-mdsal-binding2-runtime/pom.xml +++ b/common/features/odl-mdsal-binding2-runtime/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -30,7 +30,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -53,7 +53,7 @@ org.opendaylight.yangtools - odl-yangtools-yang-data + odl-yangtools-data xml features diff --git a/common/features/odl-mdsal-binding2/pom.xml b/common/features/odl-mdsal-binding2/pom.xml index cbc84add0e..59fa78cd3c 100644 --- a/common/features/odl-mdsal-binding2/pom.xml +++ b/common/features/odl-mdsal-binding2/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-common/pom.xml b/common/features/odl-mdsal-common/pom.xml index 6c4ca58414..592481f65e 100644 --- a/common/features/odl-mdsal-common/pom.xml +++ b/common/features/odl-mdsal-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/common/features/odl-mdsal-dom-api/pom.xml b/common/features/odl-mdsal-dom-api/pom.xml index a81a0dbbb7..997b5428d6 100644 --- a/common/features/odl-mdsal-dom-api/pom.xml +++ b/common/features/odl-mdsal-dom-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -46,14 +46,14 @@ - org.opendaylight.mdsal - odl-mdsal-common + org.opendaylight.yangtools + odl-yangtools-data-api xml features - org.opendaylight.yangtools - odl-yangtools-yang-data + org.opendaylight.mdsal + odl-mdsal-common xml features diff --git a/common/features/odl-mdsal-dom-broker/pom.xml b/common/features/odl-mdsal-dom-broker/pom.xml index a77237a31b..c37a4e4908 100644 --- a/common/features/odl-mdsal-dom-broker/pom.xml +++ b/common/features/odl-mdsal-dom-broker/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -30,14 +30,14 @@ org.opendaylight.odlparent odlparent-artifacts - 2.0.5 + 3.0.2 pom import org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -54,7 +54,7 @@ org.opendaylight.yangtools - odl-yangtools-yang-parser + odl-yangtools-parser xml features diff --git a/common/features/odl-mdsal-dom-schema-service-osgi/pom.xml b/common/features/odl-mdsal-dom-schema-service-osgi/pom.xml index 57f143bbf6..a0d085ee39 100644 --- a/common/features/odl-mdsal-dom-schema-service-osgi/pom.xml +++ b/common/features/odl-mdsal-dom-schema-service-osgi/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -27,6 +27,13 @@ + + org.opendaylight.yangtools + yangtools-artifacts + 2.0.0 + pom + import + org.opendaylight.mdsal mdsal-artifacts @@ -38,6 +45,32 @@ + + org.opendaylight.yangtools + odl-yangtools-parser + xml + features + + + org.opendaylight.yangtools + odl-yangtools-data + xml + features + + + org.opendaylight.odlparent + odl-lmax-3 + xml + features + + + org.opendaylight.mdsal + odl-mdsal-dom-api + xml + features + + + ${project.groupId} mdsal-dom-schema-service-osgi diff --git a/common/features/odl-mdsal-dom/pom.xml b/common/features/odl-mdsal-dom/pom.xml index 2882ac43b7..bdf56b0aed 100644 --- a/common/features/odl-mdsal-dom/pom.xml +++ b/common/features/odl-mdsal-dom/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-eos-binding/pom.xml b/common/features/odl-mdsal-eos-binding/pom.xml index d204a90bd9..edc4b0ed24 100644 --- a/common/features/odl-mdsal-eos-binding/pom.xml +++ b/common/features/odl-mdsal-eos-binding/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-eos-common/pom.xml b/common/features/odl-mdsal-eos-common/pom.xml index 0cb73f4b3c..74c831b448 100644 --- a/common/features/odl-mdsal-eos-common/pom.xml +++ b/common/features/odl-mdsal-eos-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 @@ -30,7 +30,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -53,7 +53,7 @@ org.opendaylight.yangtools - odl-yangtools-yang-data + odl-yangtools-data-api xml features diff --git a/common/features/odl-mdsal-eos-dom/pom.xml b/common/features/odl-mdsal-eos-dom/pom.xml index 7f8a7a1cfd..56ab56a847 100644 --- a/common/features/odl-mdsal-eos-dom/pom.xml +++ b/common/features/odl-mdsal-eos-dom/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-singleton-common/pom.xml b/common/features/odl-mdsal-singleton-common/pom.xml index 11ff7ca2ec..54845ec5c5 100644 --- a/common/features/odl-mdsal-singleton-common/pom.xml +++ b/common/features/odl-mdsal-singleton-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/odl-mdsal-singleton-dom/pom.xml b/common/features/odl-mdsal-singleton-dom/pom.xml index c54fdb30dd..9d338609e9 100644 --- a/common/features/odl-mdsal-singleton-dom/pom.xml +++ b/common/features/odl-mdsal-singleton-dom/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/common/features/pom.xml b/common/features/pom.xml index 3079b64143..fb6a9f689d 100644 --- a/common/features/pom.xml +++ b/common/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml index 394d07e5e8..191259cae6 100644 --- a/common/mdsal-common-api/pom.xml +++ b/common/mdsal-common-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/common/parent/pom.xml b/common/parent/pom.xml index 99df509981..ea7df44b45 100644 --- a/common/parent/pom.xml +++ b/common/parent/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.2 @@ -24,7 +24,7 @@ pom - 1.2.0 + 2.0.0 ${project.build.directory}/generated-sources/sal @@ -36,7 +36,7 @@ org.opendaylight.odlparent odlparent-artifacts - 2.0.5 + 3.0.2 pom import @@ -50,7 +50,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -105,7 +105,7 @@ org.opendaylight.yangtools yang-maven-plugin - 1.2.0 + 2.0.0 diff --git a/common/pom.xml b/common/pom.xml index 1b875fe68f..4c30510d09 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml index 3224877365..717b00536e 100644 --- a/dom/mdsal-dom-api/pom.xml +++ b/dom/mdsal-dom-api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml index 826535c4d7..9a3eea5e3b 100644 --- a/dom/mdsal-dom-broker/pom.xml +++ b/dom/mdsal-dom-broker/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml index 6c42331a1b..e5be96177e 100644 --- a/dom/mdsal-dom-inmemory-datastore/pom.xml +++ b/dom/mdsal-dom-inmemory-datastore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/dom/mdsal-dom-schema-service-osgi/pom.xml b/dom/mdsal-dom-schema-service-osgi/pom.xml index fc2babb303..825e71e6ff 100644 --- a/dom/mdsal-dom-schema-service-osgi/pom.xml +++ b/dom/mdsal-dom-schema-service-osgi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml index cab5cd7622..67e80e46cf 100644 --- a/dom/mdsal-dom-spi/pom.xml +++ b/dom/mdsal-dom-spi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/dom/pom.xml b/dom/pom.xml index 699d60bfe6..9ac95f974c 100644 --- a/dom/pom.xml +++ b/dom/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml index fe1ea46df7..b314470fc7 100644 --- a/entityownership/mdsal-eos-binding-adapter/pom.xml +++ b/entityownership/mdsal-eos-binding-adapter/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml index d151cb01b5..b611800e8b 100644 --- a/entityownership/mdsal-eos-binding-api/pom.xml +++ b/entityownership/mdsal-eos-binding-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -32,7 +32,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/entityownership/mdsal-eos-common-api/pom.xml b/entityownership/mdsal-eos-common-api/pom.xml index 742c2c0894..9a3b1767e1 100644 --- a/entityownership/mdsal-eos-common-api/pom.xml +++ b/entityownership/mdsal-eos-common-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -32,7 +32,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/entityownership/mdsal-eos-common-spi/pom.xml b/entityownership/mdsal-eos-common-spi/pom.xml index 6b12109b55..d677dc7fee 100644 --- a/entityownership/mdsal-eos-common-spi/pom.xml +++ b/entityownership/mdsal-eos-common-spi/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -32,7 +32,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/entityownership/mdsal-eos-dom-api/pom.xml b/entityownership/mdsal-eos-dom-api/pom.xml index a5f164b017..67b9079113 100644 --- a/entityownership/mdsal-eos-dom-api/pom.xml +++ b/entityownership/mdsal-eos-dom-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -32,7 +32,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml index 731b2a2b30..9df65b2243 100644 --- a/entityownership/mdsal-eos-dom-simple/pom.xml +++ b/entityownership/mdsal-eos-dom-simple/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -32,7 +32,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/entityownership/pom.xml b/entityownership/pom.xml index 4103845a6d..78f45accb1 100644 --- a/entityownership/pom.xml +++ b/entityownership/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/model-binding2/pom.xml b/model-binding2/pom.xml index 2d2e2d67d3..3d880e90e2 100644 --- a/model-binding2/pom.xml +++ b/model-binding2/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/model/artifacts/pom.xml b/model/artifacts/pom.xml index 995dee19cb..2451421b99 100644 --- a/model/artifacts/pom.xml +++ b/model/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 @@ -137,7 +137,7 @@ org.opendaylight.mdsal.model ietf-type-util - 2.0.0-SNAPSHOT + 2.0.0 org.opendaylight.mdsal.model diff --git a/model/features/features-mdsal-model/pom.xml b/model/features/features-mdsal-model/pom.xml index a78ba3854a..649a55a53a 100644 --- a/model/features/features-mdsal-model/pom.xml +++ b/model/features/features-mdsal-model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.2 diff --git a/model/features/odl-mdsal-models/pom.xml b/model/features/odl-mdsal-models/pom.xml index f18a182f75..4e4d54faf4 100644 --- a/model/features/odl-mdsal-models/pom.xml +++ b/model/features/odl-mdsal-models/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.2 diff --git a/model/features/pom.xml b/model/features/pom.xml index e4af24247b..13c65e73b1 100644 --- a/model/features/pom.xml +++ b/model/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/model/iana/pom.xml b/model/iana/pom.xml index f62a51d487..d09803410a 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/model/ietf/ietf-type-util/pom.xml b/model/ietf/ietf-type-util/pom.xml index ea082fafaf..76a9881a2d 100644 --- a/model/ietf/ietf-type-util/pom.xml +++ b/model/ietf/ietf-type-util/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.mdsal.model ietf-type-util - 2.0.0-SNAPSHOT + 2.0.0 bundle diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index 8d5ee78857..99ba55f9b4 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/model/pom.xml b/model/pom.xml index 4c55782106..e8c2e949fd 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 diff --git a/pom.xml b/pom.xml index 76d1393ba9..d3d0aca1de 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 @@ -52,7 +52,7 @@ org.opendaylight.yangtools checkstyle-logging - 1.2.0 + 2.0.0 diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-common-api/pom.xml index 529c603c9d..f82d47fe5b 100644 --- a/singleton-service/mdsal-singleton-common-api/pom.xml +++ b/singleton-service/mdsal-singleton-common-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-dom-impl/pom.xml index 395ac3feeb..23f43dcd21 100644 --- a/singleton-service/mdsal-singleton-dom-impl/pom.xml +++ b/singleton-service/mdsal-singleton-dom-impl/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.2 @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml index 0929c213bb..42917b8edf 100644 --- a/singleton-service/pom.xml +++ b/singleton-service/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.2 -- 2.36.6