From 139984d71b839ecdbe8072c9eadc213452fdc68f Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Fri, 6 Jul 2018 09:28:19 +0200
Subject: [PATCH] Enforce Xtend Maven plugin dependencies

This aligns the Eclipse dependencies used by version 2.13 of the Xtend
Maven plugin, to avoid signature issues. See
https://github.com/eclipse/xtext/issues/1231 for details.

Change-Id: I61e2d70e1a0c98f831ec647669a48e210e4e1f8f
JIRA: ODLPARENT-156
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 binding/maven-sal-api-gen-plugin/pom.xml         | 14 +++++++++++++-
 binding/mdsal-binding-java-api-generator/pom.xml | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml
index ef20d7782e..eb7a27de32 100644
--- a/binding/maven-sal-api-gen-plugin/pom.xml
+++ b/binding/maven-sal-api-gen-plugin/pom.xml
@@ -92,10 +92,22 @@
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
                 <dependencies>
+                    <!-- The following dependencies are appropriate for Xtend 2.13
+                         (as used with ODL Parent 3.1.1) -->
+                    <dependency>
+                        <groupId>org.eclipse.jdt</groupId>
+                        <artifactId>org.eclipse.jdt.core</artifactId>
+                        <version>3.12.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.eclipse.platform</groupId>
+                        <artifactId>org.eclipse.core.runtime</artifactId>
+                        <version>3.12.0</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.eclipse.platform</groupId>
                         <artifactId>org.eclipse.equinox.common</artifactId>
-                        <version>3.10.0</version>
+                        <version>3.8.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml
index 40135c0901..9757eacfda 100644
--- a/binding/mdsal-binding-java-api-generator/pom.xml
+++ b/binding/mdsal-binding-java-api-generator/pom.xml
@@ -112,10 +112,22 @@
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
                 <dependencies>
+                    <!-- The following dependencies are appropriate for Xtend 2.13
+                         (as used with ODL Parent 3.1.1) -->
+                    <dependency>
+                        <groupId>org.eclipse.jdt</groupId>
+                        <artifactId>org.eclipse.jdt.core</artifactId>
+                        <version>3.12.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.eclipse.platform</groupId>
+                        <artifactId>org.eclipse.core.runtime</artifactId>
+                        <version>3.12.0</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.eclipse.platform</groupId>
                         <artifactId>org.eclipse.equinox.common</artifactId>
-                        <version>3.10.0</version>
+                        <version>3.8.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
-- 
2.36.6