Bump versions by x.y.(z+1)

[mdsal.git] / common / features / features-mdsal / pom.xml

diff --git a/common/features/features-mdsal/pom.xml b/common/features/features-mdsal/pom.xml
index 11dd745603ed01507225a515afece2f78dde38aa..c80ecf7a7a20ad468b8d2e05781b5d0fea60b7db 100644 (file)
--- a/common/features/features-mdsal/pom.xml
+++ b/common/features/features-mdsal/pom.xml
@@ -11,41 +11,21 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>3.1.7</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>features-mdsal</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <properties>
-        <odlparent.version>1.9.0-SNAPSHOT</odlparent.version>
-        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    </properties>
+    <version>2.5.4-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odlparent-artifacts</artifactId>
-                <version>${odlparent.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <!-- mdsal-parent has third-party dependency definitions -->
-                <artifactId>mdsal-parent</artifactId>
+                <artifactId>mdsal-artifacts</artifactId>
                 <version>${project.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
@@ -54,125 +34,130 @@
     </dependencyManagement>
 
     <dependencies>
-
+        <!-- Binding -->
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-odlparent</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-mdsal-binding</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-mdsal-binding-api</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-common-api</artifactId>
+            <artifactId>odl-mdsal-binding-base</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-dom-api</artifactId>
+            <artifactId>odl-mdsal-binding-dom-adapter</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-dom-spi</artifactId>
+            <artifactId>odl-mdsal-binding-runtime</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
+
+        <!-- Binding 2 -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-dom-broker</artifactId>
+            <artifactId>odl-mdsal-binding2</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
+            <artifactId>odl-mdsal-binding2-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-eos-common-api</artifactId>
+            <artifactId>odl-mdsal-binding2-base</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-eos-common-spi</artifactId>
+            <artifactId>odl-mdsal-binding2-dom-adapter</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-eos-dom-api</artifactId>
+            <artifactId>odl-mdsal-binding2-runtime</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
+
+        <!-- Common -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-eos-binding-api</artifactId>
+            <artifactId>odl-mdsal-common</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
+
+        <!-- DOM -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-eos-binding-adapter</artifactId>
+            <artifactId>odl-mdsal-dom</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
+            <artifactId>odl-mdsal-dom-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-singleton-dom-impl</artifactId>
+            <artifactId>odl-mdsal-dom-broker</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
 
-        <!-- Binding MD-SAL & Java Binding -->
+        <!-- EOS -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-binding-generator-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-binding-generator-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-binding-generator-impl</artifactId>
+            <artifactId>odl-mdsal-eos-common</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>yang-binding</artifactId>
+            <artifactId>odl-mdsal-eos-dom</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-binding-dom-codec</artifactId>
+            <artifactId>odl-mdsal-eos-binding</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
 
+        <!-- Sinleton -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-binding-api</artifactId>
+            <artifactId>odl-mdsal-singleton-common</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}.model</groupId>
-            <artifactId>yang-ext</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}.model</groupId>
-            <artifactId>general-entity</artifactId>
+            <artifactId>odl-mdsal-singleton-dom</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
     </dependencies>
-
-  <!--
-      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>