mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '3.2.x'
Closes gh-40975
This commit is contained in:
commit
58a175bf23
@ -26,6 +26,6 @@ the<DependencyManagementExtension>().apply {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = uri("file:repository")
|
url = uri("repository")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,5 +24,5 @@ dependencyManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'file:repository' }
|
maven { url 'repository' }
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,6 @@ the<DependencyManagementExtension>().apply {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = uri("file:repository")
|
url = uri("repository")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'file:repository' }
|
maven { url 'repository' }
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations.all {
|
configurations.all {
|
||||||
|
@ -15,7 +15,7 @@ dependencies {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = uri("file:repository")
|
url = uri("repository")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'file:repository' }
|
maven { url 'repository' }
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations.all {
|
configurations.all {
|
||||||
|
@ -10,7 +10,7 @@ dependencies {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = uri("file:repository")
|
url = uri("repository")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ ext['slf4j.version'] = '1.7.20'
|
|||||||
// end::custom-version[]
|
// end::custom-version[]
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'file:repository' }
|
maven { url 'repository' }
|
||||||
}
|
}
|
||||||
|
|
||||||
task slf4jVersion {
|
task slf4jVersion {
|
||||||
|
@ -12,7 +12,7 @@ extra["slf4j.version"] = "1.7.20"
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = uri("file:repository")
|
url = uri("repository")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -609,7 +609,11 @@ abstract class AbstractBootArchiveIntegrationTests {
|
|||||||
|
|
||||||
@TestTemplate
|
@TestTemplate
|
||||||
void dirModeAndFileModeAreApplied() throws IOException {
|
void dirModeAndFileModeAreApplied() throws IOException {
|
||||||
BuildResult result = this.gradleBuild.build(this.taskName);
|
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.8-rc-1")
|
||||||
|
.expectDeprecationMessages("The CopyProcessingSpec.setDirMode(Integer) method has been deprecated",
|
||||||
|
"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated",
|
||||||
|
"upgrading_version_8.html#unix_file_permissions_deprecated")
|
||||||
|
.build(this.taskName);
|
||||||
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||||
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
|
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
|
||||||
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();
|
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();
|
||||||
|
@ -35,9 +35,9 @@ public final class GradleVersions {
|
|||||||
@SuppressWarnings("UnstableApiUsage")
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
public static List<String> allCompatible() {
|
public static List<String> allCompatible() {
|
||||||
if (isJavaVersion(JavaVersion.VERSION_20)) {
|
if (isJavaVersion(JavaVersion.VERSION_20)) {
|
||||||
return Arrays.asList("8.1.1", "8.7");
|
return Arrays.asList("8.1.1", "8.8");
|
||||||
}
|
}
|
||||||
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.7");
|
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.8");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String minimumCompatible() {
|
public static String minimumCompatible() {
|
||||||
|
Loading…
Reference in New Issue
Block a user