diff --git a/README.md b/README.md index b019038..d915d88 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ publishing { } repositories { maven { - url "$buildDir/repo" // point this to your destination repository + url = "$buildDir/repo" // point this to your destination repository } } } diff --git a/gradle.lockfile b/gradle.lockfile index a657ab4..ffb744c 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -3,8 +3,8 @@ # This file is expected to be part of source control. cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:20.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:nebula-gradle-interop:2.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:nebula-test:10.5.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-gradle-interop:2.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-test:10.6.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -19,10 +19,7 @@ org.codehaus.plexus:plexus-utils:3.3.0=compileClasspath,integTestCompileClasspat org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-engine:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..2d9d6a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionSha256Sum=4d9d7ad4cf8842f279649213d2f87d8f7e9a03ae75ac4389517aa574b1404b2a diff --git a/gradlew b/gradlew index f5feea6..f477692 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -203,7 +202,7 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS= # Collect all arguments for the java command: # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 index 9b42019..1579c44 --- a/gradlew.bat +++ b/gradlew.bat @@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS= @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeCoreBomSupportSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeCoreBomSupportSpec.groovy index c2cd4c7..d7f5f92 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeCoreBomSupportSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeCoreBomSupportSpec.groovy @@ -75,11 +75,11 @@ class DependencyRecommendationsPluginCompositeCoreBomSupportSpec extends Integra } allprojects { - group 'example' + group = 'example' apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } } @@ -102,7 +102,7 @@ class DependencyRecommendationsPluginCompositeCoreBomSupportSpec extends Integra } repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeSpec.groovy index 3279ace..cd1fa1d 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeSpec.groovy @@ -49,7 +49,7 @@ class DependencyRecommendationsPluginCompositeSpec extends IntegrationSpec { buildFile << """\ allprojects { - group 'example' + group = 'example' apply plugin: 'com.netflix.nebula.dependency-recommender' dependencyRecommendations { diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy index 90fd486..a1ffb97 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy @@ -44,7 +44,7 @@ class DependencyRecommendationsPluginConfigurationCacheSpec extends IntegrationT } repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy index 7e0c1d2..c358139 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy @@ -73,7 +73,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationTestK apply plugin: 'war' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -118,7 +118,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationTestK apply plugin: 'war' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -146,7 +146,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationTestK apply plugin: 'war' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec.groovy index e6070f3..1614ab5 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec.groovy @@ -74,7 +74,7 @@ class DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec extends Inte apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } } diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectSpec.groovy index 4456eb6..54121f7 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectSpec.groovy @@ -111,7 +111,7 @@ class DependencyRecommendationsPluginMultiprojectSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -167,7 +167,7 @@ class DependencyRecommendationsPluginMultiprojectSpec extends IntegrationSpec { } repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } } @@ -217,7 +217,7 @@ class DependencyRecommendationsPluginMultiprojectSpec extends IntegrationSpec { apply plugin: 'com.netflix.nebula.dependency-recommender' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } } diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy index 16d2ef0..a76735d 100644 --- a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy +++ b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy @@ -80,7 +80,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -116,7 +116,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -162,7 +162,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -200,7 +200,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -238,7 +238,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -282,7 +282,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { apply plugin: 'java' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${generator.mavenRepositoryBlock} } @@ -339,7 +339,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { } } repositories { - maven { url "$buildDir/repo" } + maven { url = "$buildDir/repo" } } } ''' @@ -503,7 +503,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec { version = '1.0.0' repositories { - maven { url '${repo.root.absoluteFile.toURI()}' } + maven { url = '${repo.root.absoluteFile.toURI()}' } ${dependencies.mavenRepositoryBlock} }