From 17c25430b73fbe394897385e6450231b3f52161d Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea 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 | 6 ++-- gradle.lockfile | 29 ++++++++++--------- .../nebula.configEnvironment.properties | 17 ----------- .../gradle-plugins/nebula.lint.properties | 17 ----------- 4 files changed, 18 insertions(+), 51 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..d1178e17 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' } @@ -112,7 +112,7 @@ gradlePlugin { 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 { + configEnvironment { 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' diff --git a/gradle.lockfile b/gradle.lockfile index 62af15a8..fff7b3ed 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.googlecode.javaewah:JavaEWAH:1.1.7=integTestRuntimeClasspath,testRuntimeClasspath +com.googlecode.javaewah:JavaEWAH:1.1.6=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.connector-factory:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.core:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.pageant:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath @@ -11,10 +11,10 @@ com.jcraft:jsch.agentproxy.sshagent:0.0.7=integTestRuntimeClasspath,testRuntimeC com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath -com.jcraft:jsch:0.1.55=integTestRuntimeClasspath,testRuntimeClasspath +com.jcraft:jsch:0.1.54=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-contacts-plugin:6.0.0=integTestRuntimeClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-info-plugin:11.0.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-contacts-plugin:7.0.0=integTestRuntimeClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-info-plugin:12.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:nebula-gradle-interop:2.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:nebula-test:10.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:nebula-test:9.0.1=compileClasspath @@ -26,7 +26,7 @@ commons-logging:commons-logging:1.2=integTestRuntimeClasspath,testRuntimeClasspa de.regnis.q.sequence:sequence-library:1.0.3=integTestRuntimeClasspath,testRuntimeClasspath dev.gradleplugins:gradle-api:6.8.3=compileClasspath javax.inject:javax.inject:1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -joda-time:joda-time:2.10.13=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +joda-time:joda-time:2.11.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.12=compileClasspath junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath @@ -36,17 +36,17 @@ org.antlr:antlr-runtime:3.4=integTestRuntimeClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.2=integTestRuntimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.4=integTestRuntimeClasspath,testRuntimeClasspath -org.apache.maven:maven-artifact:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-builder-support:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-model-builder:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-model:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-artifact:3.8.6=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-builder-support:3.8.6=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-model-builder:3.8.6=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-model:3.8.6=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.gpars:gpars:1.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy:2.5.12=compileClasspath org.codehaus.groovy:groovy:3.0.9=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jsr166-mirror:jsr166y:1.7.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-interpolation:1.26=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-utils:3.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-utils:3.3.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jdt:core:3.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r=compileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,11 +63,12 @@ org.junit.platform:junit-platform-engine:1.8.1=integTestCompileClasspath,integTe org.multiverse:multiverse-core:0.7.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:5.2=integTestCompileClasspath,integTestRuntimeClasspath +org.ow2.asm:asm-tree:9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-util:5.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm:5.2=integTestCompileClasspath,integTestRuntimeClasspath +org.ow2.asm:asm:9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.2=integTestRuntimeClasspath,testRuntimeClasspath org.spockframework:spock-core:1.3-groovy-2.4=compileClasspath org.spockframework:spock-core:2.1-M2-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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