Merge branch '1.2.x' into 1.3.x

grantkl · Oct 25, 2019 · 3b10f95 · 3b10f95
2 parents b4e97e0 + 7b1d902
commit 3b10f95
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/...ns/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogConfigTest.java b/...ns/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogConfigTest.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
  * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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,
@@ -95,4 +95,4 @@ public String get(String key) {
         }
 
     }
-}
+}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/BaseUnits.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/BaseUnits.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
  * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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,

diff --git a/...r-core/src/main/java/io/micrometer/core/util/internal/logging/AbstractInternalLogger.java b/...r-core/src/main/java/io/micrometer/core/util/internal/logging/AbstractInternalLogger.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/FormattingTuple.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/FormattingTuple.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/InternalLogLevel.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/InternalLogLevel.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/InternalLogger.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/InternalLogger.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/...er-core/src/main/java/io/micrometer/core/util/internal/logging/InternalLoggerFactory.java b/...er-core/src/main/java/io/micrometer/core/util/internal/logging/InternalLoggerFactory.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/JdkLogger.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/JdkLogger.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/JdkLoggerFactory.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/JdkLoggerFactory.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/...core/src/main/java/io/micrometer/core/util/internal/logging/LocationAwareSlf4JLogger.java b/...core/src/main/java/io/micrometer/core/util/internal/logging/LocationAwareSlf4JLogger.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/MessageFormatter.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/MessageFormatter.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/Slf4JLogger.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/Slf4JLogger.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/...meter-core/src/main/java/io/micrometer/core/util/internal/logging/Slf4JLoggerFactory.java b/...meter-core/src/main/java/io/micrometer/core/util/internal/logging/Slf4JLoggerFactory.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT

diff --git a/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/package-info.java b/micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/package-info.java
@@ -20,7 +20,7 @@
  * 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:
  *
- *   http://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, WITHOUT