Merge branch '1.1.x' into 1.3.x

micrometer-metrics · Oct 26, 2020 · 796ca2e · 796ca2e
2 parents 22b5690 + bd36749
commit 796ca2e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/build.gradle b/build.gradle
@@ -102,6 +102,13 @@ subprojects {
             }
         }
 
+        jar {
+            metaInf {
+                from "$rootDir/LICENSE"
+                from "$rootDir/NOTICE"
+            }
+        }
+
         if (project.extensions.findByName('bintray')) {
             bintray.labels = ['micrometer', 'atlas', 'metrics', 'prometheus', 'spectator', 'influx', 'new-relic', 'signalfx', 'wavefront', 'elastic', 'dynatrace', 'azure-monitor', 'appoptics', 'kairos', 'stackdriver']
             bintray.packageName = 'io.micrometer'

diff --git a/implementations/micrometer-registry-statsd/build.gradle b/implementations/micrometer-registry-statsd/build.gradle
@@ -27,6 +27,10 @@ shadowJar {
     relocate 'io.netty', 'io.micrometer.shaded.io.netty'
     exclude 'META-INF/native/libnetty_transport_native_epoll_x86_64.so'
     relocate 'org.pcollections', 'io.micrometer.shaded.statsd.org.pcollections'
+    metaInf {
+        from "$rootDir/LICENSE"
+        from "$rootDir/NOTICE"
+    }
 }
 
 jar.enabled = false

diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -102,6 +102,10 @@ shadowJar {
         include(dependency('org.pcollections:'))
     }
     relocate 'org.pcollections', 'io.micrometer.shaded.org.pcollections'
+    metaInf {
+        from "$rootDir/LICENSE"
+        from "$rootDir/NOTICE"
+    }
 }
 
 jar.enabled = false