Release of OSGIfied YANG Tools dependencies

Change-Id: I2d4ae6ed3920d70d982f0b30a10eda80d4d62ec5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/pom.xml b/pom.xml
index cee2ea516f543b0f9dfdafa14f99a7700a6aa870..781cd3e7006ff19fb87814dc00c5a85447eee5b8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
         <module>concepts</module>\r
         <module>yang</module>\r
         <module>code-generator</module>\r
-        <!--module>restconf</module -->\r
         <module>model</module>\r
+        <module>third-party</module>\r
     </modules>\r
 \r
     <pluginRepositories>\r

diff --git a/third-party/antlr4-runtime-osgi/pom.xml b/third-party/antlr4-runtime-osgi/pom.xml
new file mode 100644 (file)
index 0000000..ecd81cf
--- /dev/null
+++ b/third-party/antlr4-runtime-osgi/pom.xml
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+        <artifactId>third-party-parent</artifactId>
+        <version>0.1.2</version>
+    </parent>
+    <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+    <version>4.0</version>
+    <packaging>bundle</packaging>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>Antlr4 Runtime Library</Bundle-Name>
+                        <Bundle-SymbolicName>org.antlr.antlr4</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.antlr.v4.runtime,
+                            org.antlr.v4.runtime.atn,
+                            org.antlr.v4.runtime.dfa,
+                            org.antlr.v4.runtime.misc,
+                            org.antlr.v4.runtime.tree
+                        </Export-Package>
+                        <Import-Package></Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.0</version>
+            <exclusions>
+              <exclusion>
+                <!--  UI Related Dependency -->
+                <artifactId>org.abego.treelayout.core</artifactId>
+                <groupId>org.abego.treelayout</groupId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/third-party/pom.xml b/third-party/pom.xml
index d82f8b436bde5deb15b64d37652b30ccf34d6f5a..bc22f0a61e2c4dcae9b82a42659738247c4f8797 100644 (file)
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -1,14 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.5-SNAPSHOT</version>
-    </parent>
+
+    <version>0.1.2</version>
     <groupId>org.opendaylight.yangtools.thirdparty</groupId>
     <artifactId>third-party-parent</artifactId>
     <packaging>pom</packaging>
+
+   <properties>
+   <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+   </properties>
+
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
@@ -17,14 +19,70 @@
 
     <modules>
         <module>xtend-lib-osgi</module>
+        <module>antlr4-runtime-osgi</module>
     </modules>
 
+
+    <repositories>
+        <!-- Maven repo2 mirror -->
+        <!-- http://repo2.maven.org/maven2 -->
+        <repository>
+            <id>central2</id>
+            <name>central2</name>
+            <url>${nexusproxy}/repositories/central2/</url>
+        </repository>
+        <!-- Maven repo1 mirror -->
+        <!-- http://repo1.maven.org/maven2 -->
+        <repository>
+                        <id>central</id>
+            <name>central</name>
+            <url>${nexusproxy}/repositories/central/</url>
+        </repository>
+        <!-- OpenDayLight Released artifact -->
+        <repository>
+            <id>opendaylight-release</id>
+            <name>opendaylight-release</name>
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        </repository>
+        <!-- OpenDayLight Snapshot artifact -->
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        </repository>
+    </repositories>
+
+
+    <distributionManagement>
+        <!-- OpenDayLight Released artifact -->
+        <repository>
+            <id>opendaylight-release</id>
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        </repository>
+        <!-- OpenDayLight Snapshot artifact -->
+        <snapshotRepository>
+            <id>opendaylight-snapshot</id>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        </snapshotRepository>
+        <site>
+            <id>${project.artifactId}-site</id>
+            <url>./</url>
+        </site>
+    </distributionManagement>
+
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*</Export-Package>
+                        <Embed-Dependency>*;inline=true;scope=compile|runtime;inline=true</Embed-Dependency>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/third-party/xtend-lib-osgi/pom.xml b/third-party/xtend-lib-osgi/pom.xml
index a237b6e6442b50acb74d8fbeddc41a1daa2f4f9c..61c550df8b7e3ebab143a07b66b0491889c0f7e9 100644 (file)
--- a/third-party/xtend-lib-osgi/pom.xml
+++ b/third-party/xtend-lib-osgi/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.opendaylight.yangtools.thirdparty</groupId>
         <artifactId>third-party-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.1.2</version>
     </parent>
     <artifactId>xtend-lib-osgi</artifactId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.3</version>
     <packaging>bundle</packaging>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
@@ -23,45 +23,16 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                       <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.eclipse.xtend2.lib,
-                            org.eclipse.xtend.lib,
-                            org.eclipse.xtext.xbase.*
-                        </Export-Package>
+                       <Bundle-Name>Xtend Runtime Library</Bundle-Name>
+                        <Bundle-SymbolicName>org.eclipse.xtend.lib</Bundle-SymbolicName>
+                        <Import-Package>
+                        com.google.common.base;version="[10.0.1,16)",
+                        com.google.common.collect;version="[10.0.1,16)",
+                        com.google.common.primitives;version="[10.0.1,16)"
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-                <version>2.4.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/src/main/xtend-gen</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${basedir}/src/main/xtend-gen</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -69,7 +40,18 @@
         <dependency>
             <groupId>org.eclipse.xtend</groupId>
             <artifactId>org.eclipse.xtend.lib</artifactId>
-            <version>2.4.2</version>
+            <version>2.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+            <version>2.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>[10.0.1,15.0)</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index 1cb25d190d291bf86bcba19a017841c044f69d3a..cd1d6979cb0df9b3b1b9b0f3715d007262fd78d1 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -30,7 +30,7 @@
         </dependency>\r
         <dependency>\r
             <groupId>org.antlr</groupId>\r
-            <artifactId>antlr4</artifactId>\r
+            <artifactId>antlr4-runtime</artifactId>\r
             <version>4.0</version>\r
         </dependency>\r
         <dependency>\r