From 011958faf78630a2c22de77a4808c6ac3c79b267 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Feb 2018 19:25:32 +0100 Subject: [PATCH] Bump yangtools to 2.0.2 This updates the artifacts to latest release and fixes JMX generator tests to match whitespace description changes -- see I5796275a80bc1989061fd745270d51a4a37f97bd. Change-Id: I5796275a80bc1989061fd745270d51a4a37f97bd Signed-off-by: Robert Varga --- features/config/odl-config-util/pom.xml | 2 +- features/mdsal/odl-controller-model-topology/pom.xml | 2 +- features/mdsal/odl-mdsal-broker-local/pom.xml | 2 +- .../features/features-__artifactId__/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 2 +- opendaylight/config/config-parent/pom.xml | 2 +- .../config/yangjmxgenerator/ServiceInterfaceEntryTest.java | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/sal-binding-dom-it/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/features/config/odl-config-util/pom.xml b/features/config/odl-config-util/pom.xml index b46c79ca76..755efc01b8 100644 --- a/features/config/odl-config-util/pom.xml +++ b/features/config/odl-config-util/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.2 pom import diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml index c0e30a8a02..dc6cec46c6 100644 --- a/features/mdsal/odl-controller-model-topology/pom.xml +++ b/features/mdsal/odl-controller-model-topology/pom.xml @@ -50,7 +50,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.2 pom import diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 5c07106e9b..9ae27a7770 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -43,7 +43,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.2 pom import diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml index ba024f933b..e908bd3d2d 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml @@ -32,7 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.13.0-SNAPSHOT 1.8.0-SNAPSHOT 1.8.0-SNAPSHOT - 2.0.1 + 2.0.2 etc/opendaylight/karaf diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 40603e2a2a..2724e0d27b 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -41,7 +41,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.2 pom import diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml index 1b3bb5f9bf..a0af417671 100644 --- a/opendaylight/config/config-parent/pom.xml +++ b/opendaylight/config/config-parent/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.9.0-SNAPSHOT 1.8.0-SNAPSHOT - 2.0.1 + 2.0.2 ${project.build.directory}/generated-sources/config-binding src/main/config/default-config.xml diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java index ae81ce5d3a..04bd7e79c8 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java @@ -114,7 +114,7 @@ public class ServiceInterfaceEntryTest extends AbstractYangTest { is(PackageTranslatorTest.EXPECTED_PACKAGE_PREFIX + ".threadpool.ThreadPool")); - String expectedDescription = "An extension of the simple pool of threads able to schedule " + String expectedDescription = "An extension of the simple pool of threads able to schedule\n" + "work to be executed at some point in time."; assertThat(trimInnerSpacesOrNull(scheduled.getNullableDescription()), is(expectedDescription)); diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index f5fe102a3d..ef17a375b8 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -59,7 +59,7 @@ org.opendaylight.yangtools yang-maven-plugin - 2.0.1 + 2.0.2 org.opendaylight.controller diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 4ff410d861..d606a4986f 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.2 pom import -- 2.36.6