Bumping versions by x.y.(z+1) for next dev cycle

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

diff --git a/common/features/pom.xml b/common/features/pom.xml
index fcd322e89821a31750e0aaec28c8afdaeb1842d6..e7c0edc6390082069811e3e02dfb4b244e91e3b1 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -12,21 +12,28 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.4-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>features-mdsal</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
-        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.4-SNAPSHOT</yangtools.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odlparent-artifacts</artifactId>
+                <version>1.7.4-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
@@ -36,7 +43,8 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <!-- mdsal-parent has third-party dependency definitions -->
+                <artifactId>mdsal-parent</artifactId>
                 <version>${project.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
@@ -46,6 +54,13 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features-odlparent</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>features-yangtools</artifactId>
@@ -53,77 +68,116 @@
             <type>xml</type>
         </dependency>
 
+
         <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-common-api</artifactId>
-          </dependency>
-
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-api</artifactId>
-          </dependency>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-spi</artifactId>
-          </dependency>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-broker</artifactId>
-          </dependency>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-          </dependency>
-
-            <!-- Binding MD-SAL & Java Binding -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>maven-sal-api-gen-plugin</artifactId>
-            </dependency>
-             <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>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-java-api-generator</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>yang-binding</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-dom-codec</artifactId>
-            </dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+        </dependency>
 
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-api</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-dom-adapter</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-binding-util</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.model</groupId>
-                <artifactId>yang-ext</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.model</groupId>
-                <artifactId>general-entity</artifactId>
-            </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-common-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-eos-common-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-eos-common-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-eos-dom-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-eos-binding-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-eos-binding-adapter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-singleton-dom-impl</artifactId>
+        </dependency>
+
+        <!-- Binding MD-SAL & Java Binding -->
+        <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>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-binding</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mdsal-binding-api</artifactId>
+        </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>
+        </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>