Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependencies #997

Merged
merged 13 commits into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ jobs:
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK11=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 17
- run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 18
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 18
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
- run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
- name: Build
run: ./gradlew build
run: ./gradlew build
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ jobs:
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK11=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 17
- run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 18
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 18
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
- run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
- name: Build candidate
if: contains(github.ref, '-rc.')
run: ./gradlew --info --stacktrace -Prelease.useLastTag=true candidate
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ jobs:
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK11=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 17
- run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
- name: Set up JDK 18
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 18
distribution: 'zulu'
cache: 'gradle'
- run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
- run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
- name: Build
run: ./gradlew build snapshot
env:
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'com.github.ben-manes.versions' version '0.42.0'
id 'com.github.spotbugs' version '5.0.10' apply false
id 'me.champeau.jmh' version '0.6.6'
id 'com.github.spotbugs' version '5.0.12' apply false
id 'me.champeau.jmh' version '0.6.8'
id 'nebula.dependency-recommender' version '11.0.0'
id 'nebula.netflixoss' version '10.6.0'
}
Expand Down Expand Up @@ -62,15 +62,15 @@ subprojects {
testImplementation 'org.junit.jupiter:junit-jupiter-engine'
testImplementation 'nl.jqno.equalsverifier:equalsverifier'
jmh "org.slf4j:slf4j-simple"
jmh "org.openjdk.jmh:jmh-core:1.33"
jmh "org.openjdk.jmh:jmh-generator-annprocess:1.33"
jmh "org.openjdk.jmh:jmh-core:1.35"
jmh "org.openjdk.jmh:jmh-generator-annprocess:1.35"
}

tasks.withType(Test) {
useJUnitPlatform()
}

[11, 17].each { additionalJDK ->
[17, 19].each { additionalJDK ->
def additionalTestTask = tasks.register("testJDK$additionalJDK", Test) {
description = "Runs tests against JDK $additionalJDK."
group = 'verification'
Expand Down Expand Up @@ -105,7 +105,7 @@ subprojects {
}

spotbugs {
toolVersion = '4.7.1'
toolVersion = '4.7.2'
excludeFilter = rootProject.file('codequality/findbugs-exclude.xml')
ignoreFailures = false
spotbugsMain.enabled = true
Expand Down
32 changes: 16 additions & 16 deletions dependencies.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Auto generated by insight-recommendations build
com.amazonaws:aws-java-sdk-core = 1.12.294
com.amazonaws:aws-java-sdk-cloudwatch = 1.12.294
com.fasterxml.jackson.core:jackson-core = 2.13.3
com.fasterxml.jackson.core:jackson-databind = 2.13.3
com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.13.3
com.amazonaws:aws-java-sdk-core = 1.12.318
com.amazonaws:aws-java-sdk-cloudwatch = 1.12.318
com.fasterxml.jackson.core:jackson-core = 2.13.4
com.fasterxml.jackson.core:jackson-databind = 2.13.4
com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.13.4
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
Expand All @@ -13,22 +13,22 @@ com.netflix.frigga:frigga = 0.25.0
com.netflix.governator:governator = 1.17.12
com.netflix.governator:governator-api = 1.17.12
com.netflix.governator:governator-core = 1.17.12
com.netflix.iep:iep-nflxenv = 3.0.21
com.netflix.iep:iep-nflxenv = 4.0.0
com.netflix.servo:servo-core = 0.13.2
com.typesafe:config = 1.4.2
io.dropwizard.metrics5:metrics-core = 5.0.0-rc11 # 5.0.0 is a bad version do not use
io.micrometer:micrometer-core = 1.9.3
io.micrometer:micrometer-core = 1.9.4
javax.inject:javax.inject = 1
nl.jqno.equalsverifier:equalsverifier = 3.10.1
org.apache.logging.log4j:log4j-api = 2.18.0
org.apache.logging.log4j:log4j-core = 2.18.0
org.apache.logging.log4j:log4j-jcl = 2.18.0
org.apache.logging.log4j:log4j-jul = 2.18.0
org.apache.logging.log4j:log4j-slf4j-impl = 2.18.0
org.hsqldb:hsqldb = 2.6.1
org.junit.jupiter:junit-jupiter-engine = 5.9.0
org.apache.logging.log4j:log4j-api = 2.19.0
org.apache.logging.log4j:log4j-core = 2.19.0
org.apache.logging.log4j:log4j-jcl = 2.19.0
org.apache.logging.log4j:log4j-jul = 2.19.0
org.apache.logging.log4j:log4j-slf4j-impl = 2.19.0
org.hsqldb:hsqldb = 2.7.0
org.junit.jupiter:junit-jupiter-engine = 5.9.1
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.17.265
software.amazon.awssdk:sdk-core = 2.17.265
software.amazon.awssdk:aws-core = 2.17.289
software.amazon.awssdk:sdk-core = 2.17.289
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.21"
api "ch.qos.reload4j:reload4j:1.2.22"
}

jar {
Expand Down
6 changes: 3 additions & 3 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.3'
implementation 'org.springframework:spring-beans:5.3.22'
implementation 'org.springframework:spring-web:5.3.22'
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 'com.fasterxml.jackson.core:jackson-databind'
}

Expand Down