From 14313115848140af84b9fb66f879cf806f0d3722 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:40:24 -0500 Subject: [PATCH 1/8] aws-java-sdk 1.12.493 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index ff5eec7ca..fb25b5de9 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.465 -com.amazonaws:aws-java-sdk-cloudwatch = 1.12.465 +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.0 com.fasterxml.jackson.core:jackson-databind = 2.15.0 com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.15.0 From 0c7ee0a5066f9e395cb9309f9ba4aca9cbcbc599 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:41:46 -0500 Subject: [PATCH 2/8] aws-sdk-java-v2 2.20.90 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index fb25b5de9..5ac5321fe 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -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 From 32e76ea8d281037ac4afafd690f83ffa994023a2 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:42:41 -0500 Subject: [PATCH 3/8] jackson 2.15.2 --- 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 5ac5321fe..e56f7369c 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.493 com.amazonaws:aws-java-sdk-cloudwatch = 1.12.493 -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.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 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..8990e6938 100644 --- a/spectator-web-spring/build.gradle +++ b/spectator-web-spring/build.gradle @@ -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( From e2ecc91d76292eccf14bd6c07b633f80adb006a8 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:53:46 -0500 Subject: [PATCH 4/8] archaius 2.5.0 --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index e56f7369c..55e9a9f09 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.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 From 22e88530b876d873b6f4a70072be23d7c1170af3 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:54:08 -0500 Subject: [PATCH 5/8] micrometer 1.11.1 --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 55e9a9f09..79d8d9689 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-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 From 77de1773c3ec9facbc9d5d7132b13c53e6ab27cd Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:55:20 -0500 Subject: [PATCH 6/8] equalsverifier 3.14.2 --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 79d8d9689..30bc00e7b 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -19,7 +19,7 @@ io.dropwizard.metrics5:metrics-core = 5.0.0-rc16 # 5.0.0 is a bad version do not 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 From 2cadc84832afa49b597fffc0bf8585e70aef20e6 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:56:59 -0500 Subject: [PATCH 7/8] spring 5.3.28 --- 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 8990e6938..6b5ece3e1 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.11' - implementation 'org.springframework:spring-beans:5.3.27' - implementation 'org.springframework:spring-web:5.3.27' + implementation 'org.springframework:spring-beans:5.3.28' + implementation 'org.springframework:spring-web:5.3.28' implementation 'com.fasterxml.jackson.core:jackson-databind' } From 159c6f79ba95901975841a2fa91816cb538a1c18 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Thu, 22 Jun 2023 10:57:40 -0500 Subject: [PATCH 8/8] spring boot 2.7.12 --- 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 6b5ece3e1..a5ac89801 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.11' + 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'