diff --git a/build.gradle.kts b/build.gradle.kts index 5325576..651c8fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,7 +107,7 @@ gradlePlugin { create("com.netflix.nebula.resolve") { id = "com.netflix.nebula.resolve" displayName = "Nebula Dependency Resolve Plugin" - description = "Used to trigger dependency resolution on all configurations of all projects" + description = "Nebula OSS Internal use ONLY" implementationClass = "com.netflix.nebula.convention.ResolvePlugin" tags.set(listOf("nebula")) compatibility { @@ -119,7 +119,7 @@ gradlePlugin { create("com.netflix.nebula.locks") { id = "com.netflix.nebula.locks" displayName = "Nebula Dependency Locks Plugin" - description = "opinionated dependency locking for nebula projects" + description = "Nebula OSS Internal use ONLY" implementationClass = "com.netflix.nebula.convention.DependencyLockingPlugin" tags.set(listOf("nebula")) compatibility { diff --git a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy index 2534c74..fd9cb94 100644 --- a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy +++ b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy @@ -76,8 +76,7 @@ class NebulaPluginPlugin implements Plugin { project.group = 'com.netflix.nebula' project.afterEvaluate { - if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks") && - !project.pluginManager.hasPlugin("com.netflix.nebula.dependency-lock")){ + if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks")) { Problem problem = problems.reporter.create(NebulaProblems.OSS_SETTINGS) { it.details("locking convention is not found. using com.netflix.nebula.plugin-plugin without the oss.settings plugin is deprecated") it.solution("apply the 'com.netflix.nebula.oss.settings' plugin in settings.gradle.kts") diff --git a/src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt b/src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt index 369f144..5275055 100644 --- a/src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt +++ b/src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt @@ -28,9 +28,7 @@ class NebulaSettingsPlugin : Plugin { } settings.gradle.allprojects { pluginManager.apply("com.netflix.nebula.resolve") - pluginManager.apply("com.netflix.nebula.dependency-lock") - // TODO discuss replacing OSS deplock plugin with internal convention plugin - // pluginManager.apply("com.netflix.nebula.locks") + pluginManager.apply("com.netflix.nebula.locks") } } } \ No newline at end of file diff --git a/src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt b/src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt index eb6a600..0101fda 100644 --- a/src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt +++ b/src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt @@ -143,9 +143,6 @@ class NebulaSettingsPluginTest { properties { buildCache(true) configurationCache(true) - - // will no longer be needed when we switch to internal convention plugin - property("systemProp.nebula.features.coreLockingSupport","true") } settings { plugins {