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 <rovarga@cisco.com>

diff --git a/binding/mdsal-binding-generator-impl/pom.xml b/binding/mdsal-binding-generator-impl/pom.xml
index cc0e5afa529a84970ea6cd1e9cd6ddb22f2d5aa0..714fdd2b0723de76054273860733191ac6169cdc 100644 (file)
--- a/binding/mdsal-binding-generator-impl/pom.xml
+++ b/binding/mdsal-binding-generator-impl/pom.xml
@@ -68,7 +68,6 @@
         <dependency>
             <groupId>org.eclipse.xtext</groupId>
             <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -85,15 +84,6 @@
                             {local-packages},
                             org.opendaylight.yangtools.sal.binding.generator.impl,
                         </Export-Package>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Embed-Dependency>
-                            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,
-                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/common/features/pom.xml b/common/features/pom.xml
index febcc89232a420fb8f04b0e7e7043305cf353914..6ab330a5820ddaf6019e9fe3052f4ffa9a497667 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -43,7 +43,8 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <!-- mdsal-parent has third-party dependency definitions -->
+                <artifactId>mdsal-parent</artifactId>
                 <version>${project.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
@@ -67,70 +68,76 @@
             <type>xml</type>
         </dependency>
 
+
         <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-common-api</artifactId>
-          </dependency>
-
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-api</artifactId>
-          </dependency>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-spi</artifactId>
-          </dependency>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-broker</artifactId>
-          </dependency>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-          </dependency>
-
-            <!-- Binding MD-SAL & Java Binding -->
-             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-generator-api</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-generator-util</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-generator-impl</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>yang-binding</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-dom-codec</artifactId>
-            </dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+        </dependency>
 
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-api</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-dom-adapter</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-util</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.model</groupId>
-                <artifactId>yang-ext</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.model</groupId>
-                <artifactId>general-entity</artifactId>
-            </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-common-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
+        </dependency>
+
+        <!-- Binding MD-SAL & Java Binding -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-generator-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-generator-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-binding</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}.model</groupId>
+            <artifactId>yang-ext</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}.model</groupId>
+            <artifactId>general-entity</artifactId>
+        </dependency>
     </dependencies>
 
   <!--

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index 670f2a0fe6822bd27753e7558cbad41d1dc9fbe5..a3142e978d70232af1192e8e02ae68f8fcaf4fe0 100644 (file)
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -56,6 +56,7 @@
         <feature version='${yangtools.version}'>odl-yangtools-yang-data</feature>
         <bundle>mvn:org.javassist/javassist/{{VERSION}}</bundle>
         <bundle>mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
+        <bundle>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>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 781f7cc0f1bc604fa55a36b03f220ae172b9ae4e..399074e243486a0007237351de61b07a4779e52f 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -86,17 +86,17 @@
             <dependency>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>org.eclipse.xtend.lib</artifactId>
-                <version>2.8.4</version>
+                <version>2.9.2</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-                <version>2.8.4</version>
+                <version>2.9.2</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.xtext</groupId>
                 <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-                <version>2.8.4</version>
+                <version>2.9.2</version>
             </dependency>
 
             <dependency>
@@ -354,7 +354,7 @@
                 <plugin>
                     <groupId>org.eclipse.xtend</groupId>
                     <artifactId>xtend-maven-plugin</artifactId>
-                    <version>2.8.4</version>
+                    <version>2.9.2</version>
                     <executions>
                         <execution>
                             <goals>
@@ -365,13 +365,6 @@
                             </configuration>
                         </execution>
                     </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>com.google.guava</groupId>
-                            <artifactId>guava</artifactId>
-                            <version>14.0.1</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>