From 514673db7a2ac66ef3f0f61b9a78eb989a9ba7a3 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 1 Apr 2018 20:08:03 -0700
Subject: [PATCH] Remove version feature

Change-Id: Ifa9bcfa60d516ee75d279dc309ba8bc89fe35189
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/distribution/pom.xml                | 27 ------
 features/repos/distribution/pom.xml           | 61 --------------
 features/repos/index/pom.xml                  | 15 ----
 features/repos/pom.xml                        |  1 -
 .../singles/odl-distribution-version/pom.xml  | 83 -------------------
 .../src/main/feature/feature.xml              | 16 ----
 .../pom.xml                                   | 15 ----
 features/singles/pom.xml                      |  1 -
 pom.xml                                       |  1 -
 version/pom.xml                               | 46 ----------
 version/src/main/config/default-config.xml    | 30 -------
 .../version/rev160316/OdlVersionModule.java   | 28 -------
 .../rev160316/OdlVersionModuleFactory.java    | 13 ---
 .../main/yang/odl-distribution-version.yang   | 30 -------
 14 files changed, 367 deletions(-)
 delete mode 100644 features/repos/distribution/pom.xml
 delete mode 100644 features/singles/odl-distribution-version/pom.xml
 delete mode 100644 features/singles/odl-distribution-version/src/main/feature/feature.xml
 delete mode 100644 version/pom.xml
 delete mode 100644 version/src/main/config/default-config.xml
 delete mode 100644 version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModule.java
 delete mode 100644 version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java
 delete mode 100644 version/src/main/yang/odl-distribution-version.yang

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 93d65145..df5d6b53 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -42,27 +42,7 @@
     <dependencyManagement>
         <!-- TODO: Hardcode versions when moving to semantic versioning. -->
         <dependencies>
-            <!-- Version artifacts. -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>version</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>version</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
             <!-- Karaf 4 single features. -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-distribution-version</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-integration-compatible-with-all</artifactId>
@@ -78,13 +58,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Karaf 4 feature repositories. -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-distribution</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-index</artifactId>
diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml
deleted file mode 100644
index ae7f5e02..00000000
--- a/features/repos/distribution/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>features-distribution</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Repository of features internal to distribution.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/repos/distribution;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-distribution-version</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 1f1751e2..7bf7db8f 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -216,21 +216,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Distribution -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>features-distribution</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Dlux -->
         <profile>
             <id>dlux</id>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 0cae5c39..a22d15ae 100644
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -41,7 +41,6 @@
     </scm>
     <modules>
         <!-- Keep distribution-artifacts updated -->
-        <module>distribution</module>
         <module>index</module>
         <module>test</module>
     </modules>
diff --git a/features/singles/odl-distribution-version/pom.xml b/features/singles/odl-distribution-version/pom.xml
deleted file mode 100644
index 87c8f8c6..00000000
--- a/features/singles/odl-distribution-version/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<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>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>odl-distribution-version</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Single feature for Version functionality.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-distribution-version;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <!-- Version module jar and config. -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>version</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>version</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-        <!-- External single feature dependencies. -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-persister</artifactId>
-            <!-- This pulls in both config-api and yang-common -->
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <!-- Additional dependencies are needed because config-parent also requires sal-binding-config bundle. -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <!-- This is an overkill, but odl-mdsal-broker-local is the only feature which contains sal-binding-config
-                 bundle, and odl-mdsal-broker is its nearest ancestor tested to not fail SingleFeatureTest
-                 (others are blacklisted in feature-test so SFT is skipped and they would cause SFT failure here). -->
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/singles/odl-distribution-version/src/main/feature/feature.xml b/features/singles/odl-distribution-version/src/main/feature/feature.xml
deleted file mode 100644
index dffe874c..00000000
--- a/features/singles/odl-distribution-version/src/main/feature/feature.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-integration-distribution-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-distribution-version" version="${project.version}">
-        <configfile finalname="etc/opendaylight/karaf/odl-version.xml">
-            mvn:org.opendaylight.integration/version/${project.version}/xml/config
-        </configfile>
-    </feature>
-</features>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 520ea5c5..004cd650 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -168,21 +168,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Distribution -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>odl-distribution-version</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- DluxApps -->
         <profile>
             <id>dluxapps</id>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 9113defe..90e75d4b 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -41,7 +41,6 @@
     </scm>
     <modules>
         <!-- Keep distribution-atrifacts updated. -->
-        <module>odl-distribution-version</module>
         <module>odl-integration-compatible-with-all</module>
         <module>odl-integration-all</module>
     </modules>
diff --git a/pom.xml b/pom.xml
index 3d7109e7..cbd037ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,5 @@
         <module>artifacts</module>
         <module>karaf</module>
         <module>features</module>
-        <module>version</module>
     </modules>
 </project>
diff --git a/version/pom.xml b/version/pom.xml
deleted file mode 100644
index 60640b7a..00000000
--- a/version/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2016-2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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>
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-filtering-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>version</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Sub-project for ODL version(s) reporting mechanism.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=version;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <!-- Is there a way to inherit/include properties from a file bumped autimatically? -->
-    <properties>
-        <feature.odlparent.version>3.0.2</feature.odlparent.version>
-    </properties>
-</project>
diff --git a/version/src/main/config/default-config.xml b/version/src/main/config/default-config.xml
deleted file mode 100644
index 12918dcf..00000000
--- a/version/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:integration:distribution:version?module=odl-distribution-version&amp;revision=2016-03-16</capability>
-  </required-capabilities>
-  <configuration>
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:integration:distribution:version">prefix:odl-version</type>
-          <name>odl-distribution-version</name>
-          <version>${project.version}</version>
-        </module>
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:integration:distribution:version">prefix:odl-version</type>
-          <name>odl-odlparent-version</name>
-          <version>${feature.odlparent.version}</version>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModule.java b/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModule.java
deleted file mode 100644
index 362cb1a5..00000000
--- a/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModule.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316;
-public class OdlVersionModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316.AbstractOdlVersionModule {
-    public OdlVersionModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public OdlVersionModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316.OdlVersionModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new java.io.Closeable() {
-            // TODO: Perhaps write something to datastore in constructor?
-
-            @Override
-            public void close() {
-            }
-
-        };
-    }
-
-}
diff --git a/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java b/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java
deleted file mode 100644
index a768b79b..00000000
--- a/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: odl-distribution-version yang module local name: odl-version
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jun 10 11:25:09 IST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316;
-public class OdlVersionModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316.AbstractOdlVersionModuleFactory {
-
-}
diff --git a/version/src/main/yang/odl-distribution-version.yang b/version/src/main/yang/odl-distribution-version.yang
deleted file mode 100644
index d65604c9..00000000
--- a/version/src/main/yang/odl-distribution-version.yang
+++ /dev/null
@@ -1,30 +0,0 @@
-module odl-distribution-version {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:integration:distribution:version";
-    prefix "odl-version";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "Piece of ODL configuration holding version strings for ODL components.";
-
-    revision "2016-03-16" {
-        description
-            "Initial revision";
-    }
-
-    identity odl-version {
-        base config:module-type;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case odl-version {
-            when "/config:modules/config:module/config:type = 'odl-version'";
-            leaf version {
-                description "Short string with version of component corresponding to module name.";
-                type string;
-                mandatory true;
-            }
-        }
-    }
-}
-- 
2.36.6