From 418ebf8effc066f8010565a3bbaf03addb4f6e69 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Tue, 4 Jan 2022 16:06:20 -0800
Subject: [PATCH 1/2] Automate non-Javadoc multi-line comments for license
 headers fixes gh-2942 related: gh-2412 gh-2940

---
 build.gradle             | 2 +-
 gradle/licenseHeader.txt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9fe4b00a5a..67fc3294a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,7 +168,7 @@ subprojects {
             header rootProject.file('gradle/licenseHeader.txt')
             strictCheck true
             mapping {
-                kt = 'JAVADOC_STYLE'
+                java = 'SLASHSTAR_STYLE'
             }
             sourceSets = project.sourceSets
 
diff --git a/gradle/licenseHeader.txt b/gradle/licenseHeader.txt
index 9cf2b2645c..36ed148038 100644
--- a/gradle/licenseHeader.txt
+++ b/gradle/licenseHeader.txt
@@ -1,11 +1,11 @@
 Copyright ${year} VMware, Inc.
-<p>
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-<p>
+
 https://www.apache.org/licenses/LICENSE-2.0
-<p>
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

From 988b5bd5ec80407d24bad5ab374b5841b164bf97 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Tue, 4 Jan 2022 16:47:56 -0800
Subject: [PATCH 2/2] Regenerate license headers using the license plugin
 related: gh-2942 gh-2412 gh-2940

---
 .../src/test/resources/logback.xml             |  6 +++---
 .../src/test/resources/logback.xml             |  6 +++---
 .../io/micrometer/dynatrace/package-info.java  |  1 -
 .../src/test/resources/logback.xml             |  6 +++---
 .../io/micrometer/health/package-info.java     |  1 -
 .../src/test/resources/logback.xml             |  6 +++---
 .../src/test/resources/logback.xml             |  6 +++---
 .../binder/cache/CaffeineStatsCounter.java     |  1 -
 .../CommonsObjectPool2Metrics.java             |  3 +--
 .../AbstractMetricCollectingInterceptor.java   |  1 -
 .../grpc/MetricCollectingClientCall.java       |  1 -
 .../MetricCollectingClientInterceptor.java     |  1 -
 .../MetricCollectingServerInterceptor.java     |  1 -
 .../binder/jetty/JettyStatisticsMetrics.java   |  2 +-
 .../binder/kafka/KafkaClientMetrics.java       |  2 +-
 .../binder/kafka/KafkaStreamsMetrics.java      | 18 ++++++++++--------
 .../OnlyOnceLoggingDenyMeterFilter.java        |  3 +--
 .../java/io/micrometer/core/lang/NonNull.java  |  6 +++---
 .../io/micrometer/core/lang/NonNullApi.java    |  6 +++---
 .../io/micrometer/core/lang/NonNullFields.java |  6 +++---
 .../java/io/micrometer/core/lang/Nullable.java |  6 +++---
 .../micrometer-core/native-image.properties    |  2 ++
 .../binder/cache/CaffeineStatsCounterTest.java |  1 -
 .../CommonsObjectPool2MetricsTest.java         |  2 +-
 .../instrument/util/AbstractPartitionTest.java | 18 ++++++++++--------
 .../binder/logging/log4j2-async-logger.xml     |  6 +++---
 .../log4j2-root-logger-additivity-false.xml    |  6 +++---
 micrometer-core/src/test/resources/logback.xml |  6 +++---
 micrometer-test/src/test/resources/logback.xml |  6 +++---
 .../src/main/resources/application.yml         |  6 +++---
 .../main/resources/application-appoptics.yml   |  6 +++---
 .../src/main/resources/application-atlas.yml   |  6 +++---
 .../resources/application-azuremonitor.yml     |  6 +++---
 .../src/main/resources/application-datadog.yml |  6 +++---
 .../main/resources/application-dynatrace.yml   |  6 +++---
 .../src/main/resources/application-elastic.yml |  6 +++---
 .../src/main/resources/application-ganglia.yml |  6 +++---
 .../src/main/resources/application-humio.yml   |  6 +++---
 .../src/main/resources/application-influx.yml  |  6 +++---
 .../src/main/resources/application-jmx.yml     |  6 +++---
 .../src/main/resources/application-kairos.yml  |  6 +++---
 .../application-prometheus-pushgateway.yml     |  6 +++---
 .../main/resources/application-prometheus.yml  |  6 +++---
 .../main/resources/application-signalfx.yml    |  6 +++---
 .../main/resources/application-stackdriver.yml |  6 +++---
 .../resources/application-statsd-datadog.yml   |  6 +++---
 .../main/resources/application-statsd-etsy.yml |  6 +++---
 .../resources/application-statsd-telegraf.yml  |  6 +++---
 .../main/resources/application-wavefront.yml   |  6 +++---
 .../src/main/resources/application.yml         |  6 +++---
 .../src/main/resources/logback.xml             |  6 +++---
 .../src/main/resources/logback.xml             |  6 +++---
 .../hazelcast4/HazelcastCacheSample.java       |  1 -
 .../src/main/resources/logback.xml             |  6 +++---
 .../hazelcast3/HazelcastCacheSample.java       |  1 -
 .../src/main/resources/logback.xml             |  6 +++---
 56 files changed, 141 insertions(+), 147 deletions(-)

diff --git a/implementations/micrometer-registry-atlas/src/test/resources/logback.xml b/implementations/micrometer-registry-atlas/src/test/resources/logback.xml
index cd890fdf8c..4c73e7630a 100644
--- a/implementations/micrometer-registry-atlas/src/test/resources/logback.xml
+++ b/implementations/micrometer-registry-atlas/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/implementations/micrometer-registry-datadog/src/test/resources/logback.xml b/implementations/micrometer-registry-datadog/src/test/resources/logback.xml
index 5c59c3a682..1796d69cb2 100644
--- a/implementations/micrometer-registry-datadog/src/test/resources/logback.xml
+++ b/implementations/micrometer-registry-datadog/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/package-info.java b/implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/package-info.java
index 4052192beb..9f27ceb6d5 100644
--- a/implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/package-info.java
+++ b/implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/package-info.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 @NonNullApi
 @NonNullFields
 package io.micrometer.dynatrace;
diff --git a/implementations/micrometer-registry-graphite/src/test/resources/logback.xml b/implementations/micrometer-registry-graphite/src/test/resources/logback.xml
index e59d59a31d..825b1a65f0 100644
--- a/implementations/micrometer-registry-graphite/src/test/resources/logback.xml
+++ b/implementations/micrometer-registry-graphite/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/package-info.java b/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/package-info.java
index 67dab86815..b7709d229c 100644
--- a/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/package-info.java
+++ b/implementations/micrometer-registry-health/src/main/java/io/micrometer/health/package-info.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * SLO-based health meter registry.
  */
diff --git a/implementations/micrometer-registry-humio/src/test/resources/logback.xml b/implementations/micrometer-registry-humio/src/test/resources/logback.xml
index 5c59c3a682..1796d69cb2 100644
--- a/implementations/micrometer-registry-humio/src/test/resources/logback.xml
+++ b/implementations/micrometer-registry-humio/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/implementations/micrometer-registry-statsd/src/test/resources/logback.xml b/implementations/micrometer-registry-statsd/src/test/resources/logback.xml
index e59d59a31d..825b1a65f0 100644
--- a/implementations/micrometer-registry-statsd/src/test/resources/logback.xml
+++ b/implementations/micrometer-registry-statsd/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java
index eae2c39264..cdb1ce9aa9 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.cache;
 
 import static java.util.Objects.requireNonNull;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java
index 07f5b30b9b..fbb290c6b5 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Pivotal Software, Inc.
+ * Copyright 2020 VMware, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.commonspool2;
 
 import io.micrometer.core.instrument.*;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/AbstractMetricCollectingInterceptor.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/AbstractMetricCollectingInterceptor.java
index 14af5ae05b..e784111d53 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/AbstractMetricCollectingInterceptor.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/AbstractMetricCollectingInterceptor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.EnumMap;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
index fac4664ce2..c03b5c4aa0 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.function.Consumer;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientInterceptor.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientInterceptor.java
index 70e17f85ef..ec2d383e79 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientInterceptor.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientInterceptor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.function.Consumer;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerInterceptor.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerInterceptor.java
index 7b7f770e71..b76073b6e9 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerInterceptor.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerInterceptor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.function.Consumer;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jetty/JettyStatisticsMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jetty/JettyStatisticsMetrics.java
index 532bbe903f..4478f51273 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jetty/JettyStatisticsMetrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jetty/JettyStatisticsMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Pivotal Software, Inc.
+ * Copyright 2017 VMware, Inc.
  *
  * 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/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java
index 1e55477dfc..ba4aff8396 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java
@@ -2,7 +2,7 @@
  * Copyright 2020 VMware, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use super file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  * https://www.apache.org/licenses/LICENSE-2.0
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaStreamsMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaStreamsMetrics.java
index 8e32b5ae20..d774a6f350 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaStreamsMetrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaStreamsMetrics.java
@@ -1,15 +1,17 @@
 /*
  * Copyright 2020 VMware, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use super file except
- * in compliance with the License. You may obtain a copy of the License at
- * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.micrometer.core.instrument.binder.kafka;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/OnlyOnceLoggingDenyMeterFilter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/OnlyOnceLoggingDenyMeterFilter.java
index 6eefed3b22..717d707cb2 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/OnlyOnceLoggingDenyMeterFilter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/OnlyOnceLoggingDenyMeterFilter.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.internal;
 
 import io.micrometer.core.instrument.Meter.Id;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java
index 26a3a20b68..46f06058a6 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java
index aedc077054..9bb9d1527e 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java
index 9eda7cb6de..5acaf12b34 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java b/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java
index 167bb730cf..f9be9d1df1 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/main/resources/META-INF/native-image/io.micrometer/micrometer-core/native-image.properties b/micrometer-core/src/main/resources/META-INF/native-image/io.micrometer/micrometer-core/native-image.properties
index 403847a5d4..2b4a0808f7 100644
--- a/micrometer-core/src/main/resources/META-INF/native-image/io.micrometer/micrometer-core/native-image.properties
+++ b/micrometer-core/src/main/resources/META-INF/native-image/io.micrometer/micrometer-core/native-image.properties
@@ -1,3 +1,4 @@
+#
 # Copyright 2021 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,5 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 
 Args = -H:ReflectionConfigurationResources=${.}/reflect-config.json
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounterTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounterTest.java
index 39dcc5fffa..33352db421 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounterTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounterTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2MetricsTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2MetricsTest.java
index a2a40bcee5..b37ebb3690 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2MetricsTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2MetricsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Pivotal Software, Inc.
+ * Copyright 2020 VMware, Inc.
  *
  * 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/micrometer-core/src/test/java/io/micrometer/core/instrument/util/AbstractPartitionTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/util/AbstractPartitionTest.java
index ccde7bd32d..03467d9a71 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/util/AbstractPartitionTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/util/AbstractPartitionTest.java
@@ -1,15 +1,17 @@
 /*
  * Copyright 2019 VMware, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.micrometer.core.instrument.util;
 
diff --git a/micrometer-core/src/test/resources/binder/logging/log4j2-async-logger.xml b/micrometer-core/src/test/resources/binder/logging/log4j2-async-logger.xml
index d84a1686dd..050b6c664c 100644
--- a/micrometer-core/src/test/resources/binder/logging/log4j2-async-logger.xml
+++ b/micrometer-core/src/test/resources/binder/logging/log4j2-async-logger.xml
@@ -2,13 +2,13 @@
 <!--
 
     Copyright 2019 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/test/resources/binder/logging/log4j2-root-logger-additivity-false.xml b/micrometer-core/src/test/resources/binder/logging/log4j2-root-logger-additivity-false.xml
index 3cb36e3f2b..b17e7c0bce 100644
--- a/micrometer-core/src/test/resources/binder/logging/log4j2-root-logger-additivity-false.xml
+++ b/micrometer-core/src/test/resources/binder/logging/log4j2-root-logger-additivity-false.xml
@@ -2,13 +2,13 @@
 <!--
 
     Copyright 2019 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-core/src/test/resources/logback.xml b/micrometer-core/src/test/resources/logback.xml
index 4f0c9679ae..bd9a31725b 100644
--- a/micrometer-core/src/test/resources/logback.xml
+++ b/micrometer-core/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/micrometer-test/src/test/resources/logback.xml b/micrometer-test/src/test/resources/logback.xml
index e2c9c594d3..b91b76e001 100644
--- a/micrometer-test/src/test/resources/logback.xml
+++ b/micrometer-test/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2-reactive/src/main/resources/application.yml b/samples/micrometer-samples-boot2-reactive/src/main/resources/application.yml
index b30b19ebe3..d99daefea4 100644
--- a/samples/micrometer-samples-boot2-reactive/src/main/resources/application.yml
+++ b/samples/micrometer-samples-boot2-reactive/src/main/resources/application.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2020 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-appoptics.yml b/samples/micrometer-samples-boot2/src/main/resources/application-appoptics.yml
index 71b72d6c2f..82148520ae 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-appoptics.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-appoptics.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-atlas.yml b/samples/micrometer-samples-boot2/src/main/resources/application-atlas.yml
index bf6fef0cdf..2d5aa88dce 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-atlas.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-atlas.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-azuremonitor.yml b/samples/micrometer-samples-boot2/src/main/resources/application-azuremonitor.yml
index 9c54c099d6..3e99792eec 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-azuremonitor.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-azuremonitor.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-datadog.yml b/samples/micrometer-samples-boot2/src/main/resources/application-datadog.yml
index e3ac3c818b..113fab7e0b 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-datadog.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-datadog.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-dynatrace.yml b/samples/micrometer-samples-boot2/src/main/resources/application-dynatrace.yml
index 90c0e6041c..aa89440276 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-dynatrace.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-dynatrace.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-elastic.yml b/samples/micrometer-samples-boot2/src/main/resources/application-elastic.yml
index 456171b88f..d5a97668fa 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-elastic.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-elastic.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-ganglia.yml b/samples/micrometer-samples-boot2/src/main/resources/application-ganglia.yml
index 316f1d4ab9..2a3863bb24 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-ganglia.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-ganglia.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-humio.yml b/samples/micrometer-samples-boot2/src/main/resources/application-humio.yml
index 3fbc83c53c..b2906c236b 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-humio.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-humio.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2018 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-influx.yml b/samples/micrometer-samples-boot2/src/main/resources/application-influx.yml
index 42df34d709..949c67dcfe 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-influx.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-influx.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-jmx.yml b/samples/micrometer-samples-boot2/src/main/resources/application-jmx.yml
index e6b0a51588..7d71a549dd 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-jmx.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-jmx.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-kairos.yml b/samples/micrometer-samples-boot2/src/main/resources/application-kairos.yml
index a10a56960c..c83646700c 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-kairos.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-kairos.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-prometheus-pushgateway.yml b/samples/micrometer-samples-boot2/src/main/resources/application-prometheus-pushgateway.yml
index 92eda13c63..c7b93631f3 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-prometheus-pushgateway.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-prometheus-pushgateway.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-prometheus.yml b/samples/micrometer-samples-boot2/src/main/resources/application-prometheus.yml
index ab91ebd8e4..91c8d4b813 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-prometheus.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-prometheus.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-signalfx.yml b/samples/micrometer-samples-boot2/src/main/resources/application-signalfx.yml
index 5be43d100a..7590749068 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-signalfx.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-signalfx.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-stackdriver.yml b/samples/micrometer-samples-boot2/src/main/resources/application-stackdriver.yml
index 190e535570..b313d6d20b 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-stackdriver.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-stackdriver.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2018 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-statsd-datadog.yml b/samples/micrometer-samples-boot2/src/main/resources/application-statsd-datadog.yml
index 6923924a06..bcbbd3e32f 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-statsd-datadog.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-statsd-datadog.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-statsd-etsy.yml b/samples/micrometer-samples-boot2/src/main/resources/application-statsd-etsy.yml
index 58256f553b..fe5c64bc10 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-statsd-etsy.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-statsd-etsy.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-statsd-telegraf.yml b/samples/micrometer-samples-boot2/src/main/resources/application-statsd-telegraf.yml
index d53f315c24..d956984e64 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-statsd-telegraf.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-statsd-telegraf.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application-wavefront.yml b/samples/micrometer-samples-boot2/src/main/resources/application-wavefront.yml
index 7d96a6a2e3..51b9e54305 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application-wavefront.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application-wavefront.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/application.yml b/samples/micrometer-samples-boot2/src/main/resources/application.yml
index 8b0a9e3a88..4400c22f01 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/application.yml
+++ b/samples/micrometer-samples-boot2/src/main/resources/application.yml
@@ -1,12 +1,12 @@
 #
 # Copyright 2017 VMware, Inc.
-# <p>
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# <p>
+#
 # https://www.apache.org/licenses/LICENSE-2.0
-# <p>
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-boot2/src/main/resources/logback.xml b/samples/micrometer-samples-boot2/src/main/resources/logback.xml
index 959b18f717..2d77291d71 100644
--- a/samples/micrometer-samples-boot2/src/main/resources/logback.xml
+++ b/samples/micrometer-samples-boot2/src/main/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-core/src/main/resources/logback.xml b/samples/micrometer-samples-core/src/main/resources/logback.xml
index 168f7d9910..4c60b4dec5 100644
--- a/samples/micrometer-samples-core/src/main/resources/logback.xml
+++ b/samples/micrometer-samples-core/src/main/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-hazelcast/src/main/java/io/micrometer/samples/hazelcast4/HazelcastCacheSample.java b/samples/micrometer-samples-hazelcast/src/main/java/io/micrometer/samples/hazelcast4/HazelcastCacheSample.java
index 270add36e7..6c861c1f2a 100644
--- a/samples/micrometer-samples-hazelcast/src/main/java/io/micrometer/samples/hazelcast4/HazelcastCacheSample.java
+++ b/samples/micrometer-samples-hazelcast/src/main/java/io/micrometer/samples/hazelcast4/HazelcastCacheSample.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.samples.hazelcast4;
 
 import com.hazelcast.core.Hazelcast;
diff --git a/samples/micrometer-samples-hazelcast/src/main/resources/logback.xml b/samples/micrometer-samples-hazelcast/src/main/resources/logback.xml
index ea04195d39..ce445d4a56 100644
--- a/samples/micrometer-samples-hazelcast/src/main/resources/logback.xml
+++ b/samples/micrometer-samples-hazelcast/src/main/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2020 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/samples/micrometer-samples-hazelcast3/src/main/java/io/micrometer/samples/hazelcast3/HazelcastCacheSample.java b/samples/micrometer-samples-hazelcast3/src/main/java/io/micrometer/samples/hazelcast3/HazelcastCacheSample.java
index 06d73a00e6..a88db1fa44 100644
--- a/samples/micrometer-samples-hazelcast3/src/main/java/io/micrometer/samples/hazelcast3/HazelcastCacheSample.java
+++ b/samples/micrometer-samples-hazelcast3/src/main/java/io/micrometer/samples/hazelcast3/HazelcastCacheSample.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.samples.hazelcast3;
 
 import com.hazelcast.core.Hazelcast;
diff --git a/samples/micrometer-samples-hazelcast3/src/main/resources/logback.xml b/samples/micrometer-samples-hazelcast3/src/main/resources/logback.xml
index ea04195d39..ce445d4a56 100644
--- a/samples/micrometer-samples-hazelcast3/src/main/resources/logback.xml
+++ b/samples/micrometer-samples-hazelcast3/src/main/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2020 VMware, Inc.
-    <p>
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.