mdsal-binding2 features

Change-Id: I5776ee2300d993b9e8a690499c1e85972cbd3d9d
Signed-off-by: Jakub Toth <jatoth@cisco.com>

diff --git a/binding2/mdsal-binding2-generator-impl/pom.xml b/binding2/mdsal-binding2-generator-impl/pom.xml
index 0aaff9962b5682f53a91189827e384103149e84a..d7bea6a3aee291e40756330d92d550aedf381c66 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/pom.xml
+++ b/binding2/mdsal-binding2-generator-impl/pom.xml
@@ -106,8 +106,10 @@
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            {local-packages},
-                            org.opendaylight.mdsal.binding2.generator.impl,
+                            play.twirl.api,
+                            play.twirl.api.utils,
+                            scala,
+                            scala.*,
                         </Export-Package>
                     </instructions>
                 </configuration>

diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml
index cc2b67e1089d14608d570e20b4469fff0baf4e9d..a9f0afd2aa1f306bd73584d19ec584b8e6a88833 100644 (file)
--- a/common/artifacts/pom.xml
+++ b/common/artifacts/pom.xml
@@ -33,6 +33,16 @@
                 <version>${project.version}</version>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>com.typesafe.play</groupId>
+                <artifactId>twirl-api_2.11</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>2.11.8</version>
+            </dependency>
 
             <!-- Common APIs for Binding and DOM -->
             <dependency>
@@ -145,6 +155,11 @@
             </dependency>
 
             <!-- Binding specification version 2-->
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-binding2-maven-api-gen-plugin</artifactId>
+                <version>0.10.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding2-generator-api</artifactId>

diff --git a/common/features/features-mdsal/pom.xml b/common/features/features-mdsal/pom.xml
index 03d0da097205ef1a71f3a8845e531d523c2ef012..5a083aa5f375cdb2382fd4221143fbf4a586f0c2 100644 (file)
--- a/common/features/features-mdsal/pom.xml
+++ b/common/features/features-mdsal/pom.xml
@@ -50,6 +50,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-model-binding2-parent</artifactId>
+                <version>0.10.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -157,6 +164,28 @@
             <groupId>${project.groupId}.model</groupId>
             <artifactId>general-entity</artifactId>
         </dependency>
+
+        <!-- Binding specification version 2-->
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-generator-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-generator-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-generator-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-util</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 43311d60711d966dc30291ead39a8b3ee20ef84a..d41e7fd1e56cfe91934a5c077719ce4cb438b3ef 100644 (file)
--- a/common/features/features-mdsal/src/main/features/features.xml
+++ b/common/features/features-mdsal/src/main/features/features.xml
@@ -19,6 +19,13 @@
         <feature version='${project.version}'>odl-mdsal-dom</feature>
     </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-dom</feature>
+    </feature>
+
     <feature name='odl-mdsal-dom' version='${project.version}' description='OpenDaylight :: MD-SAL :: DOM'>
         <feature version='${project.version}' dependency="true">odl-mdsal-dom-broker</feature>
     </feature>
@@ -49,6 +56,14 @@
         <bundle>mvn:org.opendaylight.mdsal.model/yang-ext/{{VERSION}}</bundle>
     </feature>
 
+    <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>
+        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-spec/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding2-util/{{VERSION}}</bundle>
+    </feature>
+
     <feature name='odl-mdsal-binding-runtime' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Generator'>
         <feature version='${yangtools.version}' dependency="true">odl-yangtools-yang-data</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-binding-base</feature>
@@ -60,6 +75,17 @@
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-dom-codec/{{VERSION}}</bundle>
     </feature>
 
+    <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>
+        <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>
+    </feature>
+
     <feature name='odl-mdsal-binding-api' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Base Concepts'>
         <feature version='${project.version}' dependency="true">odl-mdsal-common</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-binding-base</feature>
@@ -69,6 +95,12 @@
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-util/{{VERSION}}</bundle>
     </feature>
 
+    <feature name='odl-mdsal-binding2-api' version='${project.version}'
+             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>
+
     <feature name='odl-mdsal-binding-dom-adapter' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Generator'>
         <feature version='${project.version}' dependency="true">odl-mdsal-binding-runtime</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-binding-api</feature>