Skip to content

Commit 53348bb

Browse files
rpalcolearpalcolea
committed
Move to com.netflix namespace for plugin id
1 parent 8d49cfa commit 53348bb

14 files changed

+43
-43
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ We produce a rules for dependencies found in Maven Central and other public repo
2626

2727
```groovy
2828
allprojects {
29-
apply plugin: 'nebula.resolution-rules'
29+
apply plugin: 'com.netflix.nebula.resolution-rules'
3030
}
3131
3232
dependencies {

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pluginBundle {
5959
gradlePlugin {
6060
plugins {
6161
resolutionRules {
62-
id = 'nebula.resolution-rules'
62+
id = 'com.netflix.nebula.resolution-rules'
6363
implementationClass = 'nebula.plugin.resolutionrules.ResolutionRulesPlugin'
6464
displayName = 'Gradle Resolution Rules plugin'
6565
description = project.description

‎gradle.lockfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ com.fasterxml.jackson.core:jackson-databind:2.9.10.8=compileClasspath,integTestC
88
com.fasterxml.jackson.module:jackson-module-kotlin:2.9.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
99
com.fasterxml.jackson:jackson-bom:2.9.10.20210106=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.google.guava:guava:20.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
11-
com.netflix.nebula:gradle-dependency-lock-plugin:12.3.0=integTestRuntimeClasspath,testRuntimeClasspath
11+
com.netflix.nebula:gradle-dependency-lock-plugin:12.7.1=integTestRuntimeClasspath,testRuntimeClasspath
1212
com.netflix.nebula:gradle-scm-plugin:6.0.0=integTestRuntimeClasspath,testRuntimeClasspath
1313
com.netflix.nebula:nebula-dependencies-comparison:0.2.1=integTestRuntimeClasspath,testRuntimeClasspath
14-
com.netflix.nebula:nebula-dependency-recommender:11.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
14+
com.netflix.nebula:nebula-dependency-recommender:12.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1515
com.netflix.nebula:nebula-gradle-interop:2.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1616
com.netflix.nebula:nebula-test:10.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1717
com.squareup.moshi:moshi:1.12.0=integTestRuntimeClasspath,testRuntimeClasspath
@@ -20,15 +20,15 @@ javax.inject:javax.inject:1=integTestRuntimeClasspath,runtimeClasspath,testRunti
2020
joda-time:joda-time:2.10=integTestRuntimeClasspath,testRuntimeClasspath
2121
junit:junit:4.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2222
org.apache.commons:commons-lang3:3.8.1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
23-
org.apache.maven:maven-artifact:3.8.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
24-
org.apache.maven:maven-builder-support:3.8.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
25-
org.apache.maven:maven-model-builder:3.8.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
26-
org.apache.maven:maven-model:3.8.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
23+
org.apache.maven:maven-artifact:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
24+
org.apache.maven:maven-builder-support:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
25+
org.apache.maven:maven-model-builder:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
26+
org.apache.maven:maven-model:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
2727
org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2828
org.codehaus.groovy:groovy:3.0.9=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
29-
org.codehaus.plexus:plexus-interpolation:1.25=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
30-
org.codehaus.plexus:plexus-utils:3.2.1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
31-
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
29+
org.codehaus.plexus:plexus-interpolation:1.26=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
30+
org.codehaus.plexus:plexus-utils:3.3.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
31+
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
3232
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3333
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3434
org.jetbrains.kotlin:kotlin-reflect:1.5.31=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignRulesSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class AbstractAlignRulesSpec extends IntegrationTestKitSpec {
99
rulesJsonFile = new File(projectDir, "${moduleName}.json")
1010
buildFile << """\
1111
plugins {
12-
id 'nebula.resolution-rules'
12+
id 'com.netflix.nebula.resolution-rules'
1313
id 'java'
1414
}
1515
dependencies {

‎src/integTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ buildscript {
8989
}
9090
plugins {
9191
id 'java'
92-
id 'nebula.resolution-rules'
92+
id 'com.netflix.nebula.resolution-rules'
9393
}
9494
apply plugin: 'org.springframework.boot'$additionalPlugin
9595
repositories {

‎src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AlignAndLockWithDowngradedTransitiveDependenciesSpec extends IntegrationTe
2828
}
2929
}
3030
plugins {
31-
id 'nebula.resolution-rules'
31+
id 'com.netflix.nebula.resolution-rules'
3232
id 'java'
3333
}
3434
apply plugin: 'nebula.dependency-lock'

‎src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,7 @@ class AlignAndSubstituteRulesSpec extends IntegrationTestKitSpec {
18481848
"""
18491849
plugins {
18501850
id 'java'
1851-
id 'nebula.resolution-rules'$pluginToAdd
1851+
id 'com.netflix.nebula.resolution-rules'$pluginToAdd
18521852
}
18531853
repositories {
18541854
maven { url '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' }

‎src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -961,14 +961,14 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
961961

962962
buildFile.text = """\
963963
plugins {
964-
id 'nebula.resolution-rules'
964+
id 'com.netflix.nebula.resolution-rules'
965965
}
966966
allprojects {
967967
group = 'example.nebula'
968968
version = '1.2.0'
969969
}
970970
subprojects {
971-
apply plugin: 'nebula.resolution-rules'
971+
apply plugin: 'com.netflix.nebula.resolution-rules'
972972
apply plugin: 'java'
973973
repositories {
974974
${generator.mavenRepositoryBlock}
@@ -1034,10 +1034,10 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
10341034

10351035
buildFile.text = """\
10361036
plugins {
1037-
id 'nebula.resolution-rules'
1037+
id 'com.netflix.nebula.resolution-rules'
10381038
}
10391039
1040-
apply plugin: 'nebula.resolution-rules'
1040+
apply plugin: 'com.netflix.nebula.resolution-rules'
10411041
apply plugin: 'java'
10421042
repositories {
10431043
${generator.mavenRepositoryBlock}

‎src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicWithCoreSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AlignRulesBasicWithCoreSpec extends IntegrationTestKitSpec {
2525

2626
buildFile << """\
2727
plugins {
28-
id 'nebula.resolution-rules'
28+
id 'com.netflix.nebula.resolution-rules'
2929
id 'java'
3030
}
3131
dependencies {

‎src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
7070
}
7171
}
7272
73-
apply plugin: 'nebula.resolution-rules'
73+
apply plugin: 'com.netflix.nebula.resolution-rules'
7474
apply plugin: 'java'
7575
apply plugin: 'nebula.dependency-recommender'
7676
@@ -130,7 +130,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
130130
}
131131
132132
apply plugin: 'nebula.dependency-recommender'
133-
apply plugin: 'nebula.resolution-rules'
133+
apply plugin: 'com.netflix.nebula.resolution-rules'
134134
apply plugin: 'java'
135135
136136
@@ -192,7 +192,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
192192
}
193193
allprojects {
194194
apply plugin: 'nebula.dependency-recommender'
195-
apply plugin: 'nebula.resolution-rules'
195+
apply plugin: 'com.netflix.nebula.resolution-rules'
196196
197197
repositories {
198198
${mavenrepo.mavenRepositoryBlock}
@@ -261,7 +261,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
261261
}
262262
}
263263
apply plugin: 'spring-boot'
264-
apply plugin: 'nebula.resolution-rules'
264+
apply plugin: 'com.netflix.nebula.resolution-rules'
265265
266266
repositories { mavenCentral() }
267267
@@ -320,7 +320,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
320320
}
321321
322322
apply plugin: 'spring-boot'
323-
apply plugin: 'nebula.resolution-rules'
323+
apply plugin: 'com.netflix.nebula.resolution-rules'
324324
325325
repositories {
326326
mavenCentral()
@@ -378,7 +378,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
378378
}
379379
380380
apply plugin: 'java'
381-
apply plugin: 'nebula.resolution-rules'
381+
apply plugin: 'com.netflix.nebula.resolution-rules'
382382
apply plugin: 'io.spring.dependency-management'
383383
384384
dependencyManagement {
@@ -445,7 +445,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
445445
446446
apply plugin: 'nebula.dependency-recommender'
447447
apply plugin: 'nebula.maven-publish'
448-
apply plugin: 'nebula.resolution-rules'
448+
apply plugin: 'com.netflix.nebula.resolution-rules'
449449
apply plugin: 'java'
450450
451451
@@ -500,7 +500,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
500500
}
501501
}
502502
allprojects {
503-
apply plugin: 'nebula.resolution-rules'
503+
apply plugin: 'com.netflix.nebula.resolution-rules'
504504
505505
repositories {
506506
${mavenrepo.mavenRepositoryBlock}
@@ -602,7 +602,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
602602
}
603603
}
604604
605-
apply plugin: 'nebula.resolution-rules'
605+
apply plugin: 'com.netflix.nebula.resolution-rules'
606606
apply plugin: 'nebula.dependency-lock'
607607
apply plugin: 'java'
608608
@@ -642,7 +642,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
642642
}
643643
}
644644
645-
apply plugin: 'nebula.resolution-rules'
645+
apply plugin: 'com.netflix.nebula.resolution-rules'
646646
apply plugin: 'nebula.dependency-lock'
647647
apply plugin: 'java'
648648
@@ -690,7 +690,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
690690
classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:11.+'
691691
}
692692
}
693-
apply plugin: 'nebula.resolution-rules'
693+
apply plugin: 'com.netflix.nebula.resolution-rules'
694694
apply plugin: 'nebula.dependency-lock'
695695
apply plugin: 'java'
696696
repositories {
@@ -757,7 +757,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
757757
}
758758
}
759759
760-
apply plugin: 'nebula.resolution-rules'
760+
apply plugin: 'com.netflix.nebula.resolution-rules'
761761
apply plugin: 'nebula.dependency-lock'
762762
apply plugin: 'java'
763763
@@ -967,7 +967,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
967967
}
968968
969969
allprojects {
970-
apply plugin: 'nebula.resolution-rules'
970+
apply plugin: 'com.netflix.nebula.resolution-rules'
971971
apply plugin: 'nebula.dependency-recommender'
972972
}
973973
@@ -1056,7 +1056,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
10561056
}
10571057
10581058
allprojects {
1059-
apply plugin: 'nebula.resolution-rules'
1059+
apply plugin: 'com.netflix.nebula.resolution-rules'
10601060
apply plugin: 'nebula.dependency-recommender'
10611061
dependencyRecommendations {
10621062
strictMode = true
@@ -1098,7 +1098,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
10981098
}
10991099
11001100
apply plugin: 'nebula.dependency-lock'
1101-
apply plugin: 'nebula.resolution-rules'
1101+
apply plugin: 'com.netflix.nebula.resolution-rules'
11021102
apply plugin: 'java'
11031103
11041104
repositories {
@@ -1146,7 +1146,7 @@ class AlignRulesPluginInteractionSpec extends IntegrationTestKitSpec {
11461146
}
11471147
}
11481148
apply plugin: 'nebula.dependency-lock'
1149-
apply plugin: 'nebula.resolution-rules'
1149+
apply plugin: 'com.netflix.nebula.resolution-rules'
11501150
apply plugin: 'java'
11511151
repositories {
11521152
${mavenrepo.mavenRepositoryBlock}

‎src/integTest/groovy/nebula/plugin/resolutionrules/IgnoredConfigurationsWithRulesSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class IgnoredConfigurationsWithRulesSpec extends IntegrationSpec {
1111

1212
buildFile << """
1313
apply plugin: 'java'
14-
apply plugin: 'nebula.resolution-rules'
14+
apply plugin: 'com.netflix.nebula.resolution-rules'
1515
1616
repositories {
1717
mavenCentral()

‎src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ResolutionRulesPluginSpec extends IntegrationSpec {
4141

4242
buildFile << """
4343
apply plugin: 'java'
44-
apply plugin: 'nebula.resolution-rules'
44+
apply plugin: 'com.netflix.nebula.resolution-rules'
4545
4646
repositories {
4747
mavenCentral()
@@ -201,7 +201,7 @@ class ResolutionRulesPluginSpec extends IntegrationSpec {
201201
def subproject = addSubproject("subprojectA")
202202
new File(subproject, "build.gradle") << """
203203
apply plugin: 'java'
204-
apply plugin: 'nebula.resolution-rules'
204+
apply plugin: 'com.netflix.nebula.resolution-rules'
205205
""".stripIndent()
206206

207207
when:
@@ -475,7 +475,7 @@ class ResolutionRulesPluginSpec extends IntegrationSpec {
475475
given:
476476
buildFile.text = """\
477477
apply plugin: 'java'
478-
apply plugin: 'nebula.resolution-rules'
478+
apply plugin: 'com.netflix.nebula.resolution-rules'
479479
repositories {
480480
mavenCentral()
481481
}
@@ -543,7 +543,7 @@ class ResolutionRulesPluginSpec extends IntegrationSpec {
543543
544544
apply plugin: 'java'
545545
apply plugin: 'nebula.dependency-recommender'
546-
apply plugin: 'nebula.resolution-rules'
546+
apply plugin: 'com.netflix.nebula.resolution-rules'
547547
repositories {
548548
mavenCentral()
549549
maven { url '${repo.root.absoluteFile.toURI()}' }

‎src/integTest/groovy/nebula/plugin/resolutionrules/SubstituteRulesSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SubstituteRulesSpec extends IntegrationSpec {
1111

1212
buildFile << """
1313
apply plugin: 'java'
14-
apply plugin: 'nebula.resolution-rules'
14+
apply plugin: 'com.netflix.nebula.resolution-rules'
1515
1616
repositories {
1717
mavenCentral()

‎src/integTest/groovy/nebula/plugin/resolutionrules/SubstituteRulesWithRangesSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SubstituteRulesWithRangesSpec extends IntegrationTestKitSpec {
3232

3333
buildFile << """
3434
apply plugin: 'java'
35-
apply plugin: 'nebula.resolution-rules'
35+
apply plugin: 'com.netflix.nebula.resolution-rules'
3636
3737
repositories {
3838
mavenCentral()

0 commit comments

Comments
 (0)