Skip to content

Commit 9690cfe

Browse files
committed
Merge remote-tracking branch 'origin/main' into sorin/consolidation
* origin/main: Bump com.google.guava:guava from 33.2.0-jre to 33.2.1-jre Bump Gradle Wrapper from 8.7 to 8.8 Bump org.apache.maven:maven-core from 3.9.6 to 3.9.7 Bump com.gradle.develocity from 3.17.3 to 3.17.4 Bump com.gradle.develocity from 3.17.2 to 3.17.3
2 parents 68dcf40 + 196dc5c commit 9690cfe

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Diff for: components/configure-gradle-enterprise-maven-extension/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88

99
dependencies {
10-
compileOnly("org.apache.maven:maven-core:3.9.6")
10+
compileOnly("org.apache.maven:maven-core:3.9.7")
1111
compileOnly("org.codehaus.plexus:plexus-component-annotations:2.2.0")
1212
compileOnly("com.gradle:gradle-enterprise-maven-extension:1.18.4")
1313
}

Diff for: gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

Diff for: gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.

Diff for: settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("com.gradle.develocity") version "3.17.2"
2+
id("com.gradle.develocity") version "3.17.4"
33
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1"
44
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
55
}

0 commit comments

Comments
 (0)