From 14d29498401fa6a2ec30e9e9cbc40dfcb01275ee Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Mon, 10 Oct 2022 15:32:00 -0700 Subject: [PATCH] Move to com.netflix namespace for plugin id --- build.gradle | 10 ++- gradle.lockfile | 28 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../dependencylock/DependencyLockPlugin.kt | 6 +- .../AbstractDependencyLockPluginSpec.groovy | 4 +- ...DependencyLockAlignmentLauncherSpec.groovy | 18 +++--- .../DependencyLockCommitLauncherSpec.groovy | 18 +++--- ...dencyLockConfigurationAvoidanceSpec.groovy | 6 +- .../DependencyLockLauncherSpec.groovy | 64 +++++++++---------- .../DependencyLockPluginSpec.groovy | 4 +- .../DependencyLockPluginWithCoreSpec.groovy | 48 +++++++------- ...dencyLockPluginWithCoreVerifierSpec.groovy | 12 ++-- .../GlobalLockLauncherSpec.groovy | 2 +- .../PathAwareDependencyDiffSpec.groovy | 34 +++++----- .../ResolutionRulesLockabilitySpec.groovy | 16 ++--- ...ndDependencyLockingFeatureFlagsSpec.groovy | 2 +- .../dependencyfixture/WrapperPlugin.groovy | 2 +- .../tasks/MigrateToCoreLocksTaskSpec.groovy | 32 +++++----- .../UpdateDependenciesValidatorSpec.groovy | 2 +- .../DependencyResolutionVerifierTest.groovy | 20 +++--- 20 files changed, 167 insertions(+), 163 deletions(-) diff --git a/build.gradle b/build.gradle index 25d1889d..576fff00 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ import org.gradle.util.GradleVersion plugins { id 'nebula.plugin-plugin' version '17.1.0' id 'nebula.optional-base' version '3.1.0' - id "org.jetbrains.kotlin.jvm" version "1.5.30" + id "org.jetbrains.kotlin.jvm" version "1.7.20" id 'java-gradle-plugin' id "org.gradle.test-retry" version "1.3.1" } @@ -36,7 +36,7 @@ contacts { } dependencies { - implementation 'com.squareup.moshi:moshi:1.+' + implementation 'com.squareup.moshi:moshi:1.12.+' implementation 'joda-time:joda-time:2.10' implementation 'com.netflix.nebula:nebula-gradle-interop:latest.release' implementation 'com.netflix.nebula:gradle-scm-plugin:latest.release' @@ -60,7 +60,7 @@ dependencies { gradlePlugin { plugins { dependencyLock { - id = 'nebula.dependency-lock' + id = 'com.netflix.nebula.dependency-lock' displayName = 'Nebula Dependency Lock plugin' implementationClass = 'nebula.plugin.dependencylock.DependencyLockPlugin' description = 'Plugin to lock dynamic dependencies' @@ -135,3 +135,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { tasks.withType(GenerateModuleMetadata).configureEach { suppressedValidationErrors.add('enforced-platform') } + +javaCrossCompile { + disableKotlinSupport = true +} \ No newline at end of file diff --git a/gradle.lockfile b/gradle.lockfile index 39e582c6..a82d37c5 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -12,7 +12,7 @@ com.github.jknack:handlebars:4.0.6=integTestCompileClasspath,integTestRuntimeCla com.github.stefanbirkner:system-rules:1.19.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.tomakehurst:wiremock:2.17.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:20.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.googlecode.javaewah:JavaEWAH:1.1.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.googlecode.javaewah:JavaEWAH:1.1.13=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.connector-factory:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.core:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath @@ -22,14 +22,14 @@ com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,t com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-contacts-plugin:5.1.0=integTestRuntimeClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-git-scm-plugin:5.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-info-plugin:9.1.2=integTestRuntimeClasspath,testRuntimeClasspath -com.netflix.nebula:gradle-scm-plugin:6.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-contacts-plugin:7.0.0=integTestRuntimeClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-git-scm-plugin:6.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-info-plugin:12.0.0=integTestRuntimeClasspath,testRuntimeClasspath +com.netflix.nebula:gradle-scm-plugin:7.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.nebula:nebula-dependencies-comparison:0.2.1=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-project-plugin:9.1.6=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:nebula-publishing-plugin:17.3.2=integTestRuntimeClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-project-plugin:10.0.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-publishing-plugin:19.0.0=integTestRuntimeClasspath,testRuntimeClasspath com.netflix.nebula:nebula-test:10.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.12.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,8 +42,8 @@ javax.servlet:javax.servlet-api:3.1.0=integTestCompileClasspath,integTestRuntime joda-time:joda-time:2.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit-dep:4.11=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:4.1.0=integTestRuntimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:4.1.0=integTestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:platform:3.4.0=integTestRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.minidev:json-smart:2.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -66,13 +66,13 @@ org.eclipse.jetty:jetty-servlets:9.2.24.v20180105=integTestCompileClasspath,inte org.eclipse.jetty:jetty-util:9.2.24.v20180105=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-webapp:9.2.24.v20180105=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-xml:9.2.24.v20180105=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684..ae04661e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt b/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt index cad86bcc..daca6ea0 100644 --- a/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt +++ b/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt @@ -200,7 +200,7 @@ class DependencyLockPlugin : Plugin { } lockUsed = dependenciesLock.name - reasons.add("nebula.dependency-lock locked with: $lockUsed") + reasons.add("com.netflix.nebula.dependency-lock locked with: $lockUsed") if (!DependencyLockTaskConfigurer.shouldIgnoreDependencyLock(project)) { val taskNames = project.gradle.startParameter.taskNames @@ -297,11 +297,11 @@ class DependencyLockPlugin : Plugin { private fun applyOverrides(conf: Configuration, overrides: Map<*, *>) { if (project.hasProperty(OVERRIDE_FILE)) { LOGGER.info("Using override file ${project.property(OVERRIDE_FILE)} to lock dependencies") - reasons.add("nebula.dependency-lock using override file: ${project.property(OVERRIDE_FILE)}") + reasons.add("com.netflix.nebula.dependency-lock using override file: ${project.property(OVERRIDE_FILE)}") } if (project.hasProperty(OVERRIDE)) { LOGGER.info("Using command line overrides ${project.property(OVERRIDE)}") - reasons.add("nebula.dependency-lock using override: ${project.property(OVERRIDE)}") + reasons.add("com.netflix.nebula.dependency-lock using override: ${project.property(OVERRIDE)}") } val overrideDeps = overrides.map { diff --git a/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy index f17adc55..1bcf5481 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy @@ -52,7 +52,7 @@ class AbstractDependencyLockPluginSpec extends IntegrationTestKitSpec { buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -71,7 +71,7 @@ class AbstractDependencyLockPluginSpec extends IntegrationTestKitSpec { buildFile << """ plugins { id 'scala' - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } repositories { mavenCentral() diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy index f2366365..add3df69 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy @@ -46,8 +46,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec { } } - apply plugin: 'nebula.dependency-lock' - apply plugin: 'nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' apply plugin: 'java' repositories { @@ -111,8 +111,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec { } } - apply plugin: 'nebula.resolution-rules' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { @@ -179,8 +179,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec { classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:latest.release' } } - apply plugin: 'nebula.resolution-rules' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} @@ -237,8 +237,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec { classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:latest.release' } } - apply plugin: 'nebula.dependency-lock' - apply plugin: 'nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} @@ -289,7 +289,7 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec { // note: this is a more unusual case. Typically resolution rules are distributed like a library, version controlled, and locked like other dependencies def (GradleDependencyGenerator mavenrepo, File rulesJsonFile) = dependencyLockAlignInteractionSetupWithUnlockedResolutionRulesConfiguration() buildFile << """\ - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy index c599e72a..a71ee2a9 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy @@ -46,7 +46,7 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec { def 'commitLock no-ops when no scm implementation is applied'() { buildFile << DependencyLockLauncherSpec.BUILD_GRADLE - buildFile << 'apply plugin: \'nebula.gradle-scm\'' + buildFile << 'apply plugin: \'com.netflix.nebula.gradle-scm\'' when: def result = runTasks('generateLock', 'saveLock', 'commitLock') @@ -61,7 +61,7 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec { def git = commonGitSetup(gitDir) buildFile << DependencyLockLauncherSpec.BUILD_GRADLE - buildFile << 'apply plugin: \'nebula.gradle-git-scm\'' + buildFile << 'apply plugin: \'com.netflix.nebula.gradle-git-scm\'' finishGitSetup(['build.gradle', 'settings.gradle']) @@ -85,8 +85,8 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec { buildFile << """\ subprojects { apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' - apply plugin: 'nebula.gradle-scm' + apply plugin: 'com.netflix.nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.gradle-scm' repositories { maven { url '${Fixture.repo}' } } } """.stripIndent() @@ -127,8 +127,8 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec { buildFile << """\ subprojects { apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' - apply plugin: 'nebula.gradle-git-scm' + apply plugin: 'com.netflix.nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.gradle-git-scm' repositories { maven { url '${Fixture.repo}' } } } """.stripIndent() @@ -171,11 +171,11 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec { sub2.mkdirs() buildFile << """\ - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' subprojects { apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' - apply plugin: 'nebula.gradle-git-scm' + apply plugin: 'com.netflix.nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.gradle-git-scm' repositories { maven { url '${Fixture.repo}' } } } """.stripIndent() diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockConfigurationAvoidanceSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockConfigurationAvoidanceSpec.groovy index 093d1641..1b8508ca 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockConfigurationAvoidanceSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockConfigurationAvoidanceSpec.groovy @@ -15,7 +15,7 @@ class DependencyLockConfigurationAvoidanceSpec extends IntegrationTestKitSpec { given: buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } """.stripIndent() @@ -38,9 +38,9 @@ class DependencyLockConfigurationAvoidanceSpec extends IntegrationTestKitSpec { given: buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' - id 'nebula.gradle-scm' + id 'com.netflix.nebula.gradle-scm' } """.stripIndent() diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockLauncherSpec.groovy index 14dfc54f..6aa93993 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockLauncherSpec.groovy @@ -44,7 +44,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { static final String SPECIFIC_BUILD_GRADLE = """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencies { implementation 'test.example:foo:1.0.1' @@ -54,7 +54,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { static final String BUILD_GRADLE = """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencies { implementation 'test.example:foo:1.+' @@ -63,7 +63,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { static final String NEW_BUILD_GRADLE = """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencies { implementation 'test.example:foo:2.+' @@ -158,14 +158,14 @@ class DependencyLockLauncherSpec extends IntegrationSpec { then: fooResult.standardOutput.contains 'locked to 1.0.0' - fooResult.standardOutput.contains('nebula.dependency-lock locked with: dependencies.lock') + fooResult.standardOutput.contains('com.netflix.nebula.dependency-lock locked with: dependencies.lock') when: def bazResult = runTasksSuccessfully('dependencyInsight', '--configuration', 'compileClasspath', '--dependency', 'baz') then: !bazResult.standardOutput.contains('locked') - !bazResult.standardOutput.contains('nebula.dependency-lock locked with: dependencies.lock') + !bazResult.standardOutput.contains('com.netflix.nebula.dependency-lock locked with: dependencies.lock') bazResult.standardOutput.contains('baz:1.0.0') } @@ -185,16 +185,16 @@ class DependencyLockLauncherSpec extends IntegrationSpec { then: fooResult.standardOutput.contains 'locked to 2.0.0' - fooResult.standardOutput.contains('nebula.dependency-lock locked with: dependencies.lock') - fooResult.standardOutput.contains('nebula.dependency-lock using override file: override.lock') + fooResult.standardOutput.contains('com.netflix.nebula.dependency-lock locked with: dependencies.lock') + fooResult.standardOutput.contains('com.netflix.nebula.dependency-lock using override file: override.lock') when: def bazResult = runTasksSuccessfully('dependencyInsight', '--configuration', 'compileClasspath', '--dependency', 'baz', '-PdependencyLock.overrideFile=override.lock') then: !bazResult.standardOutput.contains('locked') - !bazResult.standardOutput.contains('nebula.dependency-lock locked with: dependencies.lock') - !bazResult.standardOutput.contains('nebula.dependency-lock using override file: override.lock') + !bazResult.standardOutput.contains('com.netflix.nebula.dependency-lock locked with: dependencies.lock') + !bazResult.standardOutput.contains('com.netflix.nebula.dependency-lock using override file: override.lock') bazResult.standardOutput.contains('baz:1.0.0') } @@ -209,16 +209,16 @@ class DependencyLockLauncherSpec extends IntegrationSpec { then: fooResult.standardOutput.contains 'locked to 2.0.1' - fooResult.standardOutput.contains('nebula.dependency-lock locked with: dependencies.lock') - fooResult.standardOutput.contains('nebula.dependency-lock using override: test.example:foo:2.0.1') + fooResult.standardOutput.contains('com.netflix.nebula.dependency-lock locked with: dependencies.lock') + fooResult.standardOutput.contains('com.netflix.nebula.dependency-lock using override: test.example:foo:2.0.1') when: def bazResult = runTasksSuccessfully('dependencyInsight', '--configuration', 'compileClasspath', '--dependency', 'baz', '-PdependencyLock.override=test.example:foo:2.0.1') then: !bazResult.standardOutput.contains('locked') - !bazResult.standardOutput.contains('nebula.dependency-lock locked with: dependencies.lock') - !bazResult.standardOutput.contains('nebula.dependency-lock using override: test.example:foo:2.0.1') + !bazResult.standardOutput.contains('com.netflix.nebula.dependency-lock locked with: dependencies.lock') + !bazResult.standardOutput.contains('com.netflix.nebula.dependency-lock using override: test.example:foo:2.0.1') bazResult.standardOutput.contains('baz:1.0.0') } @@ -388,7 +388,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { def 'create lock with skipped dependencies'() { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencyLock { skippedDependencies = [ 'test.example:foo' ] @@ -614,7 +614,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { buildFile << """\ subprojects { apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } } """.stripIndent() @@ -1153,7 +1153,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { def 'only the update dependency and its transitives are updated'() { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencyLock { includeTransitives = true @@ -1210,7 +1210,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { def 'only the update dependency, its transitives and dependencies without requested versions are updated'() { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencyLock { includeTransitives = true @@ -1435,7 +1435,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { dependenciesLock << FOO_LOCK buildFile << """ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencies { implementation 'test.example:foo:1.+' @@ -1469,7 +1469,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { dependenciesLock << FOO_LOCK buildFile << """ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencies { implementation 'test.example:foo:1.+' @@ -1491,7 +1491,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { dependenciesLock << FOO_LOCK buildFile << """ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } dependencies { implementation 'test.example:foo:1.+' @@ -1519,8 +1519,8 @@ class DependencyLockLauncherSpec extends IntegrationSpec { } } - apply plugin: 'nebula.dependency-lock' - apply plugin: 'nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' apply plugin: 'java' repositories { @@ -1559,7 +1559,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { } apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'spring-boot' repositories { @@ -1605,7 +1605,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { } } - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'com.android.application' repositories { @@ -1705,7 +1705,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { buildFile << """\ allprojects { - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' } subprojects { @@ -1729,7 +1729,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { buildFile << """\ allprojects { - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' dependencyLock { skippedConfigurationNamesPrefixes = ['spotless'] } @@ -1836,7 +1836,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { } group = 'example.nebula' version = '1.1.0' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { ${generator.mavenRepositoryBlock} @@ -1882,7 +1882,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { } group = 'example.nebula' version = '1.1.0' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { ${generator.mavenRepositoryBlock} @@ -2029,7 +2029,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { plugins { id 'java' } - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { ${generator.mavenRepositoryBlock} @@ -2064,7 +2064,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { plugins { id 'java' } - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { ${generator.mavenRepositoryBlock} @@ -2168,7 +2168,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${repo.absolutePath}' } } dependencies { implementation($platformType('sample:recommender:1.1')) @@ -2194,7 +2194,7 @@ class DependencyLockLauncherSpec extends IntegrationSpec { buildFile << """\ apply plugin: 'java' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${Fixture.repo}' } } repositories { flatDir { dirs 'libs' } } dependencies { diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginSpec.groovy index 0f560432..3e949c37 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginSpec.groovy @@ -23,7 +23,7 @@ import org.gradle.api.artifacts.Configuration import org.gradle.testfixtures.ProjectBuilder class DependencyLockPluginSpec extends ProjectSpec { - String pluginName = 'nebula.dependency-lock' + String pluginName = 'com.netflix.nebula.dependency-lock' def setupSpec() { Fixture.createFixtureIfNotCreated() @@ -439,7 +439,7 @@ class DependencyLockPluginSpec extends ProjectSpec { '''.stripIndent() project.allprojects { - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' } when: diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy index 9b120ff0..51544c55 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy @@ -62,7 +62,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec // update build file, so it no longer matches locks buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -92,7 +92,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'com.github.johnrengelman.shadow' version '5.0.0' } @@ -164,7 +164,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'com.github.johnrengelman.shadow' version '5.0.0' } @@ -198,7 +198,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'jacoco' } @@ -244,7 +244,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'jacoco' } @@ -296,7 +296,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec addSubproject("sub1", """ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -310,7 +310,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec addSubproject("sub2", """ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -370,7 +370,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec buildFile.createNewFile() buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'nebula.kotlin' version '1.3.41' } repositories { @@ -422,7 +422,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec buildFile.createNewFile() buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } allprojects { task dependenciesForAll(type: DependencyReportTask) {} @@ -435,7 +435,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec addSubproject("sub1", """ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'nebula.kotlin' version '1.3.41' } dependencies { @@ -482,7 +482,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec buildFile.createNewFile() buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.clojure" version "9.4.3" } repositories { @@ -546,10 +546,10 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec def plugins = languagePluginFirst ? """ apply plugin: '$languagePlugin' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' """.stripIndent() : """ - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: '$languagePlugin' """.stripIndent() @@ -624,7 +624,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'jacoco' } @@ -738,7 +738,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -798,7 +798,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec definePluginOutsideOfPluginBlock = true buildFile.text = """\ allprojects { - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} @@ -889,7 +889,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec } } plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } apply plugin: '$plugin' @@ -955,7 +955,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -1025,7 +1025,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } """ @@ -1048,7 +1048,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } """ @@ -1091,7 +1091,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } """ @@ -1110,7 +1110,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec given: buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } """ @@ -1130,7 +1130,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec } private static void assertFailureOccursAtPluginLevel(String text) { - assert text.contains("Failed to apply plugin [id 'nebula.dependency-lock']") || - text.contains("Failed to apply plugin 'nebula.dependency-lock'") + assert text.contains("Failed to apply plugin [id 'com.netflix.nebula.dependency-lock']") || + text.contains("Failed to apply plugin 'com.netflix.nebula.dependency-lock'") } } diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy index e40673f2..66b7bc49 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy @@ -441,7 +441,7 @@ empty=annotationProcessor,testAnnotationProcessor if (usesOwnBuildFile) { def subProjectBuildFileContent = """ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -460,7 +460,7 @@ empty=annotationProcessor,testAnnotationProcessor buildFile << """ subprojects { - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} @@ -554,7 +554,7 @@ empty=annotationProcessor,testAnnotationProcessor } } plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } apply plugin: 'nebula.kotlin' repositories { @@ -611,7 +611,7 @@ empty=annotationProcessor,testAnnotationProcessor } } plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } apply plugin: 'nebula.clojure' repositories { @@ -648,7 +648,7 @@ empty=annotationProcessor,testAnnotationProcessor if (languagePlugin == 'groovy') { buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'groovy' } @@ -656,7 +656,7 @@ empty=annotationProcessor,testAnnotationProcessor } else if (languagePlugin == 'java-library') { buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java-library' } """.stripIndent() diff --git a/src/test/groovy/nebula/plugin/dependencylock/GlobalLockLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/GlobalLockLauncherSpec.groovy index 910ab5b1..e559d4ed 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/GlobalLockLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/GlobalLockLauncherSpec.groovy @@ -54,7 +54,7 @@ class GlobalLockLauncherSpec extends IntegrationTestKitSpec { buildFile << """\ allprojects { - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' dependencyLock { includeTransitives = true } diff --git a/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy index 8b740e0c..c511118e 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy @@ -142,7 +142,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } apply plugin: 'java' @@ -257,8 +257,8 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' - id 'nebula.dependency-recommender' version '10.0.0' + id 'com.netflix.nebula.dependency-lock' + id 'com.netflix.nebula.dependency-recommender' version '12.0.0' } apply plugin: 'java' @@ -335,7 +335,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -443,7 +443,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -556,7 +556,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -630,7 +630,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -702,7 +702,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -779,7 +779,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -812,12 +812,12 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { new File("${projectDir}/gradle.properties").text = "systemProp.nebula.features.pathAwareDependencyDiff=true" buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } allprojects { apply plugin: 'java-library' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${repoDir.absolutePath}' } } group = 'test' @@ -943,12 +943,12 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { new File("${projectDir}/gradle.properties").text = "systemProp.nebula.features.pathAwareDependencyDiff=true" buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } allprojects { apply plugin: 'java-library' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.dependency-lock' repositories { maven { url '${repoDir.absolutePath}' } } group = 'test' @@ -987,7 +987,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { def dependenciesLock = new File(projectDir, 'dependencies.lock') buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } apply plugin: 'java' @@ -1034,7 +1034,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id "nebula.resolution-rules" version "9.0.0" } @@ -1100,7 +1100,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent()) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } apply plugin: 'java' @@ -1150,7 +1150,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { '''.stripIndent(), LockGenerator.DEFAULT_CONFIG_NAMES_POPULATED_BY_IMPLEMENTATION_SCOPE + ["notUsedConfigurationAnymore", "compileOnly"]) buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' } apply plugin: 'java' diff --git a/src/test/groovy/nebula/plugin/dependencylock/ResolutionRulesLockabilitySpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/ResolutionRulesLockabilitySpec.groovy index 1e191524..94747f85 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/ResolutionRulesLockabilitySpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/ResolutionRulesLockabilitySpec.groovy @@ -43,10 +43,10 @@ class ResolutionRulesLockabilitySpec extends IntegrationTestKitSpec { } } plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } - apply plugin: 'nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.resolution-rules' allprojects { repositories { mavenCentral() @@ -60,8 +60,8 @@ class ResolutionRulesLockabilitySpec extends IntegrationTestKitSpec { addSubproject('sub1', """ plugins { - id 'nebula.dependency-lock' - id 'nebula.resolution-rules' + id 'com.netflix.nebula.dependency-lock' + id 'com.netflix.nebula.resolution-rules' id 'java' } dependencies { @@ -71,8 +71,8 @@ class ResolutionRulesLockabilitySpec extends IntegrationTestKitSpec { addSubproject('sub2', """ plugins { - id 'nebula.dependency-lock' - id 'nebula.resolution-rules' + id 'com.netflix.nebula.dependency-lock' + id 'com.netflix.nebula.resolution-rules' id 'java' } dependencies { @@ -83,8 +83,8 @@ class ResolutionRulesLockabilitySpec extends IntegrationTestKitSpec { addSubproject('sub3', """ plugins { - id 'nebula.dependency-lock' - id 'nebula.resolution-rules' + id 'com.netflix.nebula.dependency-lock' + id 'com.netflix.nebula.resolution-rules' id 'java' } dependencies { diff --git a/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy index 9feb439e..14f40c97 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy @@ -83,7 +83,7 @@ class AbstractCachingAndDependencyLockingFeatureFlagsSpec extends IntegrationTes buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { diff --git a/src/test/groovy/nebula/plugin/dependencylock/dependencyfixture/WrapperPlugin.groovy b/src/test/groovy/nebula/plugin/dependencylock/dependencyfixture/WrapperPlugin.groovy index a9234976..073b2087 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/dependencyfixture/WrapperPlugin.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/dependencyfixture/WrapperPlugin.groovy @@ -27,7 +27,7 @@ class WrapperPlugin implements Plugin { @Override void apply(Project project) { project.with { - plugins.apply('nebula.dependency-lock') + plugins.apply('com.netflix.nebula.dependency-lock') plugins.withType(DependencyLockPlugin) { def extension = extensions.getByType(DependencyLockExtension) diff --git a/src/test/groovy/nebula/plugin/dependencylock/tasks/MigrateToCoreLocksTaskSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/tasks/MigrateToCoreLocksTaskSpec.groovy index 900c7d0c..c4741504 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/tasks/MigrateToCoreLocksTaskSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/tasks/MigrateToCoreLocksTaskSpec.groovy @@ -72,7 +72,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } @@ -276,7 +276,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { addSubproject('sub1', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -289,7 +289,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { addSubproject('sub2', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -352,7 +352,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { addSubproject('sub1', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -365,7 +365,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { addSubproject('sub2', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -441,7 +441,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { addSubproject('sub1', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -454,7 +454,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { addSubproject('sub2', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -570,7 +570,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { } } plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } apply plugin: '$plugin' @@ -661,7 +661,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { } } plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } apply plugin: '$plugin' @@ -725,7 +725,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'jacoco' } @@ -772,7 +772,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { buildFile.text = """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' id 'jacoco' } @@ -821,7 +821,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { given: buildFile.text = """ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -830,7 +830,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { """.stripIndent() addSubproject('sub1', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -842,7 +842,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { """.stripIndent()) addSubproject('sub2', """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -926,7 +926,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec { } private static void assertFailureOccursAtPluginLevel(String text) { - assert text.contains("Failed to apply plugin [id 'nebula.dependency-lock']") || - text.contains("Failed to apply plugin 'nebula.dependency-lock'") + assert text.contains("Failed to apply plugin [id 'com.netflix.nebula.dependency-lock']") || + text.contains("Failed to apply plugin 'com.netflix.nebula.dependency-lock'") } } diff --git a/src/test/groovy/nebula/plugin/dependencylock/validation/UpdateDependenciesValidatorSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/validation/UpdateDependenciesValidatorSpec.groovy index e78ad035..f3fdec18 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/validation/UpdateDependenciesValidatorSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/validation/UpdateDependenciesValidatorSpec.groovy @@ -7,7 +7,7 @@ import nebula.test.ProjectSpec class UpdateDependenciesValidatorSpec extends ProjectSpec { private static final HashMap emptyMap = new HashMap() private static final DependencyLockExtension extension = DependencyLockExtension.newInstance() - private static final String pluginName = 'nebula.dependency-lock' + private static final String pluginName = 'com.netflix.nebula.dependency-lock' def setup() { project.apply plugin: pluginName diff --git a/src/test/groovy/nebula/plugin/dependencyverifier/DependencyResolutionVerifierTest.groovy b/src/test/groovy/nebula/plugin/dependencyverifier/DependencyResolutionVerifierTest.groovy index e7984b1d..a10ca88d 100644 --- a/src/test/groovy/nebula/plugin/dependencyverifier/DependencyResolutionVerifierTest.groovy +++ b/src/test/groovy/nebula/plugin/dependencyverifier/DependencyResolutionVerifierTest.groovy @@ -540,7 +540,7 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { $configurationName 'not.available:a' } import nebula.plugin.dependencyverifier.DependencyResolutionVerifierExtension - plugins.withId('nebula.dependency-lock') { + plugins.withId('com.netflix.nebula.dependency-lock') { def extension = extensions.getByType(DependencyResolutionVerifierExtension.class) def list = new ArrayList<>() $extensionSetting @@ -861,7 +861,7 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { def extensionMessage = 'You may see this after changing from Nebula alignment to core Gradle alignment for the first time in this repository' buildFile << """ import nebula.plugin.dependencyverifier.DependencyResolutionVerifierExtension - plugins.withId('nebula.dependency-lock') { + plugins.withId('com.netflix.nebula.dependency-lock') { def extension = extensions.getByType(DependencyResolutionVerifierExtension.class) extension.resolvedVersionDoesNotEqualLockedVersionMessageAddition = '$extensionMessage' } @@ -1076,8 +1076,8 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:latest.release' } } - apply plugin: 'nebula.resolution-rules' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} @@ -1249,7 +1249,7 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { private void setupSingleProject() { buildFile << """\ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java-library' } repositories { @@ -1276,7 +1276,7 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { def subProjectBuildFileContent = """ plugins { - id 'nebula.dependency-lock' + id 'com.netflix.nebula.dependency-lock' id 'java' } repositories { @@ -1340,8 +1340,8 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:latest.release' } } - apply plugin: 'nebula.resolution-rules' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock} @@ -1380,8 +1380,8 @@ class DependencyResolutionVerifierTest extends IntegrationTestKitSpec { task dependenciesForAll(type: DependencyReportTask) {} } allprojects { - apply plugin: 'nebula.resolution-rules' - apply plugin: 'nebula.dependency-lock' + apply plugin: 'com.netflix.nebula.resolution-rules' + apply plugin: 'com.netflix.nebula.dependency-lock' apply plugin: 'java' repositories { ${mavenrepo.mavenRepositoryBlock}