diff --git a/build.gradle b/build.gradle index 6fcf52dd9..6452e294c 100755 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'com.github.ben-manes.versions' version '0.44.0' - id 'com.github.spotbugs' version '5.0.13' apply false + id 'com.github.spotbugs' version '5.0.14' apply false id 'me.champeau.jmh' version '0.6.8' id 'com.netflix.nebula.dependency-recommender' version '12.2.0' id 'com.netflix.nebula.netflixoss' version '11.3.1' diff --git a/dependencies.properties b/dependencies.properties index 30a4f2887..2ee71e957 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.438 -com.amazonaws:aws-java-sdk-cloudwatch = 1.12.438 -com.fasterxml.jackson.core:jackson-core = 2.14.2 -com.fasterxml.jackson.core:jackson-databind = 2.14.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.14.2 +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.14.3 +com.fasterxml.jackson.core:jackson-databind = 2.14.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.14.3 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.20 +com.netflix.archaius:archaius2-core = 2.3.21 com.netflix.frigga:frigga = 0.26.0 com.netflix.governator:governator = 1.17.13 com.netflix.governator:governator-api = 1.17.13 @@ -16,7 +16,7 @@ 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-rc15 # 5.0.0 is a bad version do not use -io.micrometer:micrometer-core = 1.10.5 +io.micrometer:micrometer-core = 1.10.6 javax.inject:javax.inject = 1 nl.jqno.equalsverifier:equalsverifier = 3.14.1 org.apache.logging.log4j:log4j-api = 2.20.0 @@ -25,9 +25,9 @@ org.apache.logging.log4j:log4j-jcl = 2.20.0 org.apache.logging.log4j:log4j-jul = 2.20.0 org.apache.logging.log4j:log4j-slf4j-impl = 2.20.0 org.hsqldb:hsqldb = 2.7.1 -org.junit.jupiter:junit-jupiter-engine = 5.9.2 +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.35 -software.amazon.awssdk:sdk-core = 2.20.35 +software.amazon.awssdk:aws-core = 2.20.62 +software.amazon.awssdk:sdk-core = 2.20.62 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..fae08049a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spectator-ext-log4j1/build.gradle b/spectator-ext-log4j1/build.gradle index 312688ba9..4ecf85460 100644 --- a/spectator-ext-log4j1/build.gradle +++ b/spectator-ext-log4j1/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':spectator-api') - api "ch.qos.reload4j:reload4j:1.2.24" + api "ch.qos.reload4j:reload4j:1.2.25" } jar { diff --git a/spectator-reg-atlas/build.gradle b/spectator-reg-atlas/build.gradle index 1cbe29e16..66718fb5f 100644 --- a/spectator-reg-atlas/build.gradle +++ b/spectator-reg-atlas/build.gradle @@ -73,7 +73,6 @@ task checkShadowJar { configurations.archives.allArtifacts.forEach { if (it.name == "spectator-reg-atlas" && it.extension == "jar") { Set metadataFiles = [ - "META-INF/LICENSE", "META-INF/MANIFEST.MF", "META-INF/NOTICE", "META-INF/services/com.netflix.spectator.api.Registry", @@ -84,6 +83,7 @@ task checkShadowJar { zf.stream() .filter { !it.directory } .filter { !it.name.startsWith("com/netflix/spectator/atlas/") } + .filter { !it.name.matches("^META-INF/[^/]*LICENSE\$") } .filter { !metadataFiles.contains(it.name) } .forEach { throw new IllegalStateException( diff --git a/spectator-web-spring/build.gradle b/spectator-web-spring/build.gradle index 5bbba7cf2..afb88fbae 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.4' - implementation 'org.springframework:spring-beans:5.3.23' - implementation 'org.springframework:spring-web:5.3.23' + 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 'com.fasterxml.jackson.core:jackson-databind' } @@ -87,7 +87,6 @@ task checkShadowJar { configurations.archives.allArtifacts.forEach { if (it.name == "spectator-web-spring" && it.extension == "jar") { Set metadataFiles = [ - "META-INF/LICENSE", "META-INF/MANIFEST.MF", "META-INF/NOTICE", "META-INF/spectator-web-spring.properties" @@ -97,6 +96,7 @@ task checkShadowJar { zf.stream() .filter { !it.directory } .filter { !it.name.startsWith("com/netflix/spectator/controllers/") } + .filter { !it.name.matches("^META-INF/[^/]*LICENSE\$") } .filter { !metadataFiles.contains(it.name) } .forEach { throw new IllegalStateException(