From cbb38018c085a7881913234806166606d3fb2c35 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 4 Apr 2016 23:09:34 +0200 Subject: [PATCH 1/1] Bump xtend/xtext to 2.9.2 The xtend folk made the leap to guava 14-18 in their latest release, update to it. Change-Id: I6c75038d0392bca179e3e28ac6a1709d7000ea76 Signed-off-by: Robert Varga --- binding/mdsal-binding-generator-impl/pom.xml | 10 -- common/features/pom.xml | 133 +++++++++--------- .../features/src/main/features/features.xml | 1 + common/parent/pom.xml | 15 +- 4 files changed, 75 insertions(+), 84 deletions(-) diff --git a/binding/mdsal-binding-generator-impl/pom.xml b/binding/mdsal-binding-generator-impl/pom.xml index cc0e5afa52..714fdd2b07 100644 --- a/binding/mdsal-binding-generator-impl/pom.xml +++ b/binding/mdsal-binding-generator-impl/pom.xml @@ -68,7 +68,6 @@ org.eclipse.xtext org.eclipse.xtext.xbase.lib - provided @@ -85,15 +84,6 @@ {local-packages}, org.opendaylight.yangtools.sal.binding.generator.impl, - true - - org.eclipse.xtext.xbase.lib;inline=org/eclipse/xtend2/lib/*.class| - org/eclipse/xtext/xbase/lib/IterableExtensions*.class| - org/eclipse/xtext/xbase/lib/Functions*.class| - org/eclipse/xtext/xbase/lib/StringExtensions*.class| - org/eclipse/xtext/xbase/lib/internal/FunctionDelegate.class| - org/eclipse/xtext/xbase/lib/internal/BooleanFunctionDelegate.class, - diff --git a/common/features/pom.xml b/common/features/pom.xml index febcc89232..6ab330a582 100644 --- a/common/features/pom.xml +++ b/common/features/pom.xml @@ -43,7 +43,8 @@ org.opendaylight.mdsal - mdsal-artifacts + + mdsal-parent ${project.version} import pom @@ -67,70 +68,76 @@ xml + - ${project.groupId} - mdsal-common-api - - - - ${project.groupId} - mdsal-dom-api - - - ${project.groupId} - mdsal-dom-spi - - - ${project.groupId} - mdsal-dom-broker - - - ${project.groupId} - mdsal-dom-inmemory-datastore - - - - - ${project.groupId} - mdsal-binding-generator-api - - - ${project.groupId} - mdsal-binding-generator-util - - - ${project.groupId} - mdsal-binding-generator-impl - - - ${project.groupId} - yang-binding - - - ${project.groupId} - mdsal-binding-dom-codec - + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + - - ${project.groupId} - mdsal-binding-api - - - ${project.groupId} - mdsal-binding-dom-adapter - - - ${project.groupId} - mdsal-binding-util - - - ${project.groupId}.model - yang-ext - - - ${project.groupId}.model - general-entity - + + ${project.groupId} + mdsal-common-api + + + + ${project.groupId} + mdsal-dom-api + + + ${project.groupId} + mdsal-dom-spi + + + ${project.groupId} + mdsal-dom-broker + + + ${project.groupId} + mdsal-dom-inmemory-datastore + + + + + ${project.groupId} + mdsal-binding-generator-api + + + ${project.groupId} + mdsal-binding-generator-util + + + ${project.groupId} + mdsal-binding-generator-impl + + + ${project.groupId} + yang-binding + + + ${project.groupId} + mdsal-binding-dom-codec + + + + ${project.groupId} + mdsal-binding-api + + + ${project.groupId} + mdsal-binding-dom-adapter + + + ${project.groupId} + mdsal-binding-util + + + ${project.groupId}.model + yang-ext + + + ${project.groupId}.model + general-entity +