diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignAndMigrateSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignAndMigrateSpec.groovy index 9867855..751a5da 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignAndMigrateSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignAndMigrateSpec.groovy @@ -19,7 +19,7 @@ class AbstractAlignAndMigrateSpec extends AbstractAlignRulesSpec { createTestDependencies() buildFile << """ repositories { - maven { url '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' } + maven { url = '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' } } dependencies { implementation 'test.nebula:a:1.0.0' diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy index b82f7c2..e31225d 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy @@ -80,7 +80,7 @@ buildscript { } repositories { maven { - url "https://plugins.gradle.org/m2/" + url = "https://plugins.gradle.org/m2/" } } } diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy index 3813d81..09ff2c9 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy @@ -19,7 +19,7 @@ class AlignAndLockWithDowngradedTransitiveDependenciesSpec extends AbstractInteg buildscript { repositories { maven { - url "https://plugins.gradle.org/m2/" + url = "https://plugins.gradle.org/m2/" } } dependencies { @@ -376,7 +376,7 @@ class AlignAndLockWithDowngradedTransitiveDependenciesSpec extends AbstractInteg buildFile << """ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } mavenCentral() } dependencies { diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy index cf96aff..9d24943 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy @@ -1861,7 +1861,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec { id 'com.netflix.nebula.resolution-rules'$pluginToAdd } repositories { - maven { url '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' } + maven { url = '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' } } dependencies { resolutionRules files("${projectDir.toPath().relativize(rulesJsonFile.toPath()).toFile()}") @@ -1942,7 +1942,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec { implementation 'test.nebula:b' } repositories { - maven { url '${bomRepo.root.absoluteFile.toURI()}' } + maven { url = '${bomRepo.root.absoluteFile.toURI()}' } } """.stripIndent() } @@ -1995,7 +1995,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec { repositories { mavenCentral() maven { - url 'repo' + url = 'repo' } } diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy index 2bb9771..5853976 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy @@ -61,7 +61,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.other:c:1.0.0' @@ -109,7 +109,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -161,7 +161,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -212,7 +212,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -280,7 +280,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -331,7 +331,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { repositories { maven { name 'repo' - url 'build/repo' + url = 'build/repo' } } } @@ -442,7 +442,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -523,7 +523,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } configurations.all { resolutionStrategy { @@ -582,7 +582,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula.one:a:1.0.0' @@ -628,7 +628,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -676,7 +676,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -723,7 +723,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -863,7 +863,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy index 336d233..7595de7 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy @@ -33,7 +33,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -119,7 +119,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.+' @@ -158,7 +158,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:[1.0.0, 2.0.0)' diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy index 5fad7c3..fa14c9a 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy @@ -39,7 +39,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -99,7 +99,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:2.0.0' @@ -156,7 +156,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:2.0.0' @@ -215,7 +215,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:2.0.0' @@ -270,7 +270,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:2.0.0' @@ -327,7 +327,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:2.0.0' diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy index c7b9564..78c8012 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy @@ -378,7 +378,7 @@ class AlignRulesForceStrictlyWithSubstitutionSpec extends AbstractAlignRulesSpec buildFile << """ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } """.stripIndent() } diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy index 6fd96d1..72d3219 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy @@ -100,7 +100,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec { repositories { maven { name 'repo' - url 'build/repo' + url = 'build/repo' } } } @@ -197,7 +197,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec { buildFile << """\ subprojects { repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } } @@ -267,7 +267,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec { subprojects { repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } } diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy index 727a946..796b63c 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy @@ -324,7 +324,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { repositories { mavenCentral() - maven { url '${mavenForRules.absolutePath}' } + maven { url = '${mavenForRules.absolutePath}' } } dependencies { @@ -610,7 +610,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { repositories { ${mavenrepo.mavenRepositoryBlock} - maven { url '${mavenForRules.absolutePath}' } + maven { url = '${mavenForRules.absolutePath}' } } dependencies { @@ -650,7 +650,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { repositories { ${mavenrepo.mavenRepositoryBlock} - maven { url '${mavenForRules.absolutePath}' } + maven { url = '${mavenForRules.absolutePath}' } } dependencies { @@ -982,7 +982,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { subprojects { repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } } """.stripIndent() @@ -1075,7 +1075,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { subprojects { apply plugin: 'java' repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } } """.stripIndent() @@ -1108,7 +1108,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { repositories { ${mavenrepo.mavenRepositoryBlock} - maven { url '${mavenForRules.absolutePath}' } + maven { url = '${mavenForRules.absolutePath}' } } dependencies { diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesTransitiveDependenciesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesTransitiveDependenciesSpec.groovy index 712edc3..3c8b351 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesTransitiveDependenciesSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesTransitiveDependenciesSpec.groovy @@ -36,7 +36,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -83,7 +83,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -129,7 +129,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.1.0' @@ -173,7 +173,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -232,7 +232,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } // Make at least one of the dependencies a non-expected dependency @@ -291,7 +291,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -352,7 +352,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:a:1.0.0' @@ -416,7 +416,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.group1:module1:2.0.0' @@ -503,7 +503,7 @@ class AlignRulesTransitiveDependenciesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.group1:module1:2.0.0' diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionMatchSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionMatchSpec.groovy index 8f6d62f..b66b41c 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionMatchSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionMatchSpec.groovy @@ -32,7 +32,7 @@ class AlignRulesVersionMatchSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:b:1.0.0-1' @@ -72,7 +72,7 @@ class AlignRulesVersionMatchSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:b:1.0.0-1' diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionSuffixesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionSuffixesSpec.groovy index 7d7c873..9829fd1 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionSuffixesSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesVersionSuffixesSpec.groovy @@ -34,7 +34,7 @@ class AlignRulesVersionSuffixesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:b:1.0.0-1' @@ -86,7 +86,7 @@ class AlignRulesVersionSuffixesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:b:1.0.0-1' @@ -136,7 +136,7 @@ class AlignRulesVersionSuffixesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:b:1.+' @@ -188,7 +188,7 @@ class AlignRulesVersionSuffixesSpec extends AbstractAlignRulesSpec { buildFile << """\ repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } dependencies { implementation 'test.nebula:b:1.+' diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy index 80d68e5..7a2f857 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy @@ -540,7 +540,7 @@ class ResolutionRulesPluginSpec extends AbstractIntegrationTestKitSpec { apply plugin: 'com.netflix.nebula.resolution-rules' repositories { mavenCentral() - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } dependencies {