Skip to content

Commit

Permalink
build: update dependency versions and add new Maven repository (#695)
Browse files Browse the repository at this point in the history
* build: update dependency versions and add new Maven repository

- Update dependency versions across multiple modules
- Add new Maven repository for LinYiPackages
- Refactor dependency names to use lowercase and hyphens
- Update plugin versions and naming conventions

* build: update dependency versions and add new Maven repository

- Update dependency versions across multiple modules
- Add new Maven repository for LinYiPackages
- Refactor dependency names to use lowercase and hyphens
- Update plugin versions and naming conventions

* refactor: update library versions and naming conventions

- Update library versions: - spring-boot: 3.4.1
  - spring-cloud: 2024.0.0
  - okhttp: 4.12.0
  - testcontainers: 1.20.4
  - guava: 33.4.0-jre
  - mybatis:3.5.19 - mybatis-spring-boot:3.0.4
  - junit-pioneer: 2.2.0
  - axon: 4.10.4  - flowable: 7.1.0
  - activiti: 7.0.0.SR1
  - springdoc: 2.8.1
- Update plugin versions:
  - test-retry: 1.6.0
  - publish-plugin: 2.0.0
  - jmh-plugin: 0.7.2
  - spotbugs:6.0.27
- Update library and plugin naming conventions to use hyphens instead of camelCase
  • Loading branch information
Ahoo-Wang authored Jan 10, 2025
1 parent 6d0d90d commit 3005139
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 44 deletions.
16 changes: 12 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import org.gradle.testretry.TestRetryPlugin
*/

plugins {
alias(libs.plugins.testRetry)
alias(libs.plugins.publishPlugin)
alias(libs.plugins.jmhPlugin)
alias(libs.plugins.spotbugsPlugin)
alias(libs.plugins.test.retry)
alias(libs.plugins.publish)
alias(libs.plugins.jmh)
alias(libs.plugins.spotbugs)
`java-library`
jacoco
}
Expand Down Expand Up @@ -183,6 +183,14 @@ configure(publishProjects) {
password = System.getenv("GITHUB_TOKEN")
}
}
maven {
name = "LinYiPackages"
url = uri(project.properties["linyiPackageReleaseUrl"].toString())
credentials {
username = project.properties["linyiPackageUsername"]?.toString()
password = project.properties["linyiPackagePwd"]?.toString()
}
}
}
publications {
val publishName = if (isBom) "mavenBom" else "mavenLibrary"
Expand Down
2 changes: 1 addition & 1 deletion cosid-activiti/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
implementation(libs.activitiEngine)
implementation(libs.activiti.engine)
api(project(":cosid-core"))
testImplementation(project(":cosid-test"))

Expand Down
2 changes: 1 addition & 1 deletion cosid-axon/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
api(platform(libs.axonBom))
api(platform(libs.axon.bom))
api(project(":cosid-core"))
testImplementation(project(":cosid-test"))
implementation("org.axonframework:axon-messaging")
Expand Down
16 changes: 8 additions & 8 deletions cosid-dependencies/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
*/

dependencies {
api(platform(libs.springBootDependencies))
api(platform(libs.springCloudDependencies))
api(platform(libs.okhttpBom))
api(platform(libs.testcontainersBom))
api(platform(libs.spring.boot.dependencies))
api(platform(libs.spring.cloud.dependencies))
api(platform(libs.okhttp.bom))
api(platform(libs.testcontainers.bom))
constraints {
api(libs.guava)
api(libs.mybatis)
api(libs.mybatisSpringBoot)
api(libs.springDocStarterWebfluxUi)
api(libs.junitPioneer)
api(libs.mybatis.spring.boot.starter)
api(libs.springdoc.openapi.starter.webflux.ui)
api(libs.junit.pioneer)
api(libs.hamcrest)
api(libs.jmhCore)
api(libs.jmhGeneratorAnnprocess)
api(libs.jmh.generator.annprocess)
}
}
2 changes: 1 addition & 1 deletion cosid-flowable/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
implementation(libs.flowableEngineCommon)
implementation(libs.flowable.engine.common)
api(project(":cosid-core"))
testImplementation(project(":cosid-test"))

Expand Down
6 changes: 3 additions & 3 deletions cosid-spring-boot-starter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ dependencies {
"proxySupportImplementation"(project(":cosid-proxy"))
"mongoSupportImplementation"(project(":cosid-mongo"))
"activitiSupportImplementation"(project(":cosid-activiti"))
"activitiSupportImplementation"(libs.activitiSpringBootStarter)
"activitiSupportImplementation"(libs.activiti.spring.boot.starter)
"flowableSupportImplementation"(project(":cosid-flowable"))
"flowableSupportImplementation"(libs.flowableSpring)
"flowableSupportImplementation"(libs.flowableSpringBootAutoconfigure)
"flowableSupportImplementation"(libs.flowable.spring)
"flowableSupportImplementation"(libs.flowable.spring.boot.autoconfigure)
"mybatisSupportImplementation"(project(":cosid-mybatis"))
"dataJdbcSupportImplementation"(project(":cosid-spring-data-jdbc"))
api("org.springframework.boot:spring-boot-starter")
Expand Down
52 changes: 26 additions & 26 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
[versions]
# libraries
springBoot = "3.4.1"
springCloud = "2024.0.0"
spring-boot = "3.4.1"
spring-cloud = "2024.0.0"
okhttp = "4.12.0"
testcontainers = "1.20.4"
guava = "33.4.0-jre"
mybatis = "3.5.19"
mybatisSpringBoot = "3.0.4"
junitPioneer = "2.2.0"
mybatis-spring-boot = "3.0.4"
junit-pioneer = "2.2.0"
axon = "4.10.4"
flowable = "7.1.0"
activiti = "7.0.0.SR1"
springDoc = "2.8.1"
springdoc = "2.8.1"
hamcrest = "3.0"
jmh = "1.37"
# plugins
testRetry= "1.6.0"
publishPlugin = "2.0.0"
jmhPlugin = "0.7.2"
test-retry = "1.6.0"
publish-plugin = "2.0.0"
jmh-plugin = "0.7.2"
spotbugs = "6.0.27"

[libraries]
springBootDependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springBoot" }
springCloudDependencies = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "springCloud" }
okhttpBom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
axonBom = { module = "org.axonframework:axon-bom", version.ref = "axon" }
testcontainersBom = { module = "org.testcontainers:testcontainers-bom", version.ref = "testcontainers" }
spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
spring-cloud-dependencies = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" }
okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
axon-bom = { module = "org.axonframework:axon-bom", version.ref = "axon" }
testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version.ref = "testcontainers" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
mybatis = { module = "org.mybatis:mybatis", version.ref = "mybatis" }
mybatisSpringBoot = { module = "org.mybatis.spring.boot:mybatis-spring-boot-starter", version.ref = "mybatisSpringBoot" }
springDocStarterWebfluxUi = { module = "org.springdoc:springdoc-openapi-starter-webflux-ui", version.ref = "springDoc" }
activitiEngine = { module = "org.activiti:activiti-engine", version.ref = "activiti" }
activitiSpringBootStarter = { module = "org.activiti:activiti-spring-boot-starter", version.ref = "activiti" }
flowableEngineCommon = { module = "org.flowable:flowable-engine-common", version.ref = "flowable" }
flowableSpring = { module = "org.flowable:flowable-spring", version.ref = "flowable" }
flowableSpringBootAutoconfigure = { module = "org.flowable:flowable-spring-boot-autoconfigure", version.ref = "flowable" }
junitPioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junitPioneer" }
mybatis-spring-boot-starter = { module = "org.mybatis.spring.boot:mybatis-spring-boot-starter", version.ref = "mybatis-spring-boot" }
springdoc-openapi-starter-webflux-ui = { module = "org.springdoc:springdoc-openapi-starter-webflux-ui", version.ref = "springdoc" }
activiti-engine = { module = "org.activiti:activiti-engine", version.ref = "activiti" }
activiti-spring-boot-starter = { module = "org.activiti:activiti-spring-boot-starter", version.ref = "activiti" }
flowable-engine-common = { module = "org.flowable:flowable-engine-common", version.ref = "flowable" }
flowable-spring = { module = "org.flowable:flowable-spring", version.ref = "flowable" }
flowable-spring-boot-autoconfigure = { module = "org.flowable:flowable-spring-boot-autoconfigure", version.ref = "flowable" }
junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" }
hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
jmhCore = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
jmhGeneratorAnnprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
[plugins]
testRetry = { id = "org.gradle.test-retry", version.ref = "testRetry" }
publishPlugin = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "publishPlugin" }
jmhPlugin = { id = "me.champeau.jmh", version.ref = "jmhPlugin" }
spotbugsPlugin = { id = "com.github.spotbugs", version.ref = "spotbugs" }
test-retry = { id = "org.gradle.test-retry", version.ref = "test-retry" }
publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "publish-plugin" }
jmh = { id = "me.champeau.jmh", version.ref = "jmh-plugin" }
spotbugs = { id = "com.github.spotbugs", version.ref = "spotbugs" }

0 comments on commit 3005139

Please sign in to comment.