Skip to content

Commit ef876dc

Browse files
rpalcolearpalcolea
committed
Move to com.netflix namespace for plugin id
1 parent 608b88f commit ef876dc

20 files changed

+172
-162
lines changed

‎build.gradle

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import org.gradle.util.GradleVersion
1818
plugins {
1919
id 'nebula.plugin-plugin' version '17.1.0'
2020
id 'nebula.optional-base' version '3.1.0'
21-
id "org.jetbrains.kotlin.jvm" version "1.5.30"
21+
id "org.jetbrains.kotlin.jvm" version "1.7.20"
2222
id 'java-gradle-plugin'
2323
id "org.gradle.test-retry" version "1.3.1"
2424
}
@@ -36,7 +36,7 @@ contacts {
3636
}
3737

3838
dependencies {
39-
implementation 'com.squareup.moshi:moshi:1.+'
39+
implementation 'com.squareup.moshi:moshi:1.12.+'
4040
implementation 'joda-time:joda-time:2.10'
4141
implementation 'com.netflix.nebula:nebula-gradle-interop:latest.release'
4242
implementation 'com.netflix.nebula:gradle-scm-plugin:latest.release'
@@ -55,12 +55,18 @@ dependencies {
5555
}
5656
testImplementation "com.github.tomakehurst:wiremock:2.17.0"
5757
testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
58+
testImplementation 'org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r'
5859
}
5960

61+
configurations.all {
62+
resolutionStrategy {
63+
force 'org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r'
64+
}
65+
}
6066
gradlePlugin {
6167
plugins {
6268
dependencyLock {
63-
id = 'nebula.dependency-lock'
69+
id = 'com.netflix.nebula.dependency-lock'
6470
displayName = 'Nebula Dependency Lock plugin'
6571
implementationClass = 'nebula.plugin.dependencylock.DependencyLockPlugin'
6672
description = 'Plugin to lock dynamic dependencies'
@@ -135,3 +141,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
135141
tasks.withType(GenerateModuleMetadata).configureEach {
136142
suppressedValidationErrors.add('enforced-platform')
137143
}
144+
145+
javaCrossCompile {
146+
disableKotlinSupport = true
147+
}

‎gradle.lockfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ com.github.jknack:handlebars:4.0.6=integTestCompileClasspath,integTestRuntimeCla
1212
com.github.stefanbirkner:system-rules:1.19.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.github.tomakehurst:wiremock:2.17.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1414
com.google.guava:guava:20.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
15-
com.googlecode.javaewah:JavaEWAH:1.1.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
15+
com.googlecode.javaewah:JavaEWAH:1.1.13=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1616
com.jayway.jsonpath:json-path:2.4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1717
com.jcraft:jsch.agentproxy.connector-factory:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
1818
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
2222
com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
2323
com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
2424
com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath
25-
com.netflix.nebula:gradle-contacts-plugin:5.1.0=integTestRuntimeClasspath,testRuntimeClasspath
26-
com.netflix.nebula:gradle-git-scm-plugin:5.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
27-
com.netflix.nebula:gradle-info-plugin:9.1.2=integTestRuntimeClasspath,testRuntimeClasspath
28-
com.netflix.nebula:gradle-scm-plugin:6.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
25+
com.netflix.nebula:gradle-contacts-plugin:7.0.0=integTestRuntimeClasspath,testRuntimeClasspath
26+
com.netflix.nebula:gradle-git-scm-plugin:6.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
27+
com.netflix.nebula:gradle-info-plugin:12.0.0=integTestRuntimeClasspath,testRuntimeClasspath
28+
com.netflix.nebula:gradle-scm-plugin:7.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
2929
com.netflix.nebula:nebula-dependencies-comparison:0.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3030
com.netflix.nebula:nebula-gradle-interop:2.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
31-
com.netflix.nebula:nebula-project-plugin:9.1.6=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
32-
com.netflix.nebula:nebula-publishing-plugin:17.3.2=integTestRuntimeClasspath,testRuntimeClasspath
31+
com.netflix.nebula:nebula-project-plugin:10.0.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
32+
com.netflix.nebula:nebula-publishing-plugin:19.0.0=integTestRuntimeClasspath,testRuntimeClasspath
3333
com.netflix.nebula:nebula-test:10.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3434
com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath
3535
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
4242
joda-time:joda-time:2.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4343
junit:junit-dep:4.11=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
junit:junit:4.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
net.java.dev.jna:jna-platform:4.1.0=integTestRuntimeClasspath,testRuntimeClasspath
46-
net.java.dev.jna:jna:4.1.0=integTestRuntimeClasspath,testRuntimeClasspath
45+
net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
46+
net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
4747
net.java.dev.jna:platform:3.4.0=integTestRuntimeClasspath,testRuntimeClasspath
4848
net.minidev:accessors-smart:1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4949
net.minidev:json-smart:2.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -69,10 +69,10 @@ org.eclipse.jetty:jetty-xml:9.2.24.v20180105=integTestCompileClasspath,integTest
6969
org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7070
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7171
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
72-
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
73-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
74-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
75-
org.jetbrains.kotlin:kotlin-stdlib:1.5.30=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
72+
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
73+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
74+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
75+
org.jetbrains.kotlin:kotlin-stdlib:1.7.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7676
org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7777
org.junit.platform:junit-platform-commons:1.8.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7878
org.junit.platform:junit-platform-engine:1.8.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class DependencyLockPlugin : Plugin<Project> {
200200
}
201201

202202
lockUsed = dependenciesLock.name
203-
reasons.add("nebula.dependency-lock locked with: $lockUsed")
203+
reasons.add("com.netflix.nebula.dependency-lock locked with: $lockUsed")
204204

205205
if (!DependencyLockTaskConfigurer.shouldIgnoreDependencyLock(project)) {
206206
val taskNames = project.gradle.startParameter.taskNames
@@ -297,11 +297,11 @@ class DependencyLockPlugin : Plugin<Project> {
297297
private fun applyOverrides(conf: Configuration, overrides: Map<*, *>) {
298298
if (project.hasProperty(OVERRIDE_FILE)) {
299299
LOGGER.info("Using override file ${project.property(OVERRIDE_FILE)} to lock dependencies")
300-
reasons.add("nebula.dependency-lock using override file: ${project.property(OVERRIDE_FILE)}")
300+
reasons.add("com.netflix.nebula.dependency-lock using override file: ${project.property(OVERRIDE_FILE)}")
301301
}
302302
if (project.hasProperty(OVERRIDE)) {
303303
LOGGER.info("Using command line overrides ${project.property(OVERRIDE)}")
304-
reasons.add("nebula.dependency-lock using override: ${project.property(OVERRIDE)}")
304+
reasons.add("com.netflix.nebula.dependency-lock using override: ${project.property(OVERRIDE)}")
305305
}
306306

307307
val overrideDeps = overrides.map {

‎src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AbstractDependencyLockPluginSpec extends IntegrationTestKitSpec {
5252

5353
buildFile << """\
5454
plugins {
55-
id 'nebula.dependency-lock'
55+
id 'com.netflix.nebula.dependency-lock'
5656
id 'java'
5757
}
5858
repositories {
@@ -71,7 +71,7 @@ class AbstractDependencyLockPluginSpec extends IntegrationTestKitSpec {
7171
buildFile << """
7272
plugins {
7373
id 'scala'
74-
id 'nebula.dependency-lock'
74+
id 'com.netflix.nebula.dependency-lock'
7575
}
7676
repositories {
7777
mavenCentral()

‎src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec {
4646
}
4747
}
4848
49-
apply plugin: 'nebula.dependency-lock'
50-
apply plugin: 'nebula.resolution-rules'
49+
apply plugin: 'com.netflix.nebula.dependency-lock'
50+
apply plugin: 'com.netflix.nebula.resolution-rules'
5151
apply plugin: 'java'
5252
5353
repositories {
@@ -111,8 +111,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec {
111111
}
112112
}
113113
114-
apply plugin: 'nebula.resolution-rules'
115-
apply plugin: 'nebula.dependency-lock'
114+
apply plugin: 'com.netflix.nebula.resolution-rules'
115+
apply plugin: 'com.netflix.nebula.dependency-lock'
116116
apply plugin: 'java'
117117
118118
repositories {
@@ -179,8 +179,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec {
179179
classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:latest.release'
180180
}
181181
}
182-
apply plugin: 'nebula.resolution-rules'
183-
apply plugin: 'nebula.dependency-lock'
182+
apply plugin: 'com.netflix.nebula.resolution-rules'
183+
apply plugin: 'com.netflix.nebula.dependency-lock'
184184
apply plugin: 'java'
185185
repositories {
186186
${mavenrepo.mavenRepositoryBlock}
@@ -237,8 +237,8 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec {
237237
classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:latest.release'
238238
}
239239
}
240-
apply plugin: 'nebula.dependency-lock'
241-
apply plugin: 'nebula.resolution-rules'
240+
apply plugin: 'com.netflix.nebula.dependency-lock'
241+
apply plugin: 'com.netflix.nebula.resolution-rules'
242242
apply plugin: 'java'
243243
repositories {
244244
${mavenrepo.mavenRepositoryBlock}
@@ -289,7 +289,7 @@ class DependencyLockAlignmentLauncherSpec extends IntegrationTestKitSpec {
289289
// note: this is a more unusual case. Typically resolution rules are distributed like a library, version controlled, and locked like other dependencies
290290
def (GradleDependencyGenerator mavenrepo, File rulesJsonFile) = dependencyLockAlignInteractionSetupWithUnlockedResolutionRulesConfiguration()
291291
buildFile << """\
292-
apply plugin: 'nebula.dependency-lock'
292+
apply plugin: 'com.netflix.nebula.dependency-lock'
293293
apply plugin: 'java'
294294
repositories {
295295
${mavenrepo.mavenRepositoryBlock}

‎src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec {
4646

4747
def 'commitLock no-ops when no scm implementation is applied'() {
4848
buildFile << DependencyLockLauncherSpec.BUILD_GRADLE
49-
buildFile << 'apply plugin: \'nebula.gradle-scm\''
49+
buildFile << 'apply plugin: \'com.netflix.nebula.gradle-scm\''
5050

5151
when:
5252
def result = runTasks('generateLock', 'saveLock', 'commitLock')
@@ -61,7 +61,7 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec {
6161
def git = commonGitSetup(gitDir)
6262

6363
buildFile << DependencyLockLauncherSpec.BUILD_GRADLE
64-
buildFile << 'apply plugin: \'nebula.gradle-git-scm\''
64+
buildFile << 'apply plugin: \'com.netflix.nebula.gradle-git-scm\''
6565

6666
finishGitSetup(['build.gradle', 'settings.gradle'])
6767

@@ -85,8 +85,8 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec {
8585
buildFile << """\
8686
subprojects {
8787
apply plugin: 'java'
88-
apply plugin: 'nebula.dependency-lock'
89-
apply plugin: 'nebula.gradle-scm'
88+
apply plugin: 'com.netflix.nebula.dependency-lock'
89+
apply plugin: 'com.netflix.nebula.gradle-scm'
9090
repositories { maven { url '${Fixture.repo}' } }
9191
}
9292
""".stripIndent()
@@ -127,8 +127,8 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec {
127127
buildFile << """\
128128
subprojects {
129129
apply plugin: 'java'
130-
apply plugin: 'nebula.dependency-lock'
131-
apply plugin: 'nebula.gradle-git-scm'
130+
apply plugin: 'com.netflix.nebula.dependency-lock'
131+
apply plugin: 'com.netflix.nebula.gradle-git-scm'
132132
repositories { maven { url '${Fixture.repo}' } }
133133
}
134134
""".stripIndent()
@@ -171,11 +171,11 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec {
171171
sub2.mkdirs()
172172

173173
buildFile << """\
174-
apply plugin: 'nebula.dependency-lock'
174+
apply plugin: 'com.netflix.nebula.dependency-lock'
175175
subprojects {
176176
apply plugin: 'java'
177-
apply plugin: 'nebula.dependency-lock'
178-
apply plugin: 'nebula.gradle-git-scm'
177+
apply plugin: 'com.netflix.nebula.dependency-lock'
178+
apply plugin: 'com.netflix.nebula.gradle-git-scm'
179179
repositories { maven { url '${Fixture.repo}' } }
180180
}
181181
""".stripIndent()

‎src/test/groovy/nebula/plugin/dependencylock/DependencyLockConfigurationAvoidanceSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DependencyLockConfigurationAvoidanceSpec extends IntegrationTestKitSpec {
1515
given:
1616
buildFile << """\
1717
plugins {
18-
id 'nebula.dependency-lock'
18+
id 'com.netflix.nebula.dependency-lock'
1919
id 'java'
2020
}
2121
""".stripIndent()
@@ -38,9 +38,9 @@ class DependencyLockConfigurationAvoidanceSpec extends IntegrationTestKitSpec {
3838
given:
3939
buildFile << """\
4040
plugins {
41-
id 'nebula.dependency-lock'
41+
id 'com.netflix.nebula.dependency-lock'
4242
id 'java'
43-
id 'nebula.gradle-scm'
43+
id 'com.netflix.nebula.gradle-scm'
4444
}
4545
""".stripIndent()
4646

0 commit comments

Comments
 (0)