From 88231b5f1993eca598e15f00351ba99eec85842e Mon Sep 17 00:00:00 2001
From: Jakub Morvay <jmorvay@frinx.io>
Date: Sat, 2 Feb 2019 10:30:00 +0100
Subject: [PATCH] Remove bierman02-noauth feature

odl-restconf-nb-bierman02-noauth was deprecated in Neon. Get rid of it
now in Sodium.

Change-Id: I848f09af7a82d91fc564842838c9ba535decad69
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
---
 features/restconf/features-restconf/pom.xml   |  7 ---
 .../odl-restconf-nb-bierman02-noauth/pom.xml  | 52 -------------------
 features/restconf/odl-restconf-noauth/pom.xml | 47 -----------------
 features/restconf/pom.xml                     |  2 -
 restconf/pom.xml                              |  1 -
 restconf/restconf-artifacts/pom.xml           |  7 ---
 restconf/restconf-nb-bierman02-noauth/pom.xml | 28 ----------
 .../bierman02/web/noauth/WebInitializer.java  | 23 --------
 .../OSGI-INF/blueprint/bierman02-noauth.xml   | 17 ------
 9 files changed, 184 deletions(-)
 delete mode 100644 features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml
 delete mode 100644 features/restconf/odl-restconf-noauth/pom.xml
 delete mode 100644 restconf/restconf-nb-bierman02-noauth/pom.xml
 delete mode 100644 restconf/restconf-nb-bierman02-noauth/src/main/java/org/opendaylight/restconf/nb/bierman02/web/noauth/WebInitializer.java
 delete mode 100644 restconf/restconf-nb-bierman02-noauth/src/main/resources/OSGI-INF/blueprint/bierman02-noauth.xml

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 97cb911d82..d527777d9c 100644
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -43,13 +43,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-restconf-noauth</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-restconf-nb-bierman02</artifactId>
diff --git a/features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml b/features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml
deleted file mode 100644
index 7383c68f67..0000000000
--- a/features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2019 Pantheon Technologies, s.r.o. and others.
-
- 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>4.0.9</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>odl-restconf-nb-bierman02-noauth</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Restconf :: NB :: bierman02 :: no-auth -- Deprecated, use odl-restconf-nb-bierman02 instead!</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-nb-bierman02-base</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb-bierman02-noauth</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
deleted file mode 100644
index 8c71f3eb18..0000000000
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- 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>4.0.9</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>odl-restconf-noauth</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Restconf :: no-auth -- Deprecated, use odl-restconf instead!</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-nb-bierman02-noauth</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 107b6816e4..4844d3fc98 100644
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -30,11 +30,9 @@
         <module>odl-restconf-all</module>
         <module>odl-mdsal-apidocs</module>
         <module>odl-restconf</module>
-        <module>odl-restconf-noauth</module>
         <module>odl-restconf-common</module>
         <module>odl-restconf-nb-bierman02</module>
         <module>odl-restconf-nb-bierman02-base</module>
-        <module>odl-restconf-nb-bierman02-noauth</module>
         <module>odl-restconf-nb-rfc8040</module>
     </modules>
 
diff --git a/restconf/pom.xml b/restconf/pom.xml
index d8adc7ebc4..858bff6f15 100644
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -35,7 +35,6 @@
         <module>restconf-common</module>
         <module>restconf-nb-bierman02</module>
         <module>restconf-nb-bierman02-auth</module>
-        <module>restconf-nb-bierman02-noauth</module>
         <module>restconf-nb-rfc8040</module>
         <module>sal-rest-connector-config</module>
         <module>sal-rest-docgen</module>
diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml
index bbd36d3c49..2e7de823c5 100644
--- a/restconf/restconf-artifacts/pom.xml
+++ b/restconf/restconf-artifacts/pom.xml
@@ -111,13 +111,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-noauth</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/restconf/restconf-nb-bierman02-noauth/pom.xml b/restconf/restconf-nb-bierman02-noauth/pom.xml
deleted file mode 100644
index a93c7cd55b..0000000000
--- a/restconf/restconf-nb-bierman02-noauth/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2018 Inocybe Technologies 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.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>restconf-nb-bierman02-noauth</artifactId>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>restconf-nb-bierman02</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/restconf/restconf-nb-bierman02-noauth/src/main/java/org/opendaylight/restconf/nb/bierman02/web/noauth/WebInitializer.java b/restconf/restconf-nb-bierman02-noauth/src/main/java/org/opendaylight/restconf/nb/bierman02/web/noauth/WebInitializer.java
deleted file mode 100644
index a84d5fe2e5..0000000000
--- a/restconf/restconf-nb-bierman02-noauth/src/main/java/org/opendaylight/restconf/nb/bierman02/web/noauth/WebInitializer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2018 Inocybe Technologies 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
- */
-package org.opendaylight.restconf.nb.bierman02.web.noauth;
-
-import org.opendaylight.netconf.sal.restconf.web.Bierman02WebRegistrar;
-
-/**
- * Initializes the bierman-02 endpoint without authentication.
- *
- * @author Thomas Pantelis
- * @deprecated Use bierman-02 endpoint with authentication instead.
- */
-@Deprecated
-public class WebInitializer {
-    public WebInitializer(Bierman02WebRegistrar registrar) {
-        registrar.registerWithoutAuthentication();
-    }
-}
diff --git a/restconf/restconf-nb-bierman02-noauth/src/main/resources/OSGI-INF/blueprint/bierman02-noauth.xml b/restconf/restconf-nb-bierman02-noauth/src/main/resources/OSGI-INF/blueprint/bierman02-noauth.xml
deleted file mode 100644
index e31df8e506..0000000000
--- a/restconf/restconf-nb-bierman02-noauth/src/main/resources/OSGI-INF/blueprint/bierman02-noauth.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2018 Inocybe Technologies 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
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
-  <reference id="webRegistrar" interface="org.opendaylight.netconf.sal.restconf.web.Bierman02WebRegistrar"/>
-
-  <bean class="org.opendaylight.restconf.nb.bierman02.web.noauth.WebInitializer">
-    <argument ref="webRegistrar"/>
-  </bean>
-
-</blueprint>
-- 
2.36.6