From 38d059117e5f886db458c53ec44533c4720e0ff2 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Mon, 10 Oct 2022 11:21:55 -0700 Subject: [PATCH] Move to com.netflix namespace for plugin id --- README.md | 2 +- build.gradle | 20 +++++++++---------- gradle.lockfile | 2 +- .../plugin/info/InfoBrokerPluginSpec.groovy | 4 ++-- .../InfoPluginConfigurationCacheSpec.groovy | 2 +- .../InfoPluginIntegrationTestKitSpec.groovy | 10 +++++----- .../basic/ManifestOwnersPluginSpec.groovy | 2 +- .../DependenciesInfoPluginSpec.groovy | 2 +- .../info/scm/ScmInfoPluginProjectSpec.groovy | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 20dbfff..ae53738 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Gradle Info Plugin ===================== ![Support Status](https://img.shields.io/badge/nebula-active-green.svg) -[![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com.netflix.nebula/gradle-info-plugin/maven-metadata.xml.svg?label=gradlePluginPortal)](https://plugins.gradle.org/plugin/nebula.info) +[![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com.netflix.nebula/gradle-info-plugin/maven-metadata.xml.svg?label=gradlePluginPortal)](https://plugins.gradle.org/plugin/com.netflix.nebula.info) [![Maven Central](https://img.shields.io/maven-central/v/com.netflix.nebula/gradle-info-plugin)](https://maven-badges.herokuapp.com/maven-central/com.netflix.nebula/gradle-info-plugin) ![Build](https://github.com/nebula-plugins/gradle-info-plugin/actions/workflows/nebula.yml/badge.svg) [![Apache 2.0](https://img.shields.io/github/license/nebula-plugins/gradle-info-plugin.svg)](http://www.apache.org/licenses/LICENSE-2.0) diff --git a/build.gradle b/build.gradle index 4204594..60b7aff 100644 --- a/build.gradle +++ b/build.gradle @@ -55,61 +55,61 @@ pluginBundle { gradlePlugin { plugins { info { - id = 'nebula.info' + id = 'com.netflix.nebula.info' displayName = 'Gradle Info plugin' description = project.description implementationClass= 'nebula.plugin.info.InfoPlugin' } infoBasic { - id = 'nebula.info-basic' + id = 'com.netflix.nebula.info-basic' displayName = 'Gradle Info Basic plugin' description = project.description implementationClass= 'nebula.plugin.info.basic.BasicInfoPlugin' } infoDependencies { - id = 'nebula.info-dependencies' + id = 'com.netflix.nebula.info-dependencies' displayName = 'Gradle Info Dependencies plugin' description = project.description implementationClass= 'nebula.plugin.info.dependencies.DependenciesInfoPlugin' } infoBroker { - id = 'nebula.info-broker' + id = 'com.netflix.nebula.info-broker' displayName = 'Gradle Info Broker plugin' description = project.description implementationClass= 'nebula.plugin.info.InfoBrokerPlugin' } infoCI { - id = 'nebula.info-ci' + id = 'com.netflix.nebula.info-ci' displayName = 'Gradle Info CI plugin' description = project.description implementationClass= 'nebula.plugin.info.ci.ContinuousIntegrationInfoPlugin' } infoJAR { - id = 'nebula.info-jar' + id = 'com.netflix.nebula.info-jar' displayName = 'Gradle Info JAR plugin' description = project.description implementationClass= 'nebula.plugin.info.reporting.InfoJarManifestPlugin' } infoJava { - id = 'nebula.info-java' + id = 'com.netflix.nebula.info-java' displayName = 'Gradle Info Java plugin' description = project.description implementationClass= 'nebula.plugin.info.java.InfoJavaPlugin' } infoOwners { - id = 'nebula.info-owners' + id = 'com.netflix.nebula.info-owners' displayName = 'Gradle Info Owners plugin' description = project.description implementationClass= 'nebula.plugin.info.basic.ManifestOwnersPlugin' } infoProps { - id = 'nebula.info-props' + id = 'com.netflix.nebula.info-props' displayName = 'Gradle Info Properties plugin' description = project.description implementationClass= 'nebula.plugin.info.reporting.InfoPropertiesFilePlugin' } infoScm { - id = 'nebula.info-scm' + id = 'com.netflix.nebula.info-scm' displayName = 'Gradle Info SCM plugin' description = project.description implementationClass= 'nebula.plugin.info.scm.ScmInfoPlugin' diff --git a/gradle.lockfile b/gradle.lockfile index d1e48d1..64e2beb 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -12,7 +12,7 @@ com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=compileClasspath,integTestC com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jzlib:1.1.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-contacts-plugin:6.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-contacts-plugin:7.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,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.perforce:p4java:2015.2.1365273=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/src/test/groovy/nebula/plugin/info/InfoBrokerPluginSpec.groovy b/src/test/groovy/nebula/plugin/info/InfoBrokerPluginSpec.groovy index 3a58ef4..91d51fd 100644 --- a/src/test/groovy/nebula/plugin/info/InfoBrokerPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/info/InfoBrokerPluginSpec.groovy @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean class InfoBrokerPluginSpec extends ProjectSpec { def 'apply plugin'() { when: - project.apply plugin: 'nebula.info-broker' + project.apply plugin: 'com.netflix.nebula.info-broker' then: noExceptionThrown() @@ -37,7 +37,7 @@ class InfoBrokerPluginSpec extends ProjectSpec { @Ignore("Not valid until we add manifest as an extension") def 'extension can be extended in different ways'() { when: - project.apply plugin: 'nebula.info-broker' + project.apply plugin: 'com.netflix.nebula.info-broker' def basePlugin = project.plugins.getPlugin(InfoBrokerPlugin) project.manifest { MyKey { value = 'MyValue' } diff --git a/src/test/groovy/nebula/plugin/info/InfoPluginConfigurationCacheSpec.groovy b/src/test/groovy/nebula/plugin/info/InfoPluginConfigurationCacheSpec.groovy index 63204d9..33a5e26 100644 --- a/src/test/groovy/nebula/plugin/info/InfoPluginConfigurationCacheSpec.groovy +++ b/src/test/groovy/nebula/plugin/info/InfoPluginConfigurationCacheSpec.groovy @@ -7,7 +7,7 @@ class InfoPluginConfigurationCacheSpec extends IntegrationTestKitSpec { def 'plugin applies with configuration cache'() { buildFile << """ plugins { - id 'nebula.info' + id 'com.netflix.nebula.info' id 'java' } """ diff --git a/src/test/groovy/nebula/plugin/info/InfoPluginIntegrationTestKitSpec.groovy b/src/test/groovy/nebula/plugin/info/InfoPluginIntegrationTestKitSpec.groovy index f690ffe..7409b50 100644 --- a/src/test/groovy/nebula/plugin/info/InfoPluginIntegrationTestKitSpec.groovy +++ b/src/test/groovy/nebula/plugin/info/InfoPluginIntegrationTestKitSpec.groovy @@ -32,7 +32,7 @@ class InfoPluginIntegrationTestKitSpec extends IntegrationTestKitSpec { plugins { id 'java' - id 'nebula.info' + id 'com.netflix.nebula.info' } java { @@ -81,7 +81,7 @@ class InfoPluginIntegrationTestKitSpec extends IntegrationTestKitSpec { plugins { id 'java' - id 'nebula.info' + id 'com.netflix.nebula.info' } java { @@ -137,7 +137,7 @@ class InfoPluginIntegrationTestKitSpec extends IntegrationTestKitSpec { plugins { id 'java' - id 'nebula.info' + id 'com.netflix.nebula.info' } java { @@ -194,7 +194,7 @@ class InfoPluginIntegrationTestKitSpec extends IntegrationTestKitSpec { plugins { id 'groovy' - id 'nebula.info' + id 'com.netflix.nebula.info' } java { @@ -256,7 +256,7 @@ class InfoPluginIntegrationTestKitSpec extends IntegrationTestKitSpec { plugins { id 'java' id 'scala' - id 'nebula.info' + id 'com.netflix.nebula.info' } java { diff --git a/src/test/groovy/nebula/plugin/info/basic/ManifestOwnersPluginSpec.groovy b/src/test/groovy/nebula/plugin/info/basic/ManifestOwnersPluginSpec.groovy index c3dc520..88f7340 100644 --- a/src/test/groovy/nebula/plugin/info/basic/ManifestOwnersPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/info/basic/ManifestOwnersPluginSpec.groovy @@ -23,7 +23,7 @@ import spock.lang.Ignore class ManifestOwnersPluginSpec extends PluginProjectSpec { @Override String getPluginName() { - 'nebula.info-owners' + 'com.netflix.nebula.info-owners' } @Ignore('this now depends on project evaluation, ignore for now') diff --git a/src/test/groovy/nebula/plugin/info/dependency/DependenciesInfoPluginSpec.groovy b/src/test/groovy/nebula/plugin/info/dependency/DependenciesInfoPluginSpec.groovy index e18b010..156e3a4 100644 --- a/src/test/groovy/nebula/plugin/info/dependency/DependenciesInfoPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/info/dependency/DependenciesInfoPluginSpec.groovy @@ -69,6 +69,6 @@ class DependenciesInfoPluginSpec extends PluginProjectSpec { @Override String getPluginName() { - 'nebula.info-dependencies' + 'com.netflix.nebula.info-dependencies' } } diff --git a/src/test/groovy/nebula/plugin/info/scm/ScmInfoPluginProjectSpec.groovy b/src/test/groovy/nebula/plugin/info/scm/ScmInfoPluginProjectSpec.groovy index 8e20919..8d3dbeb 100644 --- a/src/test/groovy/nebula/plugin/info/scm/ScmInfoPluginProjectSpec.groovy +++ b/src/test/groovy/nebula/plugin/info/scm/ScmInfoPluginProjectSpec.groovy @@ -23,7 +23,7 @@ class ScmInfoPluginProjectSpec extends ProjectSpec { */ def 'apply plugin'() { when: - project.apply plugin: 'nebula.info-scm' + project.apply plugin: 'com.netflix.nebula.info-scm' then: def plugin = project.plugins.getPlugin(ScmInfoPlugin)