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

Jump to bottom

feat(java): 添加Java8组件版本配置 #519

Merged
merged 1 commit into from
Aug 16, 2023
Merged

feat(java): 添加Java8组件版本配置 #519

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
2 changes: 1 addition & 1 deletion .github/workflows/gradle-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java_version: [ 11, 17 ]
java_version: [ 8, 11, 17 ]
steps:
- name: Harden Runner
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java_version: [ 11, 17 ]
java_version: [ 8, 11, 17 ]
steps:
- name: Harden Runner
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ subprojects {
plugin("pub.ihub.plugin.ihub-verification")
plugin("pub.ihub.plugin.ihub-publish")
}
// TODO
iHubBom.bomVersions.clear()
dependencies {
if (project.name != "ihub-core") {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libsJava11.versions.toml → ...e/compatibilityLibs/java1.8.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ sa-token-bom = { module = 'cn.dev33:sa-token-bom', version = '1.35.0.RC' }
guava-bom = { module = 'com.google.guava:guava-bom', version = '32.1.2-jre' }
guice-bom = { module = 'com.google.inject:guice-bom', version = '7.0.0' }
axon-bom = { module = 'org.axonframework:axon-bom', version = '4.8.1' }
spring-boot-admin-dependencies = { module = 'de.codecentric:spring-boot-admin-dependencies', version = '3.1.4' }
spring-boot-admin-dependencies = { module = 'de.codecentric:spring-boot-admin-dependencies', version = '2.7.10' }
spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2022.0.4' }
spring-cloud-alibaba-dependencies = { module = 'com.alibaba.cloud:spring-cloud-alibaba-dependencies', version = '2022.0.0.0' }
spring-cloud-alibaba-dependencies = { module = 'com.alibaba.cloud:spring-cloud-alibaba-dependencies', version = '2021.0.8' }
spring-boot-dependencies = { module = 'org.springframework.boot:spring-boot-dependencies', version = '2.7.14' }
quarkus-dependencies = { module = 'io.quarkus:quarkus-bom', version = '3.2.4.Final' }
springdoc-openapi-dependencies = { module = 'org.springdoc:springdoc-openapi', version = '2.2.0' }
Expand Down
114 changes: 114 additions & 0 deletions gradle/compatibilityLibs/java11.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
[versions]
hutool = '5.8.21'
mybatis-plus = '3.5.3.2'
mapstruct = '1.5.5.Final'
incap = '1.0.0'
fastjson = '2.0.38'

[libraries]
# bom libs
hutool-bom = { module = 'cn.hutool:hutool-bom', version.ref = 'hutool' }
jmolecules-bom = { module = 'org.jmolecules:jmolecules-bom', version = '2023.0.0' }
#spring-modulith-bom = { module = 'org.springframework.modulith:spring-modulith-bom', version = '1.0.0-M1' }
spock-bom = { module = 'org.spockframework:spock-bom', version = '2.3-groovy-4.0' }
sa-token-bom = { module = 'cn.dev33:sa-token-bom', version = '1.35.0.RC' }
guava-bom = { module = 'com.google.guava:guava-bom', version = '32.1.2-jre' }
guice-bom = { module = 'com.google.inject:guice-bom', version = '7.0.0' }
axon-bom = { module = 'org.axonframework:axon-bom', version = '4.8.1' }
spring-boot-admin-dependencies = { module = 'de.codecentric:spring-boot-admin-dependencies', version = '2.7.10' }
spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2022.0.4' }
spring-cloud-alibaba-dependencies = { module = 'com.alibaba.cloud:spring-cloud-alibaba-dependencies', version = '2021.0.8' }
spring-boot-dependencies = { module = 'org.springframework.boot:spring-boot-dependencies', version = '2.7.14' }
quarkus-dependencies = { module = 'io.quarkus:quarkus-bom', version = '3.2.4.Final' }
springdoc-openapi-dependencies = { module = 'org.springdoc:springdoc-openapi', version = '2.2.0' }

# log libs
commons-logging = { module = 'commons-logging:commons-logging' }
log4j = { module = 'log4j:log4j' }
slf4j-api = { module = 'org.slf4j:slf4j-api' }
log4j-core = { module = 'org.apache.logging.log4j:log4j-core' }
slf4j-jcl = { module = 'org.slf4j:slf4j-jcl' }
slf4j-log4j12 = { module = 'org.slf4j:slf4j-log4j12' }
jul-to-slf4j = { module = 'org.slf4j:jul-to-slf4j' }
log4j-over-slf4j = { module = 'org.slf4j:log4j-over-slf4j' }
jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j' }

# mybatis libs
mybatis-plus = { module = 'com.baomidou:mybatis-plus', version.ref = 'mybatis-plus' }
mybatis-plus-annotation = { module = 'com.baomidou:mybatis-plus-annotation', version.ref = 'mybatis-plus' }
mybatis-plus-core = { module = 'com.baomidou:mybatis-plus-core', version.ref = 'mybatis-plus' }
mybatis-plus-extension = { module = 'com.baomidou:mybatis-plus-extension', version.ref = 'mybatis-plus' }
mybatis-plus-boot-starter = { module = 'com.baomidou:mybatis-plus-boot-starter', version.ref = 'mybatis-plus' }
mybatis-plus-generator = { module = 'com.baomidou:mybatis-plus-generator', version.ref = 'mybatis-plus' }

# mapstruct libs
mapstruct = { module = 'org.mapstruct:mapstruct', version.ref = 'mapstruct' }
mapstruct-processor = { module = 'org.mapstruct:mapstruct-processor', version.ref = 'mapstruct' }

# doc libs
swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations' }

# groovy libs
groovy-core = { module = 'org.apache.groovy:groovy' }
groovy-datetime = { module = 'org.apache.groovy:groovy-datetime' }
groovy-dateutil = { module = 'org.apache.groovy:groovy-dateutil' }
groovy-groovydoc = { module = 'org.apache.groovy:groovy-groovydoc' }
groovy-json = { module = 'org.apache.groovy:groovy-json' }
groovy-nio = { module = 'org.apache.groovy:groovy-nio' }
groovy-sql = { module = 'org.apache.groovy:groovy-sql' }
groovy-templates = { module = 'org.apache.groovy:groovy-templates' }
groovy-xml = { module = 'org.apache.groovy:groovy-xml' }

# jmolecules libs
jmolecules-ddd = { module = 'org.jmolecules:jmolecules-ddd' }
jmolecules-events = { module = 'org.jmolecules:jmolecules-events' }
jmolecules-cqrs = { module = 'org.jmolecules:jmolecules-cqrs-architecture' }
jmolecules-layered = { module = 'org.jmolecules:jmolecules-layered-architecture' }
jmolecules-onion = { module = 'org.jmolecules:jmolecules-onion-architecture' }
jmolecules-spring = { module = 'org.jmolecules.integrations:jmolecules-spring' }
jmolecules-jpa = { module = 'org.jmolecules.integrations:jmolecules-jpa' }
jmolecules-jackson = { module = 'org.jmolecules.integrations:jmolecules-jackson' }
jmolecules-archunit = { module = 'org.jmolecules.integrations:jmolecules-archunit' }

# test libs
junit-jupiter = { module = 'org.junit.jupiter:junit-jupiter' }
spock-spring = { module = 'org.spockframework:spock-spring' }
spock-reports = { module = 'com.athaydes:spock-reports', version = '2.5.0-groovy-4.0' }
spring-boot-starter-test = { module = 'org.springframework.boot:spring-boot-starter-test' }
# verification libs
pmd = { module = 'com.alibaba.p3c:p3c-pmd', version = '2.1.1' }

# other libs
hutool-all = { module = 'cn.hutool:hutool-all', version.ref = 'hutool' }
fastjson = { module = 'com.alibaba.fastjson2:fastjson2', version.ref = 'fastjson' }
fastjson-extension = { module = 'com.alibaba.fastjson2:fastjson2-extension', version.ref = 'fastjson' }
fastjson-extension-spring = { module = 'com.alibaba.fastjson2:fastjson2-extension-spring6', version.ref = 'fastjson' }
fastjson-kotlin = { module = 'com.alibaba.fastjson2:fastjson2-kotlin', version.ref = 'fastjson' }
fastjson1 = { module = 'com.alibaba:fastjson', version.ref = 'fastjson' }
justauth = { module = 'me.zhyd.oauth:JustAuth', version = '1.16.5' }
auto-service = { module = 'com.google.auto.service:auto-service', version = '1.1.1' }
compile-testing = { module = 'com.google.testing.compile:compile-testing', version = '0.21.0' }
incap = { module = 'net.ltgt.gradle.incap:incap', version.ref = 'incap' }
incap-processor = { module = 'net.ltgt.gradle.incap:incap-processor', version.ref = 'incap' }
javapoet = { module = 'com.squareup:javapoet', version = '1.13.0' }

[bundles]
platform = [
'hutool-bom', 'jmolecules-bom', 'spock-bom', 'sa-token-bom', 'guava-bom', 'guice-bom',
'axon-bom', 'spring-boot-admin-dependencies', 'spring-cloud-dependencies', 'spring-cloud-alibaba-dependencies',
'spring-boot-dependencies', 'quarkus-dependencies', 'springdoc-openapi-dependencies'
]
constraints = [
'hutool-all', 'fastjson', 'fastjson-extension', 'fastjson-extension-spring', 'fastjson-kotlin', 'fastjson1', 'pmd',
'spock-reports', 'mybatis-plus', 'mybatis-plus-annotation', 'mybatis-plus-core', 'mybatis-plus-extension',
'mybatis-plus-boot-starter', 'mybatis-plus-generator', 'mapstruct', 'mapstruct-processor', 'justauth'
]
groovy = [
'groovy-core', 'groovy-datetime', 'groovy-dateutil', 'groovy-groovydoc', 'groovy-json',
'groovy-nio', 'groovy-sql', 'groovy-templates', 'groovy-xml'
]
slf4j-runtime = ['jul-to-slf4j', 'log4j-over-slf4j', 'jcl-over-slf4j']
jmolecules-cqrs = ['jmolecules-ddd', 'jmolecules-events', 'jmolecules-cqrs']
jmolecules-layered = ['jmolecules-ddd', 'jmolecules-events', 'jmolecules-layered']
jmolecules-onion = ['jmolecules-ddd', 'jmolecules-events', 'jmolecules-onion']
jmolecules-integrations = ['jmolecules-spring', 'jmolecules-jpa', 'jmolecules-jackson']
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import pub.ihub.plugin.IHubSettingsExtension

plugins {
id("pub.ihub.plugin.ihub-settings") version "1.4.0-m1"
id("pub.ihub.plugin.ihub-settings") version "1.4.0-m3"
}

configure<IHubSettingsExtension> {
Expand Down
Loading