Move to com.netflix namespace for plugin id

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
+}

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

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

src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt

@@ -200,7 +200,7 @@ class DependencyLockPlugin : Plugin<Project> {
         }
 
         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<Project> {
     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 {

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()

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}

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()

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()