Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-37828
This commit is contained in:
Andy Wilkinson
2023-10-11 15:00:24 +01:00
parent a80f8ea5e6 1acb02d62c
commit 781ac2ece2
12 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
View File

@@ -82,7 +82,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test
void generateProject() throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip";
String fileName = UUID.randomUUID() + ".zip";
File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", fileName);
@@ -177,7 +177,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test
void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip";
String fileName = UUID.randomUUID() + ".zip";
File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist();
try {
@@ -195,7 +195,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test
void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip";
String fileName = UUID.randomUUID() + ".zip";
File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist();
try {

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -137,7 +137,7 @@ class DependencyFilterMojoTests {
}
private static File createArtifactFile(String jarType) {
Path jarPath = temp.resolve(UUID.randomUUID().toString() + ".jar");
Path jarPath = temp.resolve(UUID.randomUUID() + ".jar");
Manifest manifest = new Manifest();
manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
if (jarType != null) {