From a5830e6001a24999e1faeda4455654c5717e9519 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:03:09 -0500 Subject: [PATCH 01/11] gradle 8.1.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 73c99409c317c2adf90a95ec5f7a18708b134b5d Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:05:24 -0500 Subject: [PATCH 02/11] gradle spotbugs 5.0.14 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From a1d6ea6a967152b52a82955537d5639c92405f70 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:06:53 -0500 Subject: [PATCH 03/11] reload4j 1.2.25 --- spectator-ext-log4j1/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { From 012e79c8944ee35c41721b70da3f639c42a7b14b Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:08:28 -0500 Subject: [PATCH 04/11] aws-java-sdk 1.12.465 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 30a4f2887..6a4c3ec3b 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1,6 +1,6 @@ # 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.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.2 com.fasterxml.jackson.core:jackson-databind = 2.14.2 com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.14.2 From a430ea64322f0f0838de1611e22b3a30c4ec82c9 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:09:10 -0500 Subject: [PATCH 05/11] aws-sdk-java-v2 2.20.62 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 6a4c3ec3b..91a850a2b 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -29,5 +29,5 @@ org.junit.jupiter:junit-jupiter-engine = 5.9.2 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 From 8bd475dd420506b0cbb424048781208cca8b168e Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:10:06 -0500 Subject: [PATCH 06/11] jackson 2.14.3 --- dependencies.properties | 6 +++--- spectator-reg-atlas/build.gradle | 2 +- spectator-web-spring/build.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 91a850a2b..e266b8d51 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1,9 +1,9 @@ # 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.14.2 -com.fasterxml.jackson.core:jackson-databind = 2.14.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.14.2 +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 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..ef52b24d1 100644 --- a/spectator-web-spring/build.gradle +++ b/spectator-web-spring/build.gradle @@ -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( From 1c87278c72d70fd35cead9e97e4a50ae52dedf46 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:41:58 -0500 Subject: [PATCH 07/11] archaius 2.3.21 --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index e266b8d51..c96ecd739 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,7 +8,7 @@ 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 From a13ccb5c94b5f4bda03e1c33af2535b8ffc03335 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:42:26 -0500 Subject: [PATCH 08/11] micrometer 1.10.6 --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index c96ecd739..83256c571 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -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 From 2608819a88b64d5bda518484126308f8b2a65489 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:42:47 -0500 Subject: [PATCH 09/11] junit-jupiter-engine 5.9.3 --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 83256c571..2ee71e957 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -25,7 +25,7 @@ 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 From da889cc851d88c34cae423b99cd88874861343ed Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:43:45 -0500 Subject: [PATCH 10/11] spring 5.3.27 --- spectator-web-spring/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spectator-web-spring/build.gradle b/spectator-web-spring/build.gradle index ef52b24d1..bf3cd8db0 100644 --- a/spectator-web-spring/build.gradle +++ b/spectator-web-spring/build.gradle @@ -22,8 +22,8 @@ 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:spring-beans:5.3.27' + implementation 'org.springframework:spring-web:5.3.27' implementation 'com.fasterxml.jackson.core:jackson-databind' } From 3160855db6e71cbc58d404f9eeadb45e0dc82175 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Mon, 8 May 2023 20:44:01 -0500 Subject: [PATCH 11/11] spring-boot-autoconfigure 2.7.11 --- spectator-web-spring/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spectator-web-spring/build.gradle b/spectator-web-spring/build.gradle index bf3cd8db0..afb88fbae 100644 --- a/spectator-web-spring/build.gradle +++ b/spectator-web-spring/build.gradle @@ -21,7 +21,7 @@ plugins { dependencies { api project(':spectator-api') - implementation 'org.springframework.boot:spring-boot-autoconfigure:2.7.4' + 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'