Skip to content

Commit

Permalink
Merge pull request #77 from nebula-plugins/update-gradle-wrapper
Browse files Browse the repository at this point in the history
Upgrade Gradle Wrapper to 8.12-rc-1
  • Loading branch information
rpalcolea authored Dec 17, 2024
2 parents 82b8fef + d3a31a2 commit 0d116db
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 35 deletions.
41 changes: 14 additions & 27 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,32 @@
cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
com.github.zafarkhaja:java-semver:0.9.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.googlecode.javaewah:JavaEWAH:1.1.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.connector-factory:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.core:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.pageant:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.sshagent:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.mycila.xmltool:xmltool:3.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.mycila:license-maven-plugin:3.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.mycila:mycila-xmltool:4.4.ga=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-contacts-plugin:7.0.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-dependency-lock-plugin:15.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-info-plugin:12.1.6=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-dependency-lock-plugin:15.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-info-plugin:13.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-java-cross-compile-plugin:8.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-dependencies-comparison:0.2.1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-gradle-interop:2.1.1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-oss-publishing-plugin:3.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-project-plugin:10.1.5=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-publishing-plugin:21.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-release-plugin:19.0.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=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-oss-publishing-plugin:3.5.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-project-plugin:11.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-publishing-plugin:21.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-release-plugin:19.0.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:10.6.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.squareup.moshi:moshi:1.12.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.squareup.okio:okio:2.10.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.trilead:trilead-ssh2:1.0.0-build220=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
commons-logging:commons-logging:1.1.1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
de.regnis.q.sequence:sequence-library:1.0.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.github.gradle-nexus:publish-plugin:1.0.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
joda-time:joda-time:2.10=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
net.java.dev.jna:platform:3.4.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
net.java.dev.jna:jna-platform:5.15.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
net.java.dev.jna:jna:5.15.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.ajoberstar.grgit:grgit-core:4.1.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr-runtime:3.4=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.12.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.commons:commons-pool2:2.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.maven:maven-model:3.6.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
Expand All @@ -55,14 +44,14 @@ org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestCompileClasspat
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.5.31=embeddedKotlin
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=embeddedKotlin
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=embeddedKotlin
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.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.5.31=embeddedKotlin
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.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.5.31=embeddedKotlin
org.jetbrains.kotlin:kotlin-stdlib:1.9.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,embeddedKotlin,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
Expand All @@ -75,6 +64,4 @@ org.spockframework:spock-core:2.3-groovy-3.0=integTestCompileClasspath,integTest
org.spockframework:spock-junit4:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework:spring-asm:3.1.3.RELEASE=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.springframework:spring-core:3.1.3.RELEASE=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.tmatesoft.sqljet:sqljet:1.1.10=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.tmatesoft.svnkit:svnkit:1.8.12=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
empty=annotationProcessor,compile,integTestAnnotationProcessor,integTestCompile,integTestCompileOnly,integTestRuntime,runtime,testAnnotationProcessor,testCompile,testCompileOnly,testRuntime
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class OssLicensePlugin implements Plugin<Project> {
licenseExtension.header = header

def writeTask = project.task('writeLicenseHeader') {
description 'Write license header for License tasks'
description = 'Write license header for License tasks'
onlyIf {
def licenseTasks = project.gradle.taskGraph.getAllTasks().findAll { it instanceof License }
return licenseTasks.any { ((License) it).getHeader() == header }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ class NetflixOssMultiProjectIntegrationSpec extends IntegrationSpec {
publishing {
repositories {
maven {
name 'testRepo'
url '../build/testrepo'
name = 'testRepo'
url = '../build/testrepo'
}
}
}
Expand Down

0 comments on commit 0d116db

Please sign in to comment.