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.

Sign up for GitHub

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 #176

Merged
merged 1 commit into from
Jul 30, 2024
Merged

Update dependencies #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions annotations-processor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ sourceSets {

dependencies {
implementation project(':conductor-annotations')
api 'com.google.guava:guava:31.1-jre'
api 'com.google.guava:guava:32.1.2-jre'
api 'com.squareup:javapoet:1.13.+'
api 'com.github.jknack:handlebars:4.3.+'
api 'com.google.protobuf:protobuf-java:3.21.7'
api 'com.google.protobuf:protobuf-java:3.21.12'
api 'javax.annotation:javax.annotation-api:1.3.2'
api gradleApi()

Expand Down
22 changes: 11 additions & 11 deletions annotations-processor/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"annotationProcessor": {
"org.springframework.boot:spring-boot-configuration-processor": {
"locked": "2.7.3"
"locked": "2.7.16"
}
},
"compileClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.1"
},
"com.google.guava:guava": {
"locked": "31.1-jre"
"locked": "32.1.2-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"project": true
Expand Down Expand Up @@ -84,10 +84,10 @@
"locked": "4.3.1"
},
"com.google.guava:guava": {
"locked": "31.1-jre"
"locked": "32.1.2-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"project": true
Expand Down Expand Up @@ -134,7 +134,7 @@
"locked": "4.3.1"
},
"com.google.guava:guava": {
"locked": "31.1-jre"
"locked": "32.1.2-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
Expand Down Expand Up @@ -170,18 +170,18 @@
"locked": "5.8.2"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "2.7.16"
}
},
"testRuntimeClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.1"
},
"com.google.guava:guava": {
"locked": "31.1-jre"
"locked": "32.1.2-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
Expand Down Expand Up @@ -232,10 +232,10 @@
"locked": "5.8.2"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "2.7.16"
}
}
}
10 changes: 5 additions & 5 deletions annotations/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"annotationProcessor": {
"org.springframework.boot:spring-boot-configuration-processor": {
"locked": "2.7.3"
"locked": "2.7.16"
}
},
"compileClasspath": {
Expand Down Expand Up @@ -61,10 +61,10 @@
"locked": "5.8.2"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "2.7.16"
}
},
"testRuntimeClasspath": {
Expand All @@ -90,10 +90,10 @@
"locked": "5.8.2"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "2.7.16"
}
}
}
17 changes: 10 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ buildscript {
}
}
dependencies {
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.3'
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.16'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
}
}

plugins {
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
id 'io.spring.dependency-management' version '1.1.3'
id 'java'
id 'application'
id 'jacoco'
id 'nebula.netflixoss' version '10.6.0'
id 'com.netflix.nebula.netflixoss' version '11.3.2'
id 'org.sonarqube' version '3.4.0.2513'
}

Expand Down Expand Up @@ -47,13 +47,16 @@ apply from: "$rootDir/dependencies.gradle"
apply from: "$rootDir/springboot-bom-overrides.gradle"

allprojects {
apply plugin: 'nebula.netflixoss'
apply plugin: 'com.netflix.nebula.netflixoss'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'java-library'
apply plugin: 'project-report'

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

group = 'com.netflix.conductor'

Expand Down
58 changes: 29 additions & 29 deletions client/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"annotationProcessor": {
"org.springframework.boot:spring-boot-configuration-processor": {
"locked": "2.7.3"
"locked": "2.7.16"
}
},
"compileClasspath": {
"com.amazonaws:aws-java-sdk-core": {
"locked": "1.11.86"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
Expand Down Expand Up @@ -68,31 +68,31 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.core:jackson-databind": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.google.protobuf:protobuf-java": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -122,7 +122,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.0.5"
"locked": "2.0.6"
},
"org.apache.commons:commons-lang3": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -177,10 +177,10 @@
"locked": "1.11.86"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
Expand Down Expand Up @@ -222,7 +222,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand All @@ -240,16 +240,16 @@
"locked": "1.7.36"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "2.7.16"
}
},
"testRuntimeClasspath": {
Expand All @@ -260,31 +260,31 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.core:jackson-databind": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.13.3"
"locked": "2.13.5"
},
"com.google.protobuf:protobuf-java": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -317,7 +317,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "2.0.5"
"locked": "2.0.6"
},
"org.apache.commons:commons-lang3": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -361,7 +361,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand All @@ -379,16 +379,16 @@
"locked": "1.7.36"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "2.7.16"
}
}
}
Loading
Loading