diff --git a/dependencies.properties b/dependencies.properties index ff5eec7ca..30bc00e7b 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1,14 +1,14 @@ # Auto generated by insight-recommendations build -com.amazonaws:aws-java-sdk-core = 1.12.465 -com.amazonaws:aws-java-sdk-cloudwatch = 1.12.465 -com.fasterxml.jackson.core:jackson-core = 2.15.0 -com.fasterxml.jackson.core:jackson-databind = 2.15.0 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.15.0 +com.amazonaws:aws-java-sdk-core = 1.12.493 +com.amazonaws:aws-java-sdk-cloudwatch = 1.12.493 +com.fasterxml.jackson.core:jackson-core = 2.15.2 +com.fasterxml.jackson.core:jackson-databind = 2.15.2 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.15.2 com.github.ben-manes.caffeine:caffeine = 2.9.3 com.google.inject.extensions:guice-servlet = 5.1.0 com.google.inject:guice = 5.1.0 com.google.re2j:re2j = 1.7 -com.netflix.archaius:archaius2-core = 2.3.21 +com.netflix.archaius:archaius2-core = 2.5.0 com.netflix.frigga:frigga = 0.26.0 com.netflix.governator:governator = 1.17.13 com.netflix.governator:governator-api = 1.17.13 @@ -16,10 +16,10 @@ com.netflix.governator:governator-core = 1.17.13 com.netflix.servo:servo-core = 0.13.2 com.typesafe:config = 1.4.2 io.dropwizard.metrics5:metrics-core = 5.0.0-rc16 # 5.0.0 is a bad version do not use -io.micrometer:micrometer-core = 1.10.6 +io.micrometer:micrometer-core = 1.11.1 javax.inject:javax.inject = 1 net.openhft:zero-allocation-hashing = 0.16 -nl.jqno.equalsverifier:equalsverifier = 3.14.1 +nl.jqno.equalsverifier:equalsverifier = 3.14.2 org.apache.logging.log4j:log4j-api = 2.20.0 org.apache.logging.log4j:log4j-core = 2.20.0 org.apache.logging.log4j:log4j-jcl = 2.20.0 @@ -30,5 +30,5 @@ org.junit.jupiter:junit-jupiter-engine = 5.9.3 org.slf4j:slf4j-api = 1.7.36 org.slf4j:slf4j-nop = 1.7.36 org.slf4j:slf4j-simple = 1.7.36 -software.amazon.awssdk:aws-core = 2.20.62 -software.amazon.awssdk:sdk-core = 2.20.62 +software.amazon.awssdk:aws-core = 2.20.90 +software.amazon.awssdk:sdk-core = 2.20.90 diff --git a/spectator-reg-atlas/build.gradle b/spectator-reg-atlas/build.gradle index 66718fb5f..14379fde8 100644 --- a/spectator-reg-atlas/build.gradle +++ b/spectator-reg-atlas/build.gradle @@ -74,7 +74,6 @@ task checkShadowJar { if (it.name == "spectator-reg-atlas" && it.extension == "jar") { Set metadataFiles = [ "META-INF/MANIFEST.MF", - "META-INF/NOTICE", "META-INF/services/com.netflix.spectator.api.Registry", "META-INF/spectator-reg-atlas.properties" ] @@ -84,6 +83,7 @@ task checkShadowJar { .filter { !it.directory } .filter { !it.name.startsWith("com/netflix/spectator/atlas/") } .filter { !it.name.matches("^META-INF/[^/]*LICENSE\$") } + .filter { !it.name.matches("^META-INF/[^/]*NOTICE\$") } .filter { !metadataFiles.contains(it.name) } .forEach { throw new IllegalStateException( diff --git a/spectator-web-spring/build.gradle b/spectator-web-spring/build.gradle index afb88fbae..a5ac89801 100644 --- a/spectator-web-spring/build.gradle +++ b/spectator-web-spring/build.gradle @@ -21,9 +21,9 @@ plugins { dependencies { api project(':spectator-api') - implementation 'org.springframework.boot:spring-boot-autoconfigure:2.7.11' - implementation 'org.springframework:spring-beans:5.3.27' - implementation 'org.springframework:spring-web:5.3.27' + implementation 'org.springframework.boot:spring-boot-autoconfigure:2.7.12' + implementation 'org.springframework:spring-beans:5.3.28' + implementation 'org.springframework:spring-web:5.3.28' implementation 'com.fasterxml.jackson.core:jackson-databind' } @@ -88,7 +88,6 @@ task checkShadowJar { if (it.name == "spectator-web-spring" && it.extension == "jar") { Set metadataFiles = [ "META-INF/MANIFEST.MF", - "META-INF/NOTICE", "META-INF/spectator-web-spring.properties" ] ZipFile zf = new ZipFile(it.file) @@ -97,6 +96,7 @@ task checkShadowJar { .filter { !it.directory } .filter { !it.name.startsWith("com/netflix/spectator/controllers/") } .filter { !it.name.matches("^META-INF/[^/]*LICENSE\$") } + .filter { !it.name.matches("^META-INF/[^/]*NOTICE\$") } .filter { !metadataFiles.contains(it.name) } .forEach { throw new IllegalStateException(