BUG-7446: inline xbase-lib

xbase-lib requires Guava [14.0,19), leaving us with two options:
- ship two guava versions
- eliminate YangTemplate.xtend
- inline xtext-lib binding it to Guava 21

Take the last approach, choosing not to bloat the distribution.

Change-Id: Ibd2a91ed9bf52c1d3a942282ee53b951f5d42e6b
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/binding/mdsal-binding-generator-impl/pom.xml b/binding/mdsal-binding-generator-impl/pom.xml
index 18025f7da82aa987c12f9887885bf7ac9b3d98ba..5f1767b4978797bded099e977913e8238ffaf981 100644 (file)
--- a/binding/mdsal-binding-generator-impl/pom.xml
+++ b/binding/mdsal-binding-generator-impl/pom.xml
@@ -81,6 +81,7 @@
         <dependency>
             <groupId>org.eclipse.xtext</groupId>
             <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -101,6 +102,8 @@
                             {local-packages},
                             org.opendaylight.yangtools.sal.binding.generator.impl,
                         </Export-Package>
+                        <Embed-Transitive>true</Embed-Transitive>
+                        <Embed-Dependency>org.eclipse.xtext.xbase.lib;inline</Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/common/features/features-mdsal/pom.xml b/common/features/features-mdsal/pom.xml
index a8c8c0c378835c936d10529bb3d2390c72a7948f..03d0da097205ef1a71f3a8845e531d523c2ef012 100644 (file)
--- a/common/features/features-mdsal/pom.xml
+++ b/common/features/features-mdsal/pom.xml
@@ -69,12 +69,6 @@
             <type>xml</type>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.eclipse.xtext</groupId>
-            <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mdsal-common-api</artifactId>

diff --git a/common/features/features-mdsal/src/main/features/features.xml b/common/features/features-mdsal/src/main/features/features.xml
index 50b29417b5053cecf5d1c9b36bf936b0d7597560..43311d60711d966dc30291ead39a8b3ee20ef84a 100644 (file)
--- a/common/features/features-mdsal/src/main/features/features.xml
+++ b/common/features/features-mdsal/src/main/features/features.xml
@@ -54,7 +54,6 @@
         <feature version='${project.version}' dependency="true">odl-mdsal-binding-base</feature>
         <bundle dependency="true">mvn:org.javassist/javassist/{{VERSION}}</bundle>
         <bundle dependency="true">mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-generator-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-generator-impl/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-generator-util/{{VERSION}}</bundle>