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

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Moritz Halbritter
2024-02-12 10:19:46 +01:00
parent a62d4e620c 4387b79831
commit 7f55cae90f
50 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParser.java
View File

@@ -203,6 +203,7 @@ final class PrivateKeyParser {
return keyFactory.generatePrivate(keySpec);
}
catch (InvalidKeySpecException | NoSuchAlgorithmException ex) {
// Ignore
}
}
return null;

1
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListenerTests.java
View File

@@ -78,6 +78,7 @@ class TotalProgressListenerTests extends AbstractJsonTests {
Thread.sleep(10);
}
catch (InterruptedException ex) {
// Ignore
}
}

9
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSON.java
View File

@@ -51,7 +51,8 @@ class JSON {
try {
return Double.valueOf((String) value);
}
catch (NumberFormatException ignored) {
catch (NumberFormatException ex) {
// Ignore
}
}
return null;
@@ -68,7 +69,8 @@ class JSON {
try {
return (int) Double.parseDouble((String) value);
}
catch (NumberFormatException ignored) {
catch (NumberFormatException ex) {
// Ignore
}
}
return null;
@@ -85,7 +87,8 @@ class JSON {
try {
return (long) Double.parseDouble((String) value);
}
catch (NumberFormatException ignored) {
catch (NumberFormatException ex) {
// Ignore
}
}
return null;

3
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java
View File

@@ -827,7 +827,8 @@ public class JSONObject {
return o.toString();
}
}
catch (Exception ignored) {
catch (Exception ex) {
// Ignore
}
return null;
}

3
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java
View File

@@ -320,7 +320,8 @@ public class JSONTokener {
try {
return Double.valueOf(literal);
}
catch (NumberFormatException ignored) {
catch (NumberFormatException ex) {
// Ignore
}
/* ... finally give up. We have an unquoted string */

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java
View File

@@ -204,6 +204,7 @@ class BootZipCopyAction implements CopyAction {
outputStream.close();
}
catch (IOException ex) {
// Ignore
}
}

1
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
View File

@@ -127,6 +127,7 @@ public class LaunchedURLClassLoader extends URLClassLoader {
return result;
}
catch (ClassNotFoundException ex) {
// Ignore
}
}
if (this.exploded) {

1
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java
View File

@@ -151,6 +151,7 @@ public class JarFileArchive implements Archive {
return unpackDirectory;
}
catch (IOException ex) {
// Ignore
}
}
throw new IllegalStateException("Failed to create unpack directory in directory '" + parent + "'");

4
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/Handler.java
View File

@@ -140,6 +140,7 @@ public class Handler extends URLStreamHandler {
return connection;
}
catch (IOException ex) {
// Ignore
}
}
return null;
@@ -154,6 +155,7 @@ public class Handler extends URLStreamHandler {
}
}
catch (Exception ex) {
// Ignore
}
}
return false;
@@ -174,6 +176,7 @@ public class Handler extends URLStreamHandler {
}
}
catch (Exception ex) {
// Ignore
}
return null;
}
@@ -425,6 +428,7 @@ public class Handler extends URLStreamHandler {
}
}
catch (Exception ex) {
// Ignore
}
}
finally {

1
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/JarFile.java
View File

@@ -144,6 +144,7 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
super.close();
}
catch (IOException ioex) {
// Ignore
}
throw ex;
}

1
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystem.java
View File

@@ -138,6 +138,7 @@ class NestedFileSystem extends FileSystem {
zipFileSystem.close();
}
catch (Exception ex) {
// Ignore
}
}

1
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/ZipContentTests.java
View File

@@ -88,6 +88,7 @@ class ZipContentTests {
this.zipContent.close();
}
catch (IllegalStateException ex) {
// Ignore
}
}
}

1
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java
View File

@@ -349,6 +349,7 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-2"));
}
catch (IOException ex) {
// Ignore
}
});
}

1
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java
View File

@@ -167,6 +167,7 @@ class WarIntegrationTests extends AbstractArchiveIntegrationTests {
.anyMatch((dependency) -> dependency.startsWith("WEB-INF/lib-provided/"));
}
catch (IOException ex) {
// Ignore
}
});
}

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java
View File

@@ -186,6 +186,7 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
return createdBy != null && createdBy.contains("IntelliJ");
}
catch (Exception ex) {
// Ignore
}
}
return false;
@@ -330,6 +331,7 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
}
}
catch (URISyntaxException ex) {
// Ignore
}
}
return false;