Merge branch '2.3.x'

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/AbstractJarFile.java

@@ -45,26 +45,26 @@ abstract class AbstractJarFile extends java.util.jar.JarFile {
 	 * @return the URL
 	 * @throws MalformedURLException if the URL is malformed
 	 */
-	protected abstract URL getUrl() throws MalformedURLException;
+	abstract URL getUrl() throws MalformedURLException;
 
 	/**
 	 * Return the {@link JarFileType} of this instance.
 	 * @return the jar file type
 	 */
-	protected abstract JarFileType getType();
+	abstract JarFileType getType();
 
 	/**
 	 * Return the security permission for this JAR.
 	 * @return the security permission.
 	 */
-	protected abstract Permission getPermission();
+	abstract Permission getPermission();
 
 	/**
 	 * Return an {@link InputStream} for the entire jar contents.
 	 * @return the contents input stream
 	 * @throws IOException on IO error
 	 */
-	protected abstract InputStream getInputStream() throws IOException;
+	abstract InputStream getInputStream() throws IOException;
 
 	/**
 	 * The type of a {@link JarFile}.

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

@@ -178,7 +178,7 @@ public void visitEnd() {
 	}
 
 	@Override
-	protected Permission getPermission() {
+	Permission getPermission() {
 		return new FilePermission(this.rootFile.getFile().getPath(), READ_ACTION);
 	}
 
@@ -248,7 +248,7 @@ public ZipEntry getEntry(String name) {
 	}
 
 	@Override
-	protected InputStream getInputStream() throws IOException {
+	InputStream getInputStream() throws IOException {
 		return this.data.getInputStream();
 	}
 
@@ -421,7 +421,7 @@ protected String getPathFromRoot() {
 	}
 
 	@Override
-	protected JarFileType getType() {
+	JarFileType getType() {
 		return this.type;
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileWrapper.java

@@ -43,17 +43,17 @@ class JarFileWrapper extends AbstractJarFile {
 	}
 
 	@Override
-	protected URL getUrl() throws MalformedURLException {
+	URL getUrl() throws MalformedURLException {
 		return this.parent.getUrl();
 	}
 
 	@Override
-	protected JarFileType getType() {
+	JarFileType getType() {
 		return this.parent.getType();
 	}
 
 	@Override
-	protected Permission getPermission() {
+	Permission getPermission() {
 		return this.parent.getPermission();
 	}
 
@@ -78,7 +78,7 @@ public ZipEntry getEntry(String name) {
 	}
 
 	@Override
-	protected InputStream getInputStream() throws IOException {
+	InputStream getInputStream() throws IOException {
 		return this.parent.getInputStream();
 	}
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpointWithHyphen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.