Skip to content

Commit

Permalink
update dependencies (#1055)
Browse files Browse the repository at this point in the history
  • Loading branch information
brharrington authored May 9, 2023
2 parents 5d14a28 + 3160855 commit a3a516a
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
20 changes: 10 additions & 10 deletions dependencies.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# 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
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
Expand All @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion spectator-ext-log4j1/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion spectator-reg-atlas/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ task checkShadowJar {
configurations.archives.allArtifacts.forEach {
if (it.name == "spectator-reg-atlas" && it.extension == "jar") {
Set<String> metadataFiles = [
"META-INF/LICENSE",
"META-INF/MANIFEST.MF",
"META-INF/NOTICE",
"META-INF/services/com.netflix.spectator.api.Registry",
Expand All @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions spectator-web-spring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -87,7 +87,6 @@ task checkShadowJar {
configurations.archives.allArtifacts.forEach {
if (it.name == "spectator-web-spring" && it.extension == "jar") {
Set<String> metadataFiles = [
"META-INF/LICENSE",
"META-INF/MANIFEST.MF",
"META-INF/NOTICE",
"META-INF/spectator-web-spring.properties"
Expand All @@ -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(
Expand Down

0 comments on commit a3a516a

Please sign in to comment.