From b6e3e11ddcea90a2ae7f93c179625941e8e22ccd Mon Sep 17 00:00:00 2001
From: Tomas Olvecky <tolvecky@cisco.com>
Date: Mon, 23 Jun 2014 14:34:12 +0200
Subject: [PATCH] Re-added config.version to config-module-archetype.

Fix broken archetype that failed to generate valid poms.
Since the archetype's generated pom can live in hierarchy
different from ODL, the template must specify version
of config-api same as it does for plugins.

Change-Id: I88bb7db303395c82f389af90c668efe563cb3bdb
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
---
 .../src/main/resources/archetype-resources/pom.xml             | 1 +
 .../src/main/yang/__module-name__-impl.yang                    | 1 -
 .../archetype-resources/src/main/yang/__module-name__.yang     | 1 -
 opendaylight/config/pom.xml                                    | 3 +--
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
index 6ddb1306c5..ae041f4585 100644
--- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
@@ -20,6 +20,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
+            <version>${config.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang
index 8c1dab1495..639610f3d5 100644
--- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang
+++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang
@@ -1,4 +1,3 @@
-// vi: set smarttab et sw=4 tabstop=4:
 module ${module-name}-${module-implementation-name} {
 
     yang-version 1;
diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang
index 2afc91e8e3..f77df5a22d 100644
--- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang
+++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang
@@ -1,4 +1,3 @@
-// vi: set smarttab et sw=4 tabstop=4:
 module ${module-name} {
 
     yang-version 1;
diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 5f34a9aa82..4660091fcc 100644
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
 <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>
 
@@ -230,4 +229,4 @@
       </modules>
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file
-- 
2.36.6