Merge branch '2.0.x' into 2.1.x

Closes gh-17334

eclipse/spring-boot-project.setup

@@ -59,7 +59,7 @@
     <requirement
         name="org.eclipse.jdt.feature.group"/>
     <requirement
-        name="io.spring.javaformat.eclipse.feature.feature.group"/>
+        name="io.spring.javaformat.eclipse.feature.feature.group" versionRange="[0.0.14,0.0.15)"/>
     <requirement
         name="org.eclipse.jst.server_adapters.feature.feature.group"/>
     <requirement

pom.xml

@@ -24,7 +24,7 @@
 				</property>
 			</activation>
 			<properties>
-				<spring-javaformat.version>0.0.11</spring-javaformat.version>
+				<spring-javaformat.version>0.0.14</spring-javaformat.version>
 				<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 			</properties>
 			<build>
@@ -37,7 +37,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>8.18</version>
+								<version>8.22</version>
 							</dependency>
 							<dependency>
 								<groupId>io.spring.javaformat</groupId>

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java

@@ -359,12 +359,14 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
 	}
 
 	private byte[] createFakeZipArchive(String fileName, String content) throws IOException {
-		try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(bos)) {
-			ZipEntry entry = new ZipEntry(fileName);
-			zos.putNextEntry(entry);
-			zos.write(content.getBytes());
-			zos.closeEntry();
-			return bos.toByteArray();
+		try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+			try (ZipOutputStream zos = new ZipOutputStream(bos)) {
+				ZipEntry entry = new ZipEntry(fileName);
+				zos.putNextEntry(entry);
+				zos.write(content.getBytes());
+				zos.closeEntry();
+				return bos.toByteArray();
+			}
 		}
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java

@@ -63,44 +63,53 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
 
 	@Test
 	public void severalRepositoriesNoConflict() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream bar = getInputStreamFor("bar")) {
-			ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar).build();
-			validateFoo(repo);
-			validateBar(repo);
-			assertThat(repo.getAllGroups()).hasSize(2);
-			contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.bar.name", "spring.bar.description", "spring.bar.counter");
-			assertThat(repo.getAllProperties()).hasSize(6);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream bar = getInputStreamFor("bar")) {
+				ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar)
+						.build();
+				validateFoo(repo);
+				validateBar(repo);
+				assertThat(repo.getAllGroups()).hasSize(2);
+				contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.bar.name", "spring.bar.description", "spring.bar.counter");
+				assertThat(repo.getAllProperties()).hasSize(6);
+			}
 		}
 	}
 
 	@Test
 	public void repositoryWithRoot() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream root = getInputStreamFor("root")) {
-			ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root).build();
-			validateFoo(repo);
-			assertThat(repo.getAllGroups()).hasSize(2);
-
-			contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.root.name", "spring.root2.name");
-			assertThat(repo.getAllProperties()).hasSize(5);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream root = getInputStreamFor("root")) {
+				ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root)
+						.build();
+				validateFoo(repo);
+				assertThat(repo.getAllGroups()).hasSize(2);
+
+				contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.root.name", "spring.root2.name");
+				assertThat(repo.getAllProperties()).hasSize(5);
+			}
 		}
 	}
 
 	@Test
 	public void severalRepositoriesIdenticalGroups() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream foo2 = getInputStreamFor("foo2")) {
-			ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2).build();
-			assertThat(repo.getAllGroups()).hasSize(1);
-			ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
-			contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
-			assertThat(group.getSources()).hasSize(3);
-			contains(group.getProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.foo.enabled", "spring.foo.type");
-			assertThat(group.getProperties()).hasSize(5);
-			contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.foo.enabled", "spring.foo.type");
-			assertThat(repo.getAllProperties()).hasSize(5);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream foo2 = getInputStreamFor("foo2")) {
+				ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2)
+						.build();
+				assertThat(repo.getAllGroups()).hasSize(1);
+				ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
+				contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
+				assertThat(group.getSources()).hasSize(3);
+				contains(group.getProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.foo.enabled", "spring.foo.type");
+				assertThat(group.getProperties()).hasSize(5);
+				contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.foo.enabled", "spring.foo.type");
+				assertThat(repo.getAllProperties()).hasSize(5);
+			}
 		}
 	}
 
@@ -135,19 +144,22 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
 
 	@Test
 	public void builderInstancesAreIsolated() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream bar = getInputStreamFor("bar")) {
-			ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder.create();
-			ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
-			validateFoo(firstRepo);
-			ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
-			validateFoo(secondRepo);
-			validateBar(secondRepo);
-			// first repo not impacted by second build
-			assertThat(secondRepo).isNotEqualTo(firstRepo);
-			assertThat(firstRepo.getAllGroups()).hasSize(1);
-			assertThat(firstRepo.getAllProperties()).hasSize(3);
-			assertThat(secondRepo.getAllGroups()).hasSize(2);
-			assertThat(secondRepo.getAllProperties()).hasSize(6);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream bar = getInputStreamFor("bar")) {
+				ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder
+						.create();
+				ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
+				validateFoo(firstRepo);
+				ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
+				validateFoo(secondRepo);
+				validateBar(secondRepo);
+				// first repo not impacted by second build
+				assertThat(secondRepo).isNotEqualTo(firstRepo);
+				assertThat(firstRepo.getAllGroups()).hasSize(1);
+				assertThat(firstRepo.getAllProperties()).hasSize(3);
+				assertThat(secondRepo.getAllGroups()).hasSize(2);
+				assertThat(secondRepo.getAllProperties()).hasSize(6);
+			}
 		}
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.11")
+		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.14")
 	}
 }