From 655637498f0dad66469214922209a1c3e7a54512 Mon Sep 17 00:00:00 2001
From: Martin Ciglan <martin.ciglan@pantheon.tech>
Date: Mon, 19 Jun 2017 12:24:56 +0200
Subject: [PATCH] MDSAL Binding2 Features - Carbon only

Change-Id: Ib2c3b85fe14eaa675d294f01ad6b2ae85655afeb
Signed-off-by: Martin Ciglan <martin.ciglan@pantheon.tech>
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
---
 binding2/mdsal-binding2-dom-codec/pom.xml     |  5 +--
 common/artifacts/pom.xml                      |  5 +++
 common/features/features-mdsal/pom.xml        | 20 +++++++++
 .../src/main/features/features.xml            | 21 ++++++---
 model-binding2/pom.xml                        |  4 ++
 model-binding2/yang-ext/pom.xml               | 45 +++++++++++++++++++
 6 files changed, 89 insertions(+), 11 deletions(-)
 create mode 100644 model-binding2/yang-ext/pom.xml

diff --git a/binding2/mdsal-binding2-dom-codec/pom.xml b/binding2/mdsal-binding2-dom-codec/pom.xml
index dc762ad1c0..677320baa8 100644
--- a/binding2/mdsal-binding2-dom-codec/pom.xml
+++ b/binding2/mdsal-binding2-dom-codec/pom.xml
@@ -105,10 +105,7 @@
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.opendaylight.mdsal.binding2.dom.codec.*,
-                            org.opendaylight.yangtools.binding.data.codec.*,
-                            org.opendaylight.yangtools.binding.data.codec.gen.impl.*,
-                            org.opendaylight.yangtools.binding.data.codec.impl.*,
+                            org.opendaylight.mdsal.binding2.dom.codec.*
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml
index d092ca72d6..e4a4e07129 100644
--- a/common/artifacts/pom.xml
+++ b/common/artifacts/pom.xml
@@ -216,6 +216,11 @@
                 <artifactId>mdsal-binding2-util</artifactId>
                 <version>0.10.1-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model.binding2</groupId>
+                <artifactId>yang-ext</artifactId>
+                <version>2013.09.07.10.1-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-common-api</artifactId>
diff --git a/common/features/features-mdsal/pom.xml b/common/features/features-mdsal/pom.xml
index 0bf027e35d..617dda66c3 100644
--- a/common/features/features-mdsal/pom.xml
+++ b/common/features/features-mdsal/pom.xml
@@ -166,6 +166,10 @@
         </dependency>
 
         <!-- Binding specification version 2-->
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-runtime</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding2-generator-api</artifactId>
@@ -186,6 +190,22 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding2-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-dom-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-dom-adapter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model.binding2</groupId>
+            <artifactId>yang-ext</artifactId>
+        </dependency>
     </dependencies>
 
   <!--
diff --git a/common/features/features-mdsal/src/main/features/features.xml b/common/features/features-mdsal/src/main/features/features.xml
index d41e7fd1e5..007259aeea 100644
--- a/common/features/features-mdsal/src/main/features/features.xml
+++ b/common/features/features-mdsal/src/main/features/features.xml
@@ -20,9 +20,7 @@
     </feature>
 
     <feature name='odl-mdsal-binding2' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding 2'>
-        <feature version='${project.version}' dependency="true">odl-mdsal-binding2-runtime</feature>
-        <feature version='${project.version}' dependency="true">odl-mdsal-binding2-api</feature>
-        <feature version='${project.version}' dependency="true">odl-mdsal-dom-api</feature>
+        <feature version='${project.version}'>odl-mdsal-binding2-dom-adapter</feature>
         <feature version='${project.version}'>odl-mdsal-dom</feature>
     </feature>
 
@@ -58,10 +56,10 @@
 
     <feature name='odl-mdsal-binding2-base' version='${project.version}'
              description='OpenDaylight :: MD-SAL :: Binding2 Base Concepts'>
-        <feature version="${yangtools.version}" dependency="true">odl-yangtools-yang-parser</feature>
         <feature version='${yangtools.version}' dependency="true">odl-yangtools-common</feature>
+        <feature version='${yangtools.version}' dependency="true">odl-yangtools-yang-parser</feature>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-spec/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-util/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.mdsal.model.binding2/yang-ext/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-mdsal-binding-runtime' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Generator'>
@@ -78,12 +76,12 @@
     <feature name='odl-mdsal-binding2-runtime' version='${project.version}'
              description='OpenDaylight :: MD-SAL :: Binding2 Generator'>
         <feature version='${yangtools.version}' dependency="true">odl-yangtools-yang-data</feature>
-        <feature version='${project.version}'>odl-mdsal-binding2-base</feature>
+        <feature version='${project.version}'  dependency="true">odl-mdsal-binding2-api</feature>
         <bundle dependency="true">mvn:org.javassist/javassist/{{VERSION}}</bundle>
         <bundle dependency="true">mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-generator-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-generator-util/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-generator-impl/{{VERSION}}</bundle>
+        <bundle dependency="true">mvn:org.opendaylight.mdsal/mdsal-binding2-dom-codec/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-mdsal-binding-api' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Base Concepts'>
@@ -99,6 +97,9 @@
              description='OpenDaylight :: MD-SAL :: Binding2 Base Concepts'>
         <feature version='${project.version}' dependency="true">odl-mdsal-common</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-binding2-base</feature>
+        <feature version='${project.version}' dependency="true">odl-mdsal-dom-api</feature>
+        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-util/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-mdsal-binding-dom-adapter' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Generator'>
@@ -108,6 +109,12 @@
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-dom-adapter/{{VERSION}}</bundle>
     </feature>
 
+    <feature name='odl-mdsal-binding2-dom-adapter' version='${project.version}'
+             description='OpenDaylight :: MD-SAL :: Binding2 Generator'>
+        <feature version='${project.version}' dependency="true">odl-mdsal-binding2-runtime</feature>
+        <bundle dependency="true">mvn:org.opendaylight.mdsal/mdsal-binding2-dom-adapter/{{VERSION}}</bundle>
+    </feature>
+
     <feature name='odl-mdsal-eos-common' version='${project.version}' description='OpenDaylight :: MD-SAL :: EOS :: Common'>
         <feature version='${yangtools.version}' dependency="true">odl-yangtools-common</feature>
         <feature version='${yangtools.version}' dependency="true">odl-yangtools-yang-data</feature>
diff --git a/model-binding2/pom.xml b/model-binding2/pom.xml
index a7dacbd638..d32bddf763 100644
--- a/model-binding2/pom.xml
+++ b/model-binding2/pom.xml
@@ -24,6 +24,10 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
+    <modules>
+        <module>yang-ext</module>
+    </modules>
+
   <!--
       Maven Site Configuration
 
diff --git a/model-binding2/yang-ext/pom.xml b/model-binding2/yang-ext/pom.xml
new file mode 100644
index 0000000000..3bf578042e
--- /dev/null
+++ b/model-binding2/yang-ext/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 Pantheon Technologies s.r.o. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+
+<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">
+
+    <parent>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-model-binding2-parent</artifactId>
+        <version>0.10.1-SNAPSHOT</version>
+        <relativePath>../../binding2/mdsal-model-binding2-parent</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.mdsal.model.binding2</groupId>
+    <artifactId>yang-ext</artifactId>
+    <version>2013.09.07.10.1-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <description>${project.artifactId}</description>
+    <packaging>bundle</packaging>
+
+     <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
+
+</project>
-- 
2.36.6