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

Remove code deprecated in 2.x and add since and forRemoval attributes

Browse Source 
Closes gh-32548
Closes gh-32549
This commit is contained in:
Andy Wilkinson
2022-09-30 12:02:16 +01:00
parent 03b3a772c9
commit 51df7813a5
52 changed files with 85 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@@ -59,10 +59,10 @@ abstract class AbstractArchiveIntegrationTests {
}
protected AssertProvider<JarAssert> jar(File file) {
return new AssertProvider<JarAssert>() {
return new AssertProvider<>() {
@Override
@Deprecated
@Deprecated(since = "2.3.0", forRemoval = false)
public JarAssert assertThat() {
return new JarAssert(file);
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@@ -114,10 +114,10 @@ class BuildInfoIntegrationTests {
}
private AssertProvider<BuildInfoAssert> buildInfo(File project, String buildInfo) {
return new AssertProvider<BuildInfoAssert>() {
return new AssertProvider<>() {
@Override
@Deprecated
@Deprecated(since = "2.3.0", forRemoval = false)
public BuildInfoAssert assertThat() {
return new BuildInfoAssert(new File(project, buildInfo));
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 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.
@@ -58,7 +58,7 @@ public class PropertiesMergingResourceTransformer implements ReproducibleResourc
}
@Override
@Deprecated
@Deprecated(since = "2.4.0", forRemoval = false)
public void processResource(String resource, InputStream inputStream, List<Relocator> relocators)
throws IOException {
processResource(resource, inputStream, relocators, 0);