From 519aab236ae2c67bf4a07e150e0043dd54e0efb3 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 15 Oct 2013 12:41:21 +0200
Subject: [PATCH] Removed xTend from private packages. Added OSGI-fied XTend to
 distribution

 - Removed XTend library from Private packages in XTend projects
 - In runtime (distribution) XTend packages are provided by
   OSGI-fied XTend bundle org.opendaylight.yangtools.thirdpary:xtend-lib-osgi:2.4.3

Change-Id: Ib79e678d740ffbcf4c4e5f6c370271af5ca76019
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 opendaylight/distribution/opendaylight/pom.xml              | 6 +++---
 opendaylight/md-sal/sal-binding-broker/pom.xml              | 3 ---
 opendaylight/md-sal/sal-compability/pom.xml                 | 5 -----
 opendaylight/md-sal/sal-dom-broker/pom.xml                  | 3 ---
 opendaylight/md-sal/samples/toaster-it/pom.xml              | 5 +++++
 .../controller/sample/toaster/it/ToasterTest.java           | 1 +
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index fd0f7e1f3b..a0cb9f03e9 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -279,13 +279,13 @@
 
            <dependency>
           <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-          <artifactId>antlr-runtime-osgi</artifactId>
-          <version>4.0-SNAPSHOT</version>
+          <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+          <version>4.0</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools.thirdparty</groupId>
           <artifactId>xtend-lib-osgi</artifactId>
-          <version>2.4.2-SNAPSHOT</version>
+          <version>2.4.3</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 2c4f9c606d..5d3572f24d 100644
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -28,9 +28,6 @@
                             org.opendaylight.controller.sal.binding.impl,
                             org.opendaylight.controller.sal.binding.impl.*,
                             org.opendaylight.controller.sal.binding.codegen.*,
-                            org.eclipse.xtend2.lib,
-                            org.eclipse.xtend.lib,
-                            org.eclipse.xtext.xbase.*
                         </Private-Package>
                     </instructions>
                 </configuration>
diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml
index 613033ae51..431ecfa0c6 100644
--- a/opendaylight/md-sal/sal-compability/pom.xml
+++ b/opendaylight/md-sal/sal-compability/pom.xml
@@ -74,11 +74,6 @@
           <instructions>
             <Bundle-Name>${project.name}</Bundle-Name>
             <Bundle-Activator>org.opendaylight.controller.sal.compability.ComponentActivator</Bundle-Activator>
-            <Private-Package>
-              org.eclipse.xtend2.lib,
-              org.eclipse.xtend.lib,
-              org.eclipse.xtext.xbase.*
-            </Private-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 224f251532..47b46817bc 100644
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -56,9 +56,6 @@
                         <Bundle-Activator>org.opendaylight.controller.sal.dom.broker.BrokerActivator</Bundle-Activator>
                         <Private-Package>
                             org.opendaylight.controller.sal.dom.broker,
-                            org.eclipse.xtend2.lib,
-                            org.eclipse.xtend.lib,
-                            org.eclipse.xtext.xbase.*
                         </Private-Package>
                     </instructions>
                 </configuration>
diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index 996f257713..1c0fb14e2b 100644
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -75,6 +75,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+            <artifactId>xtend-lib-osgi</artifactId>
+            <version>2.4.3</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>sample-toaster</artifactId>
diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index 4b4cb48b63..f83b600fe9 100644
--- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
@@ -71,6 +71,7 @@ public class ToasterTest {
                 mavenBundle(YANG, "concepts").versionAsInProject(),
                 mavenBundle(YANG, "yang-binding").versionAsInProject(), //
                 mavenBundle(YANG, "yang-common").versionAsInProject(), //
+                mavenBundle(YANG+".thirdparty", "xtend-lib-osgi").versionAsInProject(),
                 mavenBundle("com.google.guava", "guava").versionAsInProject(), //
                 mavenBundle("org.javassist", "javassist").versionAsInProject(),
                 junitBundles()
-- 
2.36.6