From cc3845e23678fcca74d7fcae8286f8b3933919a1 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Mon, 10 Oct 2022 14:12:31 -0700 Subject: [PATCH] Move to com.netflix namespace for plugin id --- README.md | 6 +-- build.gradle | 48 +++++++++---------- gradle.lockfile | 30 ++++++------ .../multiprojectpublish/build.gradle | 10 ++-- .../maven/MavenDeveloperPlugin.groovy | 35 +++++++------- .../ManifestElementNameGeneratorSpec.groovy | 2 +- ...IvyBasePublishPluginIntegrationSpec.groovy | 4 +- ...IvyCompileOnlyPluginIntegrationSpec.groovy | 4 +- .../IvyExcludesPluginIntegrationSpec.groovy | 2 +- .../IvyManifestPluginIntegrationSpec.groovy | 6 +-- ...adowJarPublishPluginIntegrationSpec.groovy | 2 +- ...ingBootPublishPluginIntegrationSpec.groovy | 2 +- .../IvyPublishNonJavaIntegrationSpec.groovy | 2 +- ...vyPublishRecommenderInteractionSpec.groovy | 8 ++-- ...venBasePublishPluginIntegrationSpec.groovy | 4 +- ...MavenDeveloperPluginIntegrationSpec.groovy | 12 ++--- .../MavenExcludesPluginIntegrationSpec.groovy | 2 +- .../MavenManifestPluginIntegrationSpec.groovy | 6 +-- ...adowJarPublishPluginIntegrationSpec.groovy | 2 +- ...ingBootPublishPluginIntegrationSpec.groovy | 6 +-- .../MavenPublishNonJavaIntegrationSpec.groovy | 2 +- .../MavenPublishPluginIntegrationSpec.groovy | 10 ++-- ...edDependenciesPluginIntegrationSpec.groovy | 16 +++---- .../MavenScmPluginIntegrationSpec.groovy | 6 +-- .../maven/MavenScmPluginSpec.groovy | 2 +- ...nApacheLicensePluginIntegrationSpec.groovy | 2 +- .../MavenApacheLicensePluginSpec.groovy | 2 +- 27 files changed, 117 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 25692cf9..08452eb5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ __WARNING: Version 17.x.x requires at least Gradle 6.0 or newer for sources and To apply this plugin if using plugins block plugins { - id 'nebula.' version '17.0.0' + id 'com.netflix.nebula.' version '17.0.0' } If using an older version of Gradle @@ -121,7 +121,7 @@ When [Gradle Contacts](https://github.com/nebula-plugins/gradle-contacts-plugin) Example, given: ``` - apply plugin: 'nebula.contacts' + apply plugin: 'com.netflix.nebula.contacts' contacts { 'nebula@example.test' { @@ -274,7 +274,7 @@ Creates a task which runs before actual publication into repositories. It catche This plugin is NOT automatically applied with `nebula.ivy-publish` or `nebula.maven-publish`. You have to apply the plugin to all modules within the project. allprojects { - apply plugin: 'nebula.publish-verification' + apply plugin: 'com.netflix.nebula.publish-verification' } Plugin is integrated with Gradle publishing and with Artifactory plugin. The task itself is a dependence of tasks with type `PublishToIvyRepository` or `PublishToMavenRepository`. The task will also get hooked to tasks named diff --git a/build.gradle b/build.gradle index 3f80628f..324932ab 100644 --- a/build.gradle +++ b/build.gradle @@ -62,123 +62,123 @@ dependencies { gradlePlugin { plugins { mavenApacheLicense { - id = 'nebula.maven-apache-license' + id = 'com.netflix.nebula.maven-apache-license' implementationClass = 'nebula.plugin.publishing.maven.license.MavenApacheLicensePlugin' } mavenBasePublish { - id = 'nebula.maven-base-publish' + id = 'com.netflix.nebula.maven-base-publish' implementationClass = 'nebula.plugin.publishing.maven.MavenBasePublishPlugin' } mavenDeveloper { - id = 'nebula.maven-developer' + id = 'com.netflix.nebula.maven-developer' implementationClass = 'nebula.plugin.publishing.maven.MavenDeveloperPlugin' } mavenManifest { - id = 'nebula.maven-manifest' + id = 'com.netflix.nebula.maven-manifest' implementationClass = 'nebula.plugin.publishing.maven.MavenManifestPlugin' } mavenNebulaPublish { - id = 'nebula.maven-nebula-publish' + id = 'com.netflix.nebula.maven-nebula-publish' implementationClass = 'nebula.plugin.publishing.maven.MavenNebulaPublishPlugin' } mavenPublish { - id = 'nebula.maven-publish' + id = 'com.netflix.nebula.maven-publish' implementationClass = 'nebula.plugin.publishing.maven.MavenPublishPlugin' } mavenShadowPublish { - id = 'nebula.maven-shadow-publish' + id = 'com.netflix.nebula.maven-shadow-publish' implementationClass = 'nebula.plugin.publishing.maven.MavenShadowPublishPlugin' } mavenResolvedDependencies { - id = 'nebula.maven-resolved-dependencies' + id = 'com.netflix.nebula.maven-resolved-dependencies' implementationClass = 'nebula.plugin.publishing.maven.MavenResolvedDependenciesPlugin' } mavenVerifyUnspecifiedVersionDependencies { - id = 'nebula.maven-verify-unspecified-version-dependencies' + id = 'com.netflix.nebula.maven-verify-unspecified-version-dependencies' implementationClass = 'nebula.plugin.publishing.maven.MavenVerifyUnspecifiedVersionDependenciesPlugin' } mavenScm { - id = 'nebula.maven-scm' + id = 'com.netflix.nebula.maven-scm' implementationClass = 'nebula.plugin.publishing.maven.MavenScmPlugin' } ivyBasePublish { - id = 'nebula.ivy-base-publish' + id = 'com.netflix.nebula.ivy-base-publish' implementationClass = 'nebula.plugin.publishing.ivy.IvyBasePublishPlugin' } ivyCompileOnly { - id = 'nebula.ivy-compile-only' + id = 'com.netflix.nebula.ivy-compile-only' implementationClass = 'nebula.plugin.publishing.ivy.IvyCompileOnlyPlugin' } ivyManifest { - id = 'nebula.ivy-manifest' + id = 'com.netflix.nebula.ivy-manifest' implementationClass = 'nebula.plugin.publishing.ivy.IvyManifestPlugin' } ivyNebulaPublish { - id = 'nebula.ivy-nebula-publish' + id = 'com.netflix.nebula.ivy-nebula-publish' implementationClass = 'nebula.plugin.publishing.ivy.IvyNebulaPublishPlugin' } ivyPublish { - id = 'nebula.ivy-publish' + id = 'com.netflix.nebula.ivy-publish' implementationClass = 'nebula.plugin.publishing.ivy.IvyPublishPlugin' } ivyShadowPublish { - id = 'nebula.ivy-shadow-publish' + id = 'com.netflix.nebula.ivy-shadow-publish' implementationClass = 'nebula.plugin.publishing.ivy.IvyShadowPublishPlugin' } ivyResolvedDependencies { - id = 'nebula.ivy-resolved-dependencies' + id = 'com.netflix.nebula.ivy-resolved-dependencies' implementationClass = 'nebula.plugin.publishing.ivy.IvyResolvedDependenciesPlugin' } ivyVerifyUnspecifiedVersionDependencies { - id = 'nebula.ivy-verify-unspecified-version-dependencies' + id = 'com.netflix.nebula.ivy-verify-unspecified-version-dependencies' implementationClass = 'nebula.plugin.publishing.ivy.IvyVerifyUnspecifiedVersionDependenciesPlugin' } ivyRemovePlatformDependencies { - id = 'nebula.ivy-remove-platform-dependencies' + id = 'com.netflix.nebula.ivy-remove-platform-dependencies' implementationClass = 'nebula.plugin.publishing.ivy.IvyRemovePlatformDependenciesPlugin' } publishVerification { - id = 'nebula.publish-verification' + id = 'com.netflix.nebula.publish-verification' implementationClass = 'nebula.plugin.publishing.verification.PublishVerificationPlugin' } javadocJar { - id = 'nebula.javadoc-jar' + id = 'com.netflix.nebula.javadoc-jar' implementationClass = 'nebula.plugin.publishing.publications.JavadocJarPlugin' } sourceJar { - id = 'nebula.source-jar' + id = 'com.netflix.nebula.source-jar' implementationClass = 'nebula.plugin.publishing.publications.SourceJarPlugin' } springBootJar { - id = 'nebula.spring-boot-jar' + id = 'com.netflix.nebula.spring-boot-jar' implementationClass = 'nebula.plugin.publishing.publications.SpringBootJarPlugin' } testJar { - id = 'nebula.test-jar' + id = 'com.netflix.nebula.test-jar' implementationClass = 'nebula.plugin.publishing.publications.TestJarPlugin' } } diff --git a/gradle.lockfile b/gradle.lockfile index f386c028..97a340b8 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -23,13 +23,13 @@ com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,r com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-contacts-plugin:6.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-dependency-lock-plugin:12.4.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-info-plugin:11.3.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:gradle-dependency-lock-plugin:12.7.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-info-plugin:12.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:gradle-resolution-rules-plugin:9.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:gradle-scm-plugin:6.0.0=integTestRuntimeClasspath,testRuntimeClasspath com.netflix.nebula:nebula-dependencies-comparison:0.2.1=integTestRuntimeClasspath,testRuntimeClasspath -com.netflix.nebula:nebula-dependency-recommender:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-dependency-recommender: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.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -54,18 +54,18 @@ org.apache.commons:commons-lang3:3.12.0=integTestRuntimeClasspath,testRuntimeCla org.apache.httpcomponents:httpclient:4.5.13=integTestRuntimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=integTestRuntimeClasspath,testRuntimeClasspath org.apache.ivy:ivy:2.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-artifact:3.8.2=integTestRuntimeClasspath,testRuntimeClasspath -org.apache.maven:maven-builder-support:3.8.2=integTestRuntimeClasspath,testRuntimeClasspath -org.apache.maven:maven-model-builder:3.8.2=integTestRuntimeClasspath,testRuntimeClasspath -org.apache.maven:maven-model:3.8.2=integTestRuntimeClasspath,testRuntimeClasspath +org.apache.maven:maven-artifact:3.8.3=integTestRuntimeClasspath,testRuntimeClasspath +org.apache.maven:maven-builder-support:3.8.3=integTestRuntimeClasspath,testRuntimeClasspath +org.apache.maven:maven-model-builder:3.8.3=integTestRuntimeClasspath,testRuntimeClasspath +org.apache.maven:maven-model:3.8.3=integTestRuntimeClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.5.0=integTestRuntimeClasspath,testRuntimeClasspath org.codehaus.groovy:groovy:3.0.9=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-component-annotations:1.5.5=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-interpolation:1.25=integTestRuntimeClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-utils:3.2.1=integTestRuntimeClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-interpolation:1.26=integTestRuntimeClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-utils:3.3.0=integTestRuntimeClasspath,testRuntimeClasspath org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4=integTestRuntimeClasspath,testRuntimeClasspath +org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=integTestRuntimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.5.31=integTestRuntimeClasspath,testRuntimeClasspath @@ -82,10 +82,10 @@ org.jetbrains.kotlin:kotlin-stdlib:1.4.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.5.30=integTestCompileClasspath,testCompileClasspath org.jetbrains.kotlin:kotlin-stdlib:1.5.31=integTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jfrog.buildinfo:build-info-api:2.35.0=integTestRuntimeClasspath,testRuntimeClasspath -org.jfrog.buildinfo:build-info-client:2.35.0=integTestRuntimeClasspath,testRuntimeClasspath -org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jfrog.buildinfo:build-info-extractor:2.35.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jfrog.buildinfo:build-info-api:2.37.1=integTestRuntimeClasspath,testRuntimeClasspath +org.jfrog.buildinfo:build-info-client:2.37.1=integTestRuntimeClasspath,testRuntimeClasspath +org.jfrog.buildinfo:build-info-extractor-gradle:4.29.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jfrog.buildinfo:build-info-extractor:2.37.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jfrog.filespecs:file-specs-java:1.1.1=integTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.8.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-engine:1.8.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/src/gradleTest/multiprojectpublish/build.gradle b/src/gradleTest/multiprojectpublish/build.gradle index eba2061c..a5877d99 100644 --- a/src/gradleTest/multiprojectpublish/build.gradle +++ b/src/gradleTest/multiprojectpublish/build.gradle @@ -9,11 +9,11 @@ buildscript { subprojects { apply plugin: 'java' - apply plugin: 'nebula.maven-publish' - apply plugin: 'nebula.ivy-publish' - apply plugin: 'nebula.javadoc-jar' - apply plugin: 'nebula.source-jar' - apply plugin: 'nebula.test-jar' + apply plugin: 'com.netflix.nebula.maven-publish' + apply plugin: 'com.netflix.nebula.ivy-publish' + apply plugin: 'com.netflix.nebula.javadoc-jar' + apply plugin: 'com.netflix.nebula.source-jar' + apply plugin: 'com.netflix.nebula.test-jar' group = 'test.example' version = '0.1.0' diff --git a/src/main/groovy/nebula/plugin/publishing/maven/MavenDeveloperPlugin.groovy b/src/main/groovy/nebula/plugin/publishing/maven/MavenDeveloperPlugin.groovy index cf3d0a2f..d419781d 100644 --- a/src/main/groovy/nebula/plugin/publishing/maven/MavenDeveloperPlugin.groovy +++ b/src/main/groovy/nebula/plugin/publishing/maven/MavenDeveloperPlugin.groovy @@ -29,25 +29,26 @@ class MavenDeveloperPlugin implements Plugin { void apply(Project project) { project.plugins.apply MavenBasePublishPlugin - project.plugins.withId("nebula.contacts-base") { BaseContactsPlugin contactsPlugin -> - PublishingExtension publishing = project.extensions.getByType(PublishingExtension) - publishing.publications(new Action() { - @Override - void execute(PublicationContainer publications) { - publications.withType(MavenPublication) { MavenPublication publication -> - if (!project.state.executed) { - project.afterEvaluate(new Action() { - @Override - void execute(Project p) { - BaseContactPluginConfigurator.configureContacts(contactsPlugin, publication) - } - }) - } else { - BaseContactPluginConfigurator.configureContacts(contactsPlugin, publication) + project.plugins.withType(BaseContactsPlugin).configureEach { + BaseContactsPlugin contactsPlugin -> + PublishingExtension publishing = project.extensions.getByType(PublishingExtension) + publishing.publications(new Action() { + @Override + void execute(PublicationContainer publications) { + publications.withType(MavenPublication) { MavenPublication publication -> + if (!project.state.executed) { + project.afterEvaluate(new Action() { + @Override + void execute(Project p) { + BaseContactPluginConfigurator.configureContacts(contactsPlugin, publication) + } + }) + } else { + BaseContactPluginConfigurator.configureContacts(contactsPlugin, publication) + } } } - } - }) + }) } } } diff --git a/src/test/groovy/nebula/plugin/publishing/ManifestElementNameGeneratorSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ManifestElementNameGeneratorSpec.groovy index fe4115aa..ac539da7 100644 --- a/src/test/groovy/nebula/plugin/publishing/ManifestElementNameGeneratorSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ManifestElementNameGeneratorSpec.groovy @@ -19,7 +19,7 @@ import nebula.test.PluginProjectSpec import spock.lang.Unroll class ManifestElementNameGeneratorSpec extends PluginProjectSpec { - String pluginName = 'nebula.ivy-manifest' + String pluginName = 'com.netflix.nebula.ivy-manifest' @Unroll def 'name conversions from #manifestName to #convertedName'() { diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyBasePublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyBasePublishPluginIntegrationSpec.groovy index e4336991..d0cf01b2 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyBasePublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyBasePublishPluginIntegrationSpec.groovy @@ -29,8 +29,8 @@ class IvyBasePublishPluginIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ plugins { - id 'nebula.ivy-base-publish' - id 'nebula.ivy-nebula-publish' + id 'com.netflix.nebula.ivy-base-publish' + id 'com.netflix.nebula.ivy-nebula-publish' } version = '0.1.0' diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyCompileOnlyPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyCompileOnlyPluginIntegrationSpec.groovy index 95d38dab..b03806d3 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyCompileOnlyPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyCompileOnlyPluginIntegrationSpec.groovy @@ -25,8 +25,8 @@ class IvyCompileOnlyPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.ivy-nebula-publish' - id 'nebula.ivy-compile-only' + id 'com.netflix.nebula.ivy-nebula-publish' + id 'com.netflix.nebula.ivy-compile-only' } version = '0.1.0' diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyExcludesPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyExcludesPluginIntegrationSpec.groovy index 013e35cd..ef84d2f7 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyExcludesPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyExcludesPluginIntegrationSpec.groovy @@ -26,7 +26,7 @@ class IvyExcludesPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.ivy-nebula-publish' + id 'com.netflix.nebula.ivy-nebula-publish' } version = '0.1.0' diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyManifestPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyManifestPluginIntegrationSpec.groovy index 77139d8f..8ce4be35 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyManifestPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyManifestPluginIntegrationSpec.groovy @@ -23,8 +23,8 @@ class IvyManifestPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.ivy-manifest' - id 'nebula.ivy-nebula-publish' + id 'com.netflix.nebula.ivy-manifest' + id 'com.netflix.nebula.ivy-nebula-publish' } version = '0.1.0' @@ -50,7 +50,7 @@ class IvyManifestPluginIntegrationSpec extends IntegrationTestKitSpec { def 'manifest created'() { buildFile << '''\ apply plugin: 'java' - apply plugin: 'nebula.info' + apply plugin: 'com.netflix.nebula.info' ''' when: diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaShadowJarPublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaShadowJarPublishPluginIntegrationSpec.groovy index 0fcf843c..54f80e8c 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaShadowJarPublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaShadowJarPublishPluginIntegrationSpec.groovy @@ -24,7 +24,7 @@ class IvyNebulaShadowJarPublishPluginIntegrationSpec extends IntegrationTestKitS keepFiles = true buildFile << """\ plugins { - id 'nebula.ivy-publish' + id 'com.netflix.nebula.ivy-publish' id "com.github.johnrengelman.shadow" version "7.1.0" id 'java' id "nebula.info" version "11.0.1" diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy index 4f536116..a5d72796 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy @@ -23,7 +23,7 @@ class IvyNebulaSpringBootPublishPluginIntegrationSpec extends IntegrationTestKit keepFiles = true buildFile << """\ plugins { - id 'nebula.ivy-publish' + id 'com.netflix.nebula.ivy-publish' id 'org.springframework.boot' version '2.5.6' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/IvyPublishNonJavaIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/IvyPublishNonJavaIntegrationSpec.groovy index e1c0a6f6..04ff49cb 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/IvyPublishNonJavaIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/IvyPublishNonJavaIntegrationSpec.groovy @@ -28,7 +28,7 @@ class IvyPublishNonJavaIntegrationSpec extends IntegrationTestKitSpec { """.stripIndent() buildFile << """\ plugins { - id 'nebula.ivy-publish' + id 'com.netflix.nebula.ivy-publish' } group = 'test.nebula' diff --git a/src/test/groovy/nebula/plugin/publishing/ivy/interaction/IvyPublishRecommenderInteractionSpec.groovy b/src/test/groovy/nebula/plugin/publishing/ivy/interaction/IvyPublishRecommenderInteractionSpec.groovy index 2e8e1ffd..70a438c0 100644 --- a/src/test/groovy/nebula/plugin/publishing/ivy/interaction/IvyPublishRecommenderInteractionSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/ivy/interaction/IvyPublishRecommenderInteractionSpec.groovy @@ -19,8 +19,8 @@ class IvyPublishRecommenderInteractionSpec extends IntegrationTestKitSpec { buildFile << """\ plugins { id 'java-library' - id 'nebula.ivy-publish' - id 'nebula.dependency-recommender' version '9.0.1' + id 'com.netflix.nebula.ivy-publish' + id 'com.netflix.nebula.dependency-recommender' version '12.0.0' } group = 'test.nebula' @@ -73,8 +73,8 @@ class IvyPublishRecommenderInteractionSpec extends IntegrationTestKitSpec { buildFile << """\ plugins { id 'java' - id 'nebula.ivy-publish' - id 'nebula.dependency-recommender' version '9.0.1' + id 'com.netflix.nebula.ivy-publish' + id 'com.netflix.nebula.dependency-recommender' version '12.0.0' } group = 'test.nebula' diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenBasePublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenBasePublishPluginIntegrationSpec.groovy index f8619920..5c6e2497 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenBasePublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenBasePublishPluginIntegrationSpec.groovy @@ -26,8 +26,8 @@ class MavenBasePublishPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.maven-base-publish' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-base-publish' + id 'com.netflix.nebula.maven-nebula-publish' } version = '0.1.0' diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenDeveloperPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenDeveloperPluginIntegrationSpec.groovy index b8abf23e..7e9f8a6d 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenDeveloperPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenDeveloperPluginIntegrationSpec.groovy @@ -22,8 +22,8 @@ class MavenDeveloperPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.maven-developer' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-developer' + id 'com.netflix.nebula.maven-nebula-publish' } version = '0.1.0' @@ -37,7 +37,7 @@ class MavenDeveloperPluginIntegrationSpec extends IntegrationTestKitSpec { def 'take info from contacts plugin and place in pom'() { buildFile << '''\ - apply plugin: 'nebula.contacts' + apply plugin: 'com.netflix.nebula.contacts' contacts { 'nebula@example.test' { @@ -65,7 +65,7 @@ class MavenDeveloperPluginIntegrationSpec extends IntegrationTestKitSpec { def 'multiple contacts'() { buildFile << '''\ - apply plugin: 'nebula.contacts' + apply plugin: 'com.netflix.nebula.contacts' contacts { 'nebula1@example.test' { @@ -91,7 +91,7 @@ class MavenDeveloperPluginIntegrationSpec extends IntegrationTestKitSpec { def 'single role is found in pom'() { buildFile << '''\ - apply plugin: 'nebula.contacts' + apply plugin: 'com.netflix.nebula.contacts' contacts { 'nebula@example.test' { @@ -112,7 +112,7 @@ class MavenDeveloperPluginIntegrationSpec extends IntegrationTestKitSpec { def 'multiple roles found in pom for singular developer'() { buildFile << '''\ - apply plugin: 'nebula.contacts' + apply plugin: 'com.netflix.nebula.contacts' contacts { 'nebula@example.test' { diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenExcludesPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenExcludesPluginIntegrationSpec.groovy index 61c7f388..f99f5430 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenExcludesPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenExcludesPluginIntegrationSpec.groovy @@ -24,7 +24,7 @@ class MavenExcludesPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-nebula-publish' } version = '0.1.0' diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenManifestPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenManifestPluginIntegrationSpec.groovy index 23dee513..9dd5e813 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenManifestPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenManifestPluginIntegrationSpec.groovy @@ -21,8 +21,8 @@ class MavenManifestPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.maven-manifest' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-manifest' + id 'com.netflix.nebula.maven-nebula-publish' } version = '0.1.0' @@ -37,7 +37,7 @@ class MavenManifestPluginIntegrationSpec extends IntegrationTestKitSpec { def 'manifest created'() { buildFile << '''\ apply plugin: 'java' - apply plugin: 'nebula.info' + apply plugin: 'com.netflix.nebula.info' ''' when: diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaShadowJarPublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaShadowJarPublishPluginIntegrationSpec.groovy index 00eec7d5..da5a5dfe 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaShadowJarPublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaShadowJarPublishPluginIntegrationSpec.groovy @@ -24,7 +24,7 @@ class MavenNebulaShadowJarPublishPluginIntegrationSpec extends IntegrationTestKi keepFiles = true buildFile << """\ plugins { - id 'nebula.maven-publish' + id 'com.netflix.nebula.maven-publish' id "com.github.johnrengelman.shadow" version "7.1.0" id 'java' id "nebula.info" version "11.0.1" diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaSpringBootPublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaSpringBootPublishPluginIntegrationSpec.groovy index 6def8447..b2af3714 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaSpringBootPublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenNebulaSpringBootPublishPluginIntegrationSpec.groovy @@ -23,12 +23,12 @@ class MavenNebulaSpringBootPublishPluginIntegrationSpec extends IntegrationTest keepFiles = true buildFile << """\ plugins { - id 'nebula.maven-publish' + id 'com.netflix.nebula.maven-publish' id 'org.springframework.boot' version '2.5.6' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' - id "nebula.info" version "11.0.1" - id "nebula.contacts" version "6.0.0" + id "com.netflix.nebula.info" version "12.0.0" + id "com.netflix.nebula.contacts" version "6.0.0" } contacts { diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishNonJavaIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishNonJavaIntegrationSpec.groovy index 214ed7bb..70b23195 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishNonJavaIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishNonJavaIntegrationSpec.groovy @@ -28,7 +28,7 @@ class MavenPublishNonJavaIntegrationSpec extends IntegrationTestKitSpec { """.stripIndent() buildFile << """\ plugins { - id 'nebula.maven-publish' + id 'com.netflix.nebula.maven-publish' } group = 'test.nebula' diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishPluginIntegrationSpec.groovy index ffd04fcd..45308d91 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenPublishPluginIntegrationSpec.groovy @@ -27,7 +27,7 @@ class MavenPublishPluginIntegrationSpec extends IntegrationTestKitSpec { keepFiles = true buildFile << """\ plugins { - id 'nebula.maven-publish' + id 'com.netflix.nebula.maven-publish' } version = '0.1.0' @@ -63,8 +63,8 @@ class MavenPublishPluginIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.contacts' - apply plugin: 'nebula.info' + apply plugin: 'com.netflix.nebula.contacts' + apply plugin: 'com.netflix.nebula.info' repositories { maven { url '${mavenrepo.absolutePath}' } @@ -115,8 +115,8 @@ class MavenPublishPluginIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.contacts' - apply plugin: 'nebula.info' + apply plugin: 'com.netflix.nebula.contacts' + apply plugin: 'com.netflix.nebula.info' repositories { maven { url '${mavenrepo.absolutePath}' } diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenResolvedDependenciesPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenResolvedDependenciesPluginIntegrationSpec.groovy index acaeb7a9..82c6dcb1 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenResolvedDependenciesPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenResolvedDependenciesPluginIntegrationSpec.groovy @@ -28,8 +28,8 @@ class MavenResolvedDependenciesPluginIntegrationSpec extends IntegrationTestKitS debug = true buildFile << """\ plugins { - id 'nebula.maven-resolved-dependencies' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-resolved-dependencies' + id 'com.netflix.nebula.maven-nebula-publish' } version = '0.1.0' @@ -154,12 +154,12 @@ class MavenResolvedDependenciesPluginIntegrationSpec extends IntegrationTestKitS buildFile.text = """\ plugins { - id 'nebula.maven-resolved-dependencies' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-resolved-dependencies' + id 'com.netflix.nebula.maven-nebula-publish' } allprojects { apply plugin: 'java' - apply plugin: 'nebula.maven-resolved-dependencies' + apply plugin: 'com.netflix.nebula.maven-resolved-dependencies' version = '0.1.0' group = 'test.nebula' @@ -218,10 +218,10 @@ class MavenResolvedDependenciesPluginIntegrationSpec extends IntegrationTestKitS def 'works with java-library plugin and dependency-recommender'() { buildFile.text = '''\ plugins { - id 'nebula.maven-resolved-dependencies' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-resolved-dependencies' + id 'com.netflix.nebula.maven-nebula-publish' id 'java-library' - id 'nebula.dependency-recommender' version '9.0.1' + id 'com.netflix.nebula.dependency-recommender' version '12.0.0' } version = '0.1.0' diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginIntegrationSpec.groovy index 56a99620..4bcc4a73 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginIntegrationSpec.groovy @@ -21,8 +21,8 @@ class MavenScmPluginIntegrationSpec extends IntegrationTestKitSpec { def setup() { buildFile << """\ plugins { - id 'nebula.maven-scm' - id 'nebula.maven-nebula-publish' + id 'com.netflix.nebula.maven-scm' + id 'com.netflix.nebula.maven-nebula-publish' } version = '0.1.0' @@ -36,7 +36,7 @@ class MavenScmPluginIntegrationSpec extends IntegrationTestKitSpec { def 'scm info is present in pom'() { buildFile << """ - apply plugin: 'nebula.info' + apply plugin: 'com.netflix.nebula.info' """.stripIndent() when: diff --git a/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginSpec.groovy index 54bef051..cacb992c 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/MavenScmPluginSpec.groovy @@ -21,7 +21,7 @@ import org.gradle.api.logging.Logger import spock.lang.Unroll class MavenScmPluginSpec extends PluginProjectSpec { - String pluginName = 'nebula.maven-scm' + String pluginName = 'com.netflix.nebula.maven-scm' @Unroll def 'test scm pattern #scmOrigin'() { diff --git a/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginIntegrationSpec.groovy index 02279249..35c61deb 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginIntegrationSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginIntegrationSpec.groovy @@ -23,7 +23,7 @@ class MavenApacheLicensePluginIntegrationSpec extends IntegrationTestKitSpec { keepFiles = true buildFile << """ plugins { - id 'nebula.maven-apache-license' + id 'com.netflix.nebula.maven-apache-license' id 'java-gradle-plugin' id 'com.gradle.plugin-publish' version "0.10.0" id 'maven-publish' diff --git a/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginSpec.groovy b/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginSpec.groovy index 0e8452a7..fa069632 100644 --- a/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/publishing/maven/license/MavenApacheLicensePluginSpec.groovy @@ -18,5 +18,5 @@ package nebula.plugin.publishing.maven.license import nebula.test.PluginProjectSpec class MavenApacheLicensePluginSpec extends PluginProjectSpec { - String pluginName = 'nebula.maven-apache-license' + String pluginName = 'com.netflix.nebula.maven-apache-license' }