Merge branch '1.5.x' into 1.6.x

micrometer-metrics · Feb 17, 2021 · de7d90d · de7d90d
2 parents 41e27d3 + 594e1fe
commit de7d90d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/NOTICE b/NOTICE
@@ -36,3 +36,10 @@ in the Moshi library distributed by Square, Inc:
  * Copyright 2010 Google Inc.
  * License: Apache License v2.0
  * Homepage: https://github.com/square/moshi
+
+This product contains a modified portion of the 'org.springframework.lang'
+package in the Spring Framework library, distributed by Pivotal, Inc:
+
+ * Copyright 2002-2019 the original author or authors.
+ * License: Apache License v2.0
+ * Homepage: https://spring.io/projects/spring-framework
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
@@ -28,7 +28,11 @@
  * <p>Use {@code @NonNullApi} (scope = parameters + return values) and/or {@code @NonNullFields}
  * (scope = fields) to set the default behavior to non-nullable in order to avoid annotating
  * your whole codebase with {@code @NonNull}.
+ * <p>
+ * NOTE: This file has been copied from {org.springframework.lang}.
  *
+ * @author Sebastien Deleuze
+ * @author Juergen Hoeller
  * @see NonNullApi
  * @see NonNullFields
  * @see Nullable

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
@@ -26,7 +26,11 @@
  * tools with JSR-305 support and used by Kotlin to infer nullability of the API.
  * <p>Should be used at package level in association with {@link Nullable}
  * annotations at parameter and return value level.
+ * <p>
+ * NOTE: This file has been copied from {org.springframework.lang}.
  *
+ * @author Sebastien Deleuze
+ * @author Juergen Hoeller
  * @see NonNullFields
  * @see Nullable
  * @see NonNull

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
@@ -26,7 +26,10 @@
  * tools with JSR-305 support and used by Kotlin to infer nullability of the API.
  * <p>Should be used at package level in association with {@link Nullable}
  * annotations at field level.
+ * <p>
+ * NOTE: This file has been copied from {org.springframework.lang}.
  *
+ * @author Sebastien Deleuze
  * @see NonNullFields
  * @see Nullable
  * @see NonNull

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
@@ -28,7 +28,11 @@
  * repeat parent {@code @Nullable} annotations unless they behave differently.
  * <p>Can be used in association with {@code NonNullApi} or {@code @NonNullFields} to
  * override the default non-nullable semantic to nullable.
+ * <p>
+ * NOTE: This file has been copied from {org.springframework.lang}.
  *
+ * @author Sebastien Deleuze
+ * @author Juergen Hoeller
  * @see NonNullApi
  * @see NonNullFields
  * @see NonNull