-
Notifications
You must be signed in to change notification settings - Fork 1
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
Simplify dependency locking and version def #1024
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,8 @@ plugins { | |
|
||
// These plugins are needed to resolve versions of spring dependencies | ||
// transitively added by terra-common-lib | ||
id 'org.springframework.boot' version '3.3.3' | ||
id 'io.spring.dependency-management' version '1.1.5' | ||
id 'io.spring.dependency-management' version "${vSpringDepMgt}" | ||
id 'org.springframework.boot' version "${vSpringBoot}" | ||
} | ||
|
||
sourceCompatibility = JavaVersion.VERSION_17 | ||
|
@@ -39,9 +39,9 @@ dependencies { | |
implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3' | ||
} | ||
|
||
implementation "org.slf4j:slf4j-api:${gradle.vSlf4jApi}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Build script variables do not need gradle qualifier, hence removed in all references |
||
implementation "org.slf4j:slf4j-api:${vSlf4jApi}" | ||
|
||
implementation("bio.terra:terra-common-lib:${gradle.vTerraCommonLib}") { | ||
implementation("bio.terra:terra-common-lib:${vTerraCommonLib}") { | ||
exclude group: 'com.azure' | ||
exclude group: 'io.swagger', module: 'swagger-annotations' | ||
exclude group: 'io.opentelemetry' | ||
|
@@ -53,13 +53,13 @@ dependencies { | |
implementation project(path: ':service') | ||
|
||
// explicity declare libs and version to address synk warnings | ||
implementation "org.springframework:spring-web:${gradle.vSpringWeb}" | ||
implementation "org.springframework:spring-webmvc:${gradle.vSpringWeb}" | ||
testFixturesImplementation "org.springframework:spring-web:${gradle.vSpringWeb}" | ||
testFixturesImplementation "org.springframework:spring-webmvc:${gradle.vSpringWeb}" | ||
implementation "org.springframework:spring-web:${vSpringWeb}" | ||
implementation "org.springframework:spring-webmvc:${vSpringWeb}" | ||
testFixturesImplementation "org.springframework:spring-web:${vSpringWeb}" | ||
testFixturesImplementation "org.springframework:spring-webmvc:${vSpringWeb}" | ||
|
||
// Static analysis | ||
pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}" | ||
pmd "net.sourceforge.pmd:pmd-ant:${vPmd}" | ||
} | ||
|
||
// e.g. ./gradlew annotationProcessor:run -Pgenerator=APPLICATION_CONFIG_DOCS | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,35 @@ | ||
// Required by spotless. https://github.com/diffplug/spotless/issues/747 | ||
buildscript { | ||
ext { | ||
// plugin versions | ||
vSpringBoot = '3.3.4' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. spring boot bumped from 3.3.3 to 3.3.4 |
||
vSpringDepMgt = '1.1.6' | ||
vHidetakeSwagger = '2.19.2' | ||
vGoogleProtobuf = '0.9.4' | ||
|
||
// library versions | ||
vSpringWeb = '6.1.13' | ||
vPmd = '7.1.0' | ||
vTerraCommonLib = '1.1.16-SNAPSHOT' | ||
vApacheCommonsText = '1.12.0' | ||
vSlf4jApi = '2.0.16' | ||
vSpotBugs = '4.8.5' | ||
vJackson = '2.17.2' | ||
vJersey = '3.1.8' // Java 17 compatible | ||
vSwaggerAnnotations = '2.2.22' | ||
vSwaggerCodegen = '3.0.57' | ||
vPicocliVersion = '4.7.6' | ||
vJunit5 = '5.10.2' | ||
} | ||
repositories { | ||
mavenCentral() | ||
} | ||
} | ||
|
||
gradle.ext { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved up. |
||
vSpringBoot = '3.3.3' | ||
vSpringWeb = '6.1.13' | ||
vPmd = '7.1.0' | ||
vTerraCommonLib = '1.1.16-SNAPSHOT' | ||
vApacheCommonsText = '1.12.0' | ||
vSlf4jApi = '2.0.16' | ||
vSpotBugs = '4.8.5' | ||
vJackson = '2.17.2' | ||
vJersey = '3.1.8' // Java 17 compatible | ||
vSwaggerAnnotations = '2.2.22' | ||
vSwaggerCodegen = '3.0.57' | ||
vPicocliVersion = '4.7.6' | ||
vJunit5 = '5.10.2' | ||
tasks.named('dependencies') { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This configures a root task dependencies that depends on below subtasks. hence auto triggered. |
||
dependsOn(':underlay:dependencies') | ||
dependsOn(':service:dependencies') | ||
dependsOn(':cli:dependencies') | ||
dependsOn(':indexer:dependencies') | ||
dependsOn(':annotationProcessor:dependencies') | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Versions defined as build script variables in build.gradle.