Pull in com.typesafe:config from odlparent

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

diff --git a/opendaylight/netconf/abstract-topology/pom.xml b/opendaylight/netconf/abstract-topology/pom.xml
index 703ee4e9bfa5fb349db5a27050151563bd2f8cc9..b600b6a98aab7e2af52ccc05c46db9330e42872f 100644 (file)
--- a/opendaylight/netconf/abstract-topology/pom.xml
+++ b/opendaylight/netconf/abstract-topology/pom.xml
@@ -61,7 +61,6 @@
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
-            <version>${typesafe.config.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -69,11 +68,6 @@
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.typesafe</groupId>
-            <artifactId>config</artifactId>
-            <version>1.2.1</version>
-        </dependency>
         <dependency>
             <groupId>com.jayway.awaitility</groupId>
             <artifactId>awaitility</artifactId>

diff --git a/opendaylight/netconf/netconf-topology/pom.xml b/opendaylight/netconf/netconf-topology/pom.xml
index 94b0d40e19325ee7a07c22ee54c91e9da211310c..fb9c4257f5010dc0f3e4963a5333948a686f87e3 100644 (file)
--- a/opendaylight/netconf/netconf-topology/pom.xml
+++ b/opendaylight/netconf/netconf-topology/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
-            <version>${typesafe.config.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/pom.xml b/pom.xml
index 55532876972bee49c50efbb84d22b2113d142f00..3ee16d98b480fe96ec663798b679f7eccc38e41b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,6 @@
         <scala.major.version>2.10</scala.major.version>
         <scala.minor.version>4</scala.minor.version>
         <surefire.version>2.15</surefire.version>
-        <typesafe.config.version>1.2.1</typesafe.config.version>
         <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
 
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>