From 289920d4cf32a7691776c93ae4a147e2d09a41ef Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Mon, 30 Mar 2015 13:19:10 +0200
Subject: [PATCH] Refactor dependency management to import upstream artifacts

Upstream projects are exposing appropriate dependencyManagement section
in $project-artifacts. Import them to simplify dependency declarations.

Change-Id: Iec4af832e22857a0147c08c9deda3830351d44b5
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 applications/pom.xml                          | 161 ++++++++--------
 .../openflowjava-extension-nicira-api/pom.xml |   2 +-
 .../openflowjava-extension-nicira/pom.xml     |   2 +-
 .../openflowplugin-extension-api/pom.xml      |  10 +-
 .../openflowplugin-extension-nicira/pom.xml   |   4 +-
 extension/test-extension/pom.xml              |   2 +-
 features/pom.xml                              |   3 +-
 openflowplugin-api/pom.xml                    |   3 +-
 openflowplugin-impl/pom.xml                   |   2 +-
 openflowplugin/pom.xml                        |   3 +-
 pom.xml                                       | 181 ++++--------------
 11 files changed, 128 insertions(+), 245 deletions(-)

diff --git a/applications/pom.xml b/applications/pom.xml
index eaf955d017..9974c53a34 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -1,80 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.opendaylight.openflowplugin</groupId>
-		<artifactId>openflowplugin-parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>applications</artifactId>
-	<name>applications</name>
-	<url>http://maven.apache.org</url>
-	<packaging>pom</packaging>
+    <artifactId>applications</artifactId>
+    <name>applications</name>
+    <url>http://maven.apache.org</url>
+    <packaging>pom</packaging>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.opendaylight.yangtools</groupId>
-					<artifactId>yang-maven-plugin</artifactId>
-					<version>${yang.binding.version}</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>generate-sources</goal>
-							</goals>
-							<configuration>
-								<codeGenerators>
-									<generator>
-										<codeGeneratorClass>
-											org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-										</codeGeneratorClass>
-										<outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-										<additionalConfiguration>
-											<namespaceToPackage1>
-												urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-											</namespaceToPackage1>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate-sources</goal>
+                            </goals>
+                            <configuration>
+                                <codeGenerators>
+                                    <generator>
+                                        <codeGeneratorClass>
+                                            org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+                                        </codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
+                                        <additionalConfiguration>
+                                            <namespaceToPackage1>
+                                                urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
+                                            </namespaceToPackage1>
                                             <namespaceToPackage2>
                                                 urn:opendaylight:params:xml:ns:yang:openflowplugin:app==org.opendaylight.openflowplugin.applications.config.yang
                                             </namespaceToPackage2>
-										</additionalConfiguration>
-									</generator>
-									<generator>
-										<codeGeneratorClass>
-											org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-										</codeGeneratorClass>
-										<outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
-									</generator>
-								</codeGenerators>
-								<inspectDependencies>true</inspectDependencies>
-							</configuration>
-						</execution>
-					</executions>
-					<dependencies>
-						<dependency>
-							<groupId>org.opendaylight.controller</groupId>
-							<artifactId>yang-jmx-generator-plugin</artifactId>
-							<version>${config.parent.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>org.opendaylight.yangtools</groupId>
-							<artifactId>maven-sal-api-gen-plugin</artifactId>
-							<version>${yang.binding.version}</version>
-							<type>jar</type>
-						</dependency>
-					</dependencies>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+                                        </additionalConfiguration>
+                                    </generator>
+                                    <generator>
+                                        <codeGeneratorClass>
+                                            org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                        </codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
+                                    </generator>
+                                </codeGenerators>
+                                <inspectDependencies>true</inspectDependencies>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.opendaylight.controller</groupId>
+                            <artifactId>yang-jmx-generator-plugin</artifactId>
+                            <version>${config.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.opendaylight.yangtools</groupId>
+                            <artifactId>maven-sal-api-gen-plugin</artifactId>
+                            <version>${yangtools.version}</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
@@ -83,17 +82,17 @@
       <tag>HEAD</tag>
     </scm>
 
-	<modules>
-		<module>table-miss-enforcer</module>
-		<module>of-switch-config-pusher</module>
-		<module>lldp-speaker</module>
-		<!-- nsf apps -->
-		<module>inventory-manager</module>
-		<module>statistics-manager</module>
-		<module>statistics-manager-config</module>
-		<module>topology-manager</module>
-		<module>forwardingrules-manager</module>
-		<module>topology-lldp-discovery</module>
-	</modules>
+    <modules>
+        <module>table-miss-enforcer</module>
+        <module>of-switch-config-pusher</module>
+        <module>lldp-speaker</module>
+        <!-- nsf apps -->
+        <module>inventory-manager</module>
+        <module>statistics-manager</module>
+        <module>statistics-manager-config</module>
+        <module>topology-manager</module>
+        <module>forwardingrules-manager</module>
+        <module>topology-lldp-discovery</module>
+    </modules>
 
 </project>
diff --git a/extension/openflowjava-extension-nicira-api/pom.xml b/extension/openflowjava-extension-nicira-api/pom.xml
index 2f9e9a7e0d..7ea575038b 100644
--- a/extension/openflowjava-extension-nicira-api/pom.xml
+++ b/extension/openflowjava-extension-nicira-api/pom.xml
@@ -63,7 +63,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml
index 6551eaf34e..c2c002d840 100644
--- a/extension/openflowjava-extension-nicira/pom.xml
+++ b/extension/openflowjava-extension-nicira/pom.xml
@@ -58,7 +58,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml
index 3bfb344e0e..52734298d4 100644
--- a/extension/openflowplugin-extension-api/pom.xml
+++ b/extension/openflowplugin-extension-api/pom.xml
@@ -48,7 +48,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -65,12 +65,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
-            <version>${yangtools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>openflow-protocol-api</artifactId>
-            <version>${openflowjava.version}</version><!--$NO-MVN-MAN-VER$-->
         </dependency>
 
         <!-- OpenFlowJava-API models -->
@@ -106,4 +100,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index fefc6200bd..13dc7c064b 100644
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -59,7 +59,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -118,4 +118,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index df70bb6f8b..08dc703c9f 100644
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -59,7 +59,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/pom.xml b/features/pom.xml
index 28b0cb4fc4..c79cc89161 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -16,6 +16,7 @@
     <karaf.empty.distro.version>1.5.0-SNAPSHOT</karaf.empty.distro.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
+    <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
   </properties>
 
   <dependencies>
@@ -110,7 +111,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf-connector</artifactId>
-      <version>${netconf.version}</version>
+      <version>${mdsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index 68a0be331d..54c1a09497 100644
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -57,7 +57,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -69,6 +69,7 @@
             </plugin>
         </plugins>
     </build>
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>
diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 4d3f1c38a2..efde56c993 100644
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -57,7 +57,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 48eba20ddb..8764cb8aad 100644
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -57,7 +57,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.parent.version}</version>
+                        <version>${config.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -103,7 +103,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${sal.binding.api.version}</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 4658608658..86690d70ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,18 +44,10 @@
 
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-      <netconf.version>1.2.0-SNAPSHOT</netconf.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
       <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
-      <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
-      <sal.binding.api.version>1.2.0-SNAPSHOT</sal.binding.api.version>
       <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
-      <sal.connection.api.version>0.2.0-SNAPSHOT</sal.connection.api.version>
-      <sal.common.util.version>1.2.0-SNAPSHOT</sal.common.util.version>
-      <netconf.parent.version>0.3.0-SNAPSHOT</netconf.parent.version>
-      <config.parent.version>0.3.0-SNAPSHOT</config.parent.version>
       <build.helper.version>1.8</build.helper.version>
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -70,15 +62,14 @@
       <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
       <sonar.profile>Sonar way with Findbugs</sonar.profile>
 
-      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
-      <yang.binding.version>0.7.0-SNAPSHOT</yang.binding.version>
-      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
       <config.version>0.3.0-SNAPSHOT</config.version>
+      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+      <netconf.version>0.3.0-SNAPSHOT</netconf.version>
       <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-      <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
-      <ietf-yang-types.version>2010.09.24.7-SNAPSHOT</ietf-yang-types.version>
-      <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
-      <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
+
+      <features.test.version>1.5.0-SNAPSHOT</features.test.version>
+      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
     </properties>
 
     <dependencyManagement>
@@ -90,31 +81,45 @@
           <scope>import</scope>
           <type>pom</type>
         </dependency>
-
         <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin-api</artifactId>
-          <version>${project.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-artifacts</artifactId>
+          <version>${config.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-api</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>${mdsal.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-spi</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-artifacts</artifactId>
+          <version>${netconf.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>util</artifactId>
+          <artifactId>openflowjava-artifacts</artifactId>
           <version>${openflowjava.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>simple-client</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.odlparent</groupId>
+          <artifactId>features-test</artifactId>
+	  <version>${features.test.version}</version>
+	  <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.opendaylight.openflowplugin</groupId>
+          <artifactId>openflowplugin-api</artifactId>
+          <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -133,127 +138,11 @@
           <version>${openflowplugin.model.version}</version>
         </dependency>
 
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-inventory</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-topology</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-api</artifactId>
-          <version>${sal.binding.api.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-config</artifactId>
-          <version>${sal.binding.api.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-util</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>liblldp</artifactId>
             <version>${sal.api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${sal.common.util.version}</version>
-        </dependency>
-        <!-- IT -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-netconf-connector</artifactId>
-            <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-it</artifactId>
-            <version>${sal.binding.api.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-broker-impl</artifactId>
-          <version>${sal.binding.api.version}</version>
-
-          <!-- excluding old models pulled as transient dependencies
-               TODO: remove -->
-          <exclusions>
-            <exclusion>
-              <groupId>org.opendaylight.controller.model</groupId>
-              <artifactId>model-flow-base</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.opendaylight.controller.model</groupId>
-              <artifactId>model-flow-service</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.opendaylight.controller.model</groupId>
-              <artifactId>model-flow-statistics</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-manager</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-api</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>logback-config</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-api</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-impl</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-file-xml-adapter</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-monitoring</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-client</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-impl</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.odlparent</groupId>
-          <artifactId>features-test</artifactId>
-          <version>${features.test.version}</version>
-        </dependency>
 
         <!-- thirdparty -->
         <dependency>
@@ -379,7 +268,7 @@
             <plugin>
               <groupId>org.opendaylight.yangtools</groupId>
               <artifactId>yang-maven-plugin</artifactId>
-              <version>${yang.binding.version}</version>
+              <version>${yangtools.version}</version>
             </plugin>
             <plugin>
               <groupId>org.apache.felix</groupId>
-- 
2.36.6