From c92c1b6caf1a101a849709d32772b472dc0e6ccf Mon Sep 17 00:00:00 2001
From: John Burns <wakingrufus@gmail.com>
Date: Wed, 5 Aug 2026 13:58:16 -0500
Subject: [PATCH] switch back to oss locking plugin (pending discussion)

---
 .../groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy  | 6 ++----
 .../netflix/nebula/oss/settings/NebulaSettingsPlugin.kt    | 4 +++-
 .../nebula/oss/settings/NebulaSettingsPluginTest.kt        | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy
index d70fbe7..2534c74 100644
--- a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy
+++ b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy
@@ -21,15 +21,12 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.problems.Problem
-import org.gradle.api.problems.ProblemId
 import org.gradle.api.problems.Problems
-import org.gradle.api.problems.Severity
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.testing.Test
-import org.gradle.internal.deprecation.DeprecationLogger
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JavaToolchainService
 import org.gradle.jvm.toolchain.JavaToolchainSpec
@@ -79,7 +76,8 @@ class NebulaPluginPlugin implements Plugin<Project> {
         project.group = 'com.netflix.nebula'
 
         project.afterEvaluate {
-            if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks")){
+            if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks") &&
+                    !project.pluginManager.hasPlugin("com.netflix.nebula.dependency-lock")){
                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 5275055..369f144 100644
--- a/src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt
+++ b/src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt
@@ -28,7 +28,9 @@ class NebulaSettingsPlugin : Plugin<Settings> {
         }
         settings.gradle.allprojects {
             pluginManager.apply("com.netflix.nebula.resolve")
-            pluginManager.apply("com.netflix.nebula.locks")
+            pluginManager.apply("com.netflix.nebula.dependency-lock")
+            // TODO discuss replacing OSS deplock plugin with internal convention plugin
+            // 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 c2f4916..eb6a600 100644
--- a/src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt
+++ b/src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt
@@ -143,18 +143,21 @@ 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 {
                     id("com.netflix.nebula.oss.settings")
                 }
             }
-            subProject("sub1"){
+            subProject("sub1") {
                 plugins {
                     java()
                 }
             }
-            subProject("sub2"){
+            subProject("sub2") {
                 plugins {
                     java()
                 }