From 5a2a4e56ca3d9e9ec866ffc8512f0fe516c70b4a Mon Sep 17 00:00:00 2001
From: Roberto Perez Alcolea <rperezalcolea@netflix.com>
Date: Tue, 11 Oct 2022 11:46:55 -0700
Subject: [PATCH] rollback change in upgrades: we need to address this with
 unblocking gradle api

---
 build.gradle                                  | 26 ++++++-------------
 .../nebula.configEnvironment.properties       | 17 ------------
 .../gradle-plugins/nebula.lint.properties     | 17 ------------
 3 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 src/main/resources/META-INF/gradle-plugins/nebula.configEnvironment.properties
 delete mode 100644 src/main/resources/META-INF/gradle-plugins/nebula.lint.properties

diff --git a/build.gradle b/build.gradle
index 1d6b926a..0d176b0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,9 +15,9 @@
  */
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '19.0.1'
+    id 'nebula.plugin-plugin' version '16.3.0'
     id "org.jetbrains.kotlin.jvm" version "1.5.31"
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'java-gradle-plugin'
 }
 
@@ -104,31 +104,21 @@ afterEvaluate {
     }
 }
 
-gradlePlugin {
+pluginBundle {
+    website = 'https://github.com/nebula-plugins/gradle-lint-plugin'
+    vcsUrl = 'https://github.com/nebula-plugins/gradle-lint-plugin.git'
+    description = 'Pluggable and configurable linter tool for identifying and reporting on patterns of misuse or deprecations in Gradle scripts'
+
     plugins {
         gradeLint {
             id = 'nebula.lint'
             displayName = 'Nebula Lint plugin'
             description = 'Pluggable and configurable linter tool for identifying and reporting on patterns of misuse or deprecations in Gradle scripts'
-            implementationClass = 'com.netflix.nebula.lint.plugin.GradleLintPlugin'
-        }
-        gradeLint {
-            id = 'nebula.configEnvironment'
-            displayName = 'Nebula Config Environment plugin'
-            description = 'Pluggable and configurable linter tool for identifying and reporting on patterns of misuse or deprecations in Gradle scripts'
-            implementationClass = 'com.netflix.nebula.config.plugin.ConfigurationEnvironmentPlugin'
+            tags = ['nebula', 'lint']
         }
     }
 }
 
-
-pluginBundle {
-    website = 'https://github.com/nebula-plugins/gradle-lint-plugin'
-    vcsUrl = 'https://github.com/nebula-plugins/gradle-lint-plugin.git'
-    tags = ['nebula', 'lint']
-}
-
-
 // Relocate jgit dependency not available in Maven Central
 // Replaces the main artifact by removing the classifier for the shadow jar, and replacing jar with shadowJar
 // Relocated dependencies are removed from the generated pom
diff --git a/src/main/resources/META-INF/gradle-plugins/nebula.configEnvironment.properties b/src/main/resources/META-INF/gradle-plugins/nebula.configEnvironment.properties
deleted file mode 100644
index ff46b306..00000000
--- a/src/main/resources/META-INF/gradle-plugins/nebula.configEnvironment.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 2015-2019 Netflix, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-implementation-class=com.netflix.nebula.config.plugin.ConfigurationEnvironmentPlugin
\ No newline at end of file
diff --git a/src/main/resources/META-INF/gradle-plugins/nebula.lint.properties b/src/main/resources/META-INF/gradle-plugins/nebula.lint.properties
deleted file mode 100644
index 26680ae1..00000000
--- a/src/main/resources/META-INF/gradle-plugins/nebula.lint.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 2015-2019 Netflix, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-implementation-class=com.netflix.nebula.lint.plugin.GradleLintPlugin
\ No newline at end of file