diff --git a/initializr-generator/pom.xml b/initializr-generator/pom.xml index 6e9f4fbf70..026c402db9 100644 --- a/initializr-generator/pom.xml +++ b/initializr-generator/pom.xml @@ -1,4 +1,20 @@ + + 4.0.0 @@ -26,6 +42,11 @@ spring-context + + com.google.code.findbugs + jsr305 + + com.samskivert jmustache diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java index 371c6fd853..59d111662d 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -121,6 +121,7 @@ public T generate(ProjectDescription description, ProjectAssetGenerator p * @param description the description of the project to generate * @return a list of candidate configurations */ + @SuppressWarnings("deprecation") protected List getCandidateProjectGenerationConfigurations(ProjectDescription description) { return SpringFactoriesLoader.loadFactoryNames(ProjectGenerationConfiguration.class, getClass().getClassLoader()); diff --git a/initializr-parent/pom.xml b/initializr-parent/pom.xml index bdfb384311..6564faa07d 100644 --- a/initializr-parent/pom.xml +++ b/initializr-parent/pom.xml @@ -95,6 +95,14 @@ android-json 0.0.20131108.vaadin1 + + + com.google.code.findbugs + jsr305 + 3.0.2 + @@ -174,6 +182,8 @@ ${java.version} ${java.version} true + true + true diff --git a/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/DefaultMavenVersionResolver.java b/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/DefaultMavenVersionResolver.java index 1418ae1976..f44a7f2f3b 100644 --- a/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/DefaultMavenVersionResolver.java +++ b/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/DefaultMavenVersionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -67,7 +67,7 @@ * @author Andy Wilkinson * @author Stephane Nicoll */ -@SuppressWarnings("removal") +@SuppressWarnings("deprecation") class DefaultMavenVersionResolver implements MavenVersionResolver { private static final Log logger = LogFactory.getLog(DefaultMavenVersionResolver.class); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java index c76839e354..adc1482c12 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -273,7 +273,7 @@ private void untar(Path archiveFile, Path project) throws IOException { } private void unzip(Path archiveFile, Path project) throws IOException { - try (ZipFile zip = new ZipFile(archiveFile.toFile())) { + try (ZipFile zip = ZipFile.builder().setPath(archiveFile).get()) { Enumeration entries = zip.getEntries(); while (entries.hasMoreElements()) { ZipArchiveEntry entry = entries.nextElement();