Merge branch '2.2.x' into 2.3.x

scottfrederick · Aug 18, 2020 · 60b5de1 · 60b5de1
2 parents 2b1b096 + 4e76138
commit 60b5de1
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/...a/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java b/...a/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.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.

diff --git a/...rg/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java b/...rg/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.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.

diff --git a/...g/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java b/...g/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.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.

diff --git a/...rg/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java b/...rg/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.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.

diff --git a/...ork/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.java b/...ork/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.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.

diff --git a/...framework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java b/...framework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.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.

diff --git a/...amework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java b/...amework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.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.

diff --git a/...ot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java b/...ot/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.

diff --git a/...spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/AbstractJarFile.java b/...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}.

diff --git a/...t-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/...t-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;
 	}
 

diff --git a/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileWrapper.java b/.../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();
 	}
 

diff --git a/.../spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/.../spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.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.

diff --git a/...-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpointWithHyphen.java b/...-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.

diff --git a/...-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java b/...-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.