root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

This commit is contained in:
Phillip Webb 2023-02-21 23:51:52 -08:00
parent c4de86c244 3651ba348d
commit 01e8c42c16
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTest.java → spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2020-2022 the original author or authors. * Copyright 2020-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,7 +27,7 @@ import org.springframework.graphql.test.tester.GraphQlTester;
* @author Brian Clozel * @author Brian Clozel
*/ */
@GraphQlTest(BookController.class) @GraphQlTest(BookController.class)
class GraphQlTestIntegrationTest { class GraphQlTestIntegrationTests {
@Autowired @Autowired
private GraphQlTester graphQlTester; private GraphQlTester graphQlTester;

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTest.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class ImportCandidatesTest { class ImportCandidatesTests {
@Test @Test
void loadReadsFromClasspathFile() { void loadReadsFromClasspathFile() {

2
src/checkstyle/checkstyle-suppressions.xml
View File

@ -73,4 +73,6 @@
<suppress files="FailureAnalyzers\.java" checks="RedundantModifier" /> <suppress files="FailureAnalyzers\.java" checks="RedundantModifier" />
<suppress files="SpringBootVersion" checks="JavadocPackage" /> <suppress files="SpringBootVersion" checks="JavadocPackage" />
<suppress files="spring-boot-configuration-processor[\\/]src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]boot[\\/]configurationsample[\\/]" checks="SpringDeprecatedCheck"/> <suppress files="spring-boot-configuration-processor[\\/]src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]boot[\\/]configurationsample[\\/]" checks="SpringDeprecatedCheck"/>
<suppress files="WebEndpointTest\.java" checks="SpringTestFileName" />
<suppress files="ConversionServiceTest\.java" checks="SpringTestFileName" />
</suppressions> </suppressions>