Fix maven-bundle-plugin not scanning transitive dependencies

New version of the plugin seems disregard the Embed-Transitive
directive, leading to a failure to inline needed packages. Fix this up
by explicitly specifying them as dependencies.

Change-Id: Id8275584b57a14444b632b64c33e8afa9a01e16b
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 4a441ded46c47fc789ef66df538ca14bd575bec5..d37501f99acb902aa1fcf118af0139ab7f38311e 100644 (file)
--- a/binding/mdsal-binding-generator-impl/pom.xml
+++ b/binding/mdsal-binding-generator-impl/pom.xml
@@ -69,6 +69,14 @@
             <groupId>org.eclipse.xtend</groupId>
             <artifactId>org.eclipse.xtend.lib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtend</groupId>
+            <artifactId>org.eclipse.xtend.lib.macro</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -84,12 +92,12 @@
                             {local-packages},
                             org.opendaylight.yangtools.sal.binding.generator.impl,
                         </Export-Package>
+                        <Embed-Transitive>true</Embed-Transitive>
                         <Embed-Dependency>
                             org.eclipse.xtend.lib;inline=true,
                             org.eclipse.xtend.lib.macro;inline=true,
                             org.eclipse.xtext.xbase.lib;inline=true,
                         </Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 27fa0bca3d73769716bea37723847a35a0e84138..a463430de0304ad2c12700ebf10bc69e6739d450 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -103,6 +103,16 @@
                 <artifactId>org.eclipse.xtend.lib</artifactId>
                 <version>2.8.4</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>org.eclipse.xtend.lib.macro</artifactId>
+                <version>2.8.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.xtext</groupId>
+                <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+                <version>2.8.4</version>
+            </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>