Skip to content

Commit dd6f516

Browse files
committed
Test Gradle Plugin against 8.8
Closes gh-40573
1 parent c369098 commit dd6f516

File tree

11 files changed

+17
-13
lines changed

11 files changed

+17
-13
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ the<DependencyManagementExtension>().apply {
2626

2727
repositories {
2828
maven {
29-
url = uri("file:repository")
29+
url = uri("repository")
3030
}
3131
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ dependencyManagement {
2424
}
2525

2626
repositories {
27-
maven { url 'file:repository' }
27+
maven { url 'repository' }
2828
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ the<DependencyManagementExtension>().apply {
2727

2828
repositories {
2929
maven {
30-
url = uri("file:repository")
30+
url = uri("repository")
3131
}
3232
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
}
1515

1616
repositories {
17-
maven { url 'file:repository' }
17+
maven { url 'repository' }
1818
}
1919

2020
configurations.all {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515

1616
repositories {
1717
maven {
18-
url = uri("file:repository")
18+
url = uri("repository")
1919
}
2020
}
2121

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
}
1010

1111
repositories {
12-
maven { url 'file:repository' }
12+
maven { url 'repository' }
1313
}
1414

1515
configurations.all {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010

1111
repositories {
1212
maven {
13-
url = uri("file:repository")
13+
url = uri("repository")
1414
}
1515
}
1616

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ext['slf4j.version'] = '1.7.20'
1919
// end::custom-version[]
2020

2121
repositories {
22-
maven { url 'file:repository' }
22+
maven { url 'repository' }
2323
}
2424

2525
task slf4jVersion {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extra["slf4j.version"] = "1.7.20"
1212

1313
repositories {
1414
maven {
15-
url = uri("file:repository")
15+
url = uri("repository")
1616
}
1717
}
1818

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -596,7 +596,11 @@ void defaultDirAndFileModesAreUsed() throws IOException {
596596

597597
@TestTemplate
598598
void dirModeAndFileModeAreApplied() throws IOException {
599-
BuildResult result = this.gradleBuild.build(this.taskName);
599+
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.8-rc-1")
600+
.expectDeprecationMessages("The CopyProcessingSpec.setDirMode(Integer) method has been deprecated",
601+
"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated",
602+
"upgrading_version_8.html#unix_file_permissions_deprecated")
603+
.build(this.taskName);
600604
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
601605
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
602606
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ private GradleVersions() {
3535
@SuppressWarnings("UnstableApiUsage")
3636
public static List<String> allCompatible() {
3737
if (isJavaVersion(JavaVersion.VERSION_20)) {
38-
return Arrays.asList("8.1.1", "8.7");
38+
return Arrays.asList("8.1.1", "8.8");
3939
}
40-
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.7");
40+
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.8");
4141
}
4242

4343
public static String minimumCompatible() {

0 commit comments

Comments
 (0)