Skip to content

Commit

Permalink
refactor: update dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnymillergh committed Nov 29, 2023
1 parent 7d14843 commit 3e9b28b
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 22 deletions.
2 changes: 1 addition & 1 deletion api-gateway/api-gateway-bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jib {
val dockerHubRepositoryPrefix: String by project
val projectArtifactId: String by project
val apiGatewayArtifactId: String by project
to.image = "$dockerHubRepositoryPrefix$projectArtifactId.$apiGatewayArtifactId"
to.image = "${libs.versions.dockerHubRepositoryPrefix.get()}$projectArtifactId.$apiGatewayArtifactId"
to.tags = setOf("${gitVersionDetails.gitHash}-${project.version}")
container.appRoot = "/$apiGatewayArtifactId"
val projectBuildSourceEncoding: String by project
Expand Down
2 changes: 1 addition & 1 deletion auth-center/auth-center-bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jib {
val dockerHubRepositoryPrefix: String by project
val projectArtifactId: String by project
val authCenterArtifactId: String by project
to.image = "$dockerHubRepositoryPrefix$projectArtifactId.$authCenterArtifactId"
to.image = "${libs.versions.dockerHubRepositoryPrefix.get()}$projectArtifactId.$authCenterArtifactId"
to.tags = setOf("${gitVersionDetails.gitHash}-${project.version}")
container.appRoot = "/$authCenterArtifactId"
val projectBuildSourceEncoding: String by project
Expand Down
9 changes: 0 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ developerUrl=https://github.com/johnnymillergh/
projectBuildSourceEncoding=UTF-8
environment=development-local

# Versions of dependencies
javaVersion=17
# https://github.com/gradle/gradle/releases/tag/v7.6
gradleVersion=8.1.1
javaVendor=Eclipse Adoptium
# Don't use alpine or slim version, https://hub.docker.com/_/eclipse-temurin/tags?page=1&name=17.0.7_7-jre
temurinTag=17.0.7_7-jre
dockerHubRepositoryPrefix=docker.io/ijohnnymiller/

# API Gateway constants
apiGatewayPort=8080
apiGatewayArtifactId=api-gateway
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml

[versions]
# https://github.com/gradle/gradle/releases/tag/v7.6
# https://github.com/gradle/gradle/releases/tag/v8.4
gradle = "8.4"
javaVendor = "BellSoft"
# https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.5%2B8
Expand All @@ -13,21 +13,21 @@ jreTag = "jre-21-cds-musl"
dockerHubRepositoryPrefix = "docker.io/ijohnnymiller/"
sas = "0.4.0"
spring-boot-admin = "3.0.4"
springdoc = "2.1.0"
springdoc = "2.2.0"
knife4j = "3.0.3"
logstash = "7.2"
logstash = "7.4"
minio = "8.4.6"
tika = "2.6.0"
guava = "32.0.1-jre"
hutool = "5.8.20"
guava = "32.1.3-jre"
hutool = "5.8.23"
mapstruct = "1.5.5.Final"
mybatis-plus = "3.5.3.1"
# ShardingSphere uses snakeyaml 1.3.3, yet Spring Boot only depends on 1.3.0
# https://www.cnblogs.com/fairjm/p/16860466.html
shardingsphere = "5.2.1"
snakeyaml = "1.33"
jjwt = "0.11.5"
poi = "5.2.3"
poi = "5.2.5"
kotlin = "1.9.21"
spring-boot = "3.2.0"
spring-cloud = "2022.0.4"
Expand All @@ -37,7 +37,7 @@ git-version = "0.15.0"
versions = "0.42.0"
# https://github.com/kordamp/enforcer-gradle-plugin/
# https://kordamp.org/enforcer-gradle-plugin/
project-enforcer = "0.10.0"
project-enforcer = "0.13.0"

[libraries]
spring-boot-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/test-libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
mockito-kotlin = "5.0.0"
mockito-kotlin = "5.1.0"

[libraries]
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
3 changes: 1 addition & 2 deletions oss-center/oss-center-bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,9 @@ jib {
}
}
from.image = "${libs.versions.jreImage.get()}:${libs.versions.jreTag.get()}"
val dockerHubRepositoryPrefix: String by project
val projectArtifactId: String by project
val ossCenterArtifactId: String by project
to.image = "$dockerHubRepositoryPrefix$projectArtifactId.$ossCenterArtifactId"
to.image = "${libs.versions.dockerHubRepositoryPrefix.get()}$projectArtifactId.$ossCenterArtifactId"
to.tags = setOf("${gitVersionDetails.gitHash}-${project.version}")
container.appRoot = "/$ossCenterArtifactId"
val projectBuildSourceEncoding: String by project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jib {
val dockerHubRepositoryPrefix: String by project
val projectArtifactId: String by project
val springBootAdminArtifactId: String by project
to.image = "$dockerHubRepositoryPrefix$projectArtifactId.$springBootAdminArtifactId"
to.image = "${libs.versions.dockerHubRepositoryPrefix.get()}$projectArtifactId.$springBootAdminArtifactId"
to.tags = setOf("${gitVersionDetails.gitHash}-${project.version}")
container.appRoot = "/$springBootAdminArtifactId"
val projectBuildSourceEncoding: String by project
Expand Down

0 comments on commit 3e9b28b

Please sign in to comment.