Skip to content

Commit

Permalink
Move to com.netflix namespace for plugin id
Browse files Browse the repository at this point in the history
  • Loading branch information
@rpalcolea
rpalcolea committed Oct 10, 2022
1 parent 6b3d349 commit cc3845e
Show file tree
Hide file tree
Showing 27 changed files with 117 additions and 116 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.<publishing plugin of your choice>' version '17.0.0'
id 'com.netflix.nebula.<publishing plugin of your choice>' version '17.0.0'
}

If using an older version of Gradle
Expand Down Expand Up @@ -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' {
Expand Down Expand Up @@ -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
Expand Down
48 changes: 24 additions & 24 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
30 changes: 15 additions & 15 deletions gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/gradleTest/multiprojectpublish/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
35 changes: 18 additions & 17 deletions src/main/groovy/nebula/plugin/publishing/maven/MavenDeveloperPlugin.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,26 @@ class MavenDeveloperPlugin implements Plugin<Project> {
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<PublicationContainer>() {
@Override
void execute(PublicationContainer publications) {
publications.withType(MavenPublication) { MavenPublication publication ->
if (!project.state.executed) {
project.afterEvaluate(new Action<Project>() {
@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<PublicationContainer>() {
@Override
void execute(PublicationContainer publications) {
publications.withType(MavenPublication) { MavenPublication publication ->
if (!project.state.executed) {
project.afterEvaluate(new Action<Project>() {
@Override
void execute(Project p) {
BaseContactPluginConfigurator.configureContacts(contactsPlugin, publication)
}
})
} else {
BaseContactPluginConfigurator.configureContacts(contactsPlugin, publication)
}
}
}
}
})
})
}
}
}
2 changes: 1 addition & 1 deletion src/test/groovy/nebula/plugin/publishing/ManifestElementNameGeneratorSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'() {
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/nebula/plugin/publishing/ivy/IvyBasePublishPluginIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/nebula/plugin/publishing/ivy/IvyCompileOnlyPluginIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/nebula/plugin/publishing/ivy/IvyExcludesPluginIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/nebula/plugin/publishing/ivy/IvyManifestPluginIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...groovy/nebula/plugin/publishing/ivy/IvyNebulaShadowJarPublishPluginIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...roovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/nebula/plugin/publishing/ivy/IvyPublishNonJavaIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class IvyPublishNonJavaIntegrationSpec extends IntegrationTestKitSpec {
""".stripIndent()
buildFile << """\
plugins {
id 'nebula.ivy-publish'
id 'com.netflix.nebula.ivy-publish'
}
group = 'test.nebula'
Expand Down
Loading

0 comments on commit cc3845e

Please sign in to comment.