From: Stephen Kitt <skitt@redhat.com>
Date: Tue, 14 Mar 2017 12:21:24 +0000 (+0100)
Subject: Use specific versions for odlparent imports
X-Git-Tag: release/carbon~37
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9d95c407433b99d99a8b7bd3d7c8062254d0264d;p=yangtools.git

Use specific versions for odlparent imports

Felix (or something related) doesn't look for snapshots in version
ranges, which breaks integration/distribution, so we can't use version
ranges for feature dependencies (even though they don't currently end
up in the generated features) until we switch to release artifacts.

See
https://jenkins.opendaylight.org/releng/job/netconf-distribution-check-carbon/1468/
for an example of a broken build.

Change-Id: I1c50ba1d05ef1eb8fd06820f5e84c02e3ae43fad
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index c04c845341..f159f5412e 100644
--- a/features/odl-yangtools-common/pom.xml
+++ b/features/odl-yangtools-common/pom.xml
@@ -27,6 +27,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odlparent-artifacts</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
@@ -41,14 +48,12 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl4-guava-18</artifactId>
-            <version>[1.7.0,2.0.0)</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl4-triemap-0.2</artifactId>
-            <version>[1.7.0,2.0.0)</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>