Skip to content

build: Add a bom and use micronaut catalog #733

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

Merged
sdelamo merged 6 commits into from
May 31, 2022
Merged

build: Add a bom and use micronaut catalog #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ac8d48
Update .gitattributes to match template
timyates May 26, 2022
6ab030c
gradlew
timyates May 26, 2022
702c72b
build: Switch to managed swagger
timyates May 26, 2022
75442e0
build: bump up micronaut to 3.5.0
sdelamo May 30, 2022
9337477
Merge branch 'master' into managed-swagger
sdelamo May 31, 2022
6f5f4f0
Merge branch 'master' into managed-swagger
sdelamo May 31, 2022
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
16 changes: 9 additions & 7 deletions docs-examples/example-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,21 @@ repositories {
}

dependencies {
testCompileOnly(mn.micronaut.inject.groovy)

testImplementation(platform(mn.micronaut.bom))
testImplementation project(":openapi")
testImplementation(platform(libs.boms.micronaut))
testImplementation(libs.micronaut.runtime)
testImplementation(libs.micronaut.runtime.groovy)
testImplementation(libs.micronaut.validation)
testImplementation(libs.swagger.annotations)
testImplementation(mn.micronaut.runtime)
testImplementation(mn.micronaut.runtime.groovy)
testImplementation(mn.micronaut.validation)
testImplementation(libs.managed.swagger.annotations)
testImplementation(libs.reactor.core)
testImplementation(libs.micronaut.hibernate.validator)
testCompileOnly(libs.micronaut.inject.groovy)
testImplementation(mn.micronaut.hibernate.validator)
testImplementation(libs.testcontainers.spock)
testImplementation(libs.spock.core) {
exclude group: "org.codehaus.groovy", module: "groovy-all"
}

testRuntimeOnly(libs.logback.classic)
}

Expand Down
17 changes: 10 additions & 7 deletions docs-examples/example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ repositories {
}

dependencies {
testImplementation(platform(mn.micronaut.bom))

testImplementation project(":openapi")
testImplementation(platform(libs.boms.micronaut))
testImplementation(libs.micronaut.runtime)
testImplementation(libs.micronaut.inject.java)
testImplementation(libs.micronaut.validation)
testImplementation(libs.swagger.annotations)
testImplementation(mn.micronaut.runtime)
testImplementation(mn.micronaut.inject.java)
testImplementation(mn.micronaut.validation)
testImplementation(libs.managed.swagger.annotations)
testImplementation(libs.reactor.core)
testImplementation(libs.micronaut.hibernate.validator)
testImplementation(mn.micronaut.hibernate.validator)
testImplementation(libs.junit.jupiter.api)
testCompileOnly(libs.micronaut.inject.java)

testCompileOnly(mn.micronaut.inject.java)

testRuntimeOnly(libs.junit.jupiter.engine)
testRuntimeOnly(libs.logback.classic)
}
Expand Down
21 changes: 12 additions & 9 deletions docs-examples/example-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,22 @@ repositories {

dependencies {
kapt project(":openapi")
kapt(libs.micronaut.inject.java)
kapt(libs.micronaut.validation)
kaptTest(libs.micronaut.inject.java)
testImplementation(platform(libs.boms.micronaut))
testImplementation(libs.swagger.annotations)
kapt(mn.micronaut.inject.java)
kapt(mn.micronaut.validation)

kaptTest(mn.micronaut.inject.java)

testImplementation(platform(mn.micronaut.bom))
testImplementation(libs.managed.swagger.annotations)
testImplementation(libs.reactor.core)
testImplementation(libs.micronaut.runtime)
testImplementation(libs.micronaut.validation)
testImplementation(libs.micronaut.hibernate.validator)
testRuntimeOnly(libs.logback.classic)
testImplementation(mn.micronaut.runtime)
testImplementation(mn.micronaut.validation)
testImplementation(mn.micronaut.hibernate.validator)
testImplementation(libs.kotlin.stdlib.jdk8)
testImplementation(libs.kotlin.reflect)
testImplementation(libs.kotlintest.runner.junit5)

testRuntimeOnly(libs.logback.classic)
}

test {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
projectVersion=4.2.3-SNAPSHOT
projectVersion=4.3.0-SNAPSHOT
projectGroup=io.micronaut.openapi

micronautDocsVersion=2.0.0
micronautVersion=3.4.3
micronautVersion=3.5.0
micronautTestVersion=3.2.0
groovyVersion=3.0.10
spockVersion=2.0-groovy-3.0
spockVersion=2.1-groovy-3.0

title=OpenAPI/Swagger Support
projectDesc=Configuration to integrate Micronaut and OpenAPI/Swagger
projectUrl=https://micronaut.io
githubSlug=micronaut-projects/micronaut-openapi
developers=Puneet Behl,Álvaro Sánchez-Mariscal,Iván López

# Micronaut core branch for BOM pull requests
githubCoreBranch=3.5.x
githubCoreBranch=3.6.x

bomProperty=micronautOpenapiVersion
bomProperties=swaggerVersion
Expand Down
31 changes: 5 additions & 26 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,13 @@
[versions]
swagger = "2.2.0"
managed-swagger = "2.2.0"

kotlintest-runner-junit5 = "3.4.2"
kotlin = "1.6.21"

# Micronaut
micronaut = "3.5.0"
micronaut-docs = "2.0.0"


[libraries]
# BOMs
boms-micronaut = { module = "io.micronaut:micronaut-bom", version.ref = "micronaut" }

# Micronaut
micronaut-docs-asciidoc-config-props = { module = "io.micronaut.docs:micronaut-docs-asciidoc-config-props", version.ref = "micronaut-docs" }
micronaut-hibernate-validator = { module = "io.micronaut.beanvalidation:micronaut-hibernate-validator" }
micronaut-http = { module = "io.micronaut:micronaut-http" }
micronaut-http-server = { module = "io.micronaut:micronaut-http-server" }
micronaut-inject-groovy = { module = "io.micronaut:micronaut-inject-groovy" }
micronaut-inject-groovy-test = { module = "io.micronaut:micronaut-inject-groovy-test" }
micronaut-inject-java = { module = "io.micronaut:micronaut-inject-java" }
micronaut-inject-java-test = { module = "io.micronaut:micronaut-inject-java-test" }
micronaut-management = { module = "io.micronaut:micronaut-management" }
micronaut-runtime = { module = "io.micronaut:micronaut-runtime" }
micronaut-runtime-groovy = { module = "io.micronaut.groovy:micronaut-runtime-groovy" }
micronaut-security = { module = "io.micronaut.security:micronaut-security" }
micronaut-validation = { module = "io.micronaut:micronaut-validation" }
managed-swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "managed-swagger" }
managed-swagger-core = { module = "io.swagger.core.v3:swagger-core", version.ref = "managed-swagger" }
managed-swagger-models = { module = "io.swagger.core.v3:swagger-models", version.ref = "managed-swagger" }

# Versions from BOM
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
Expand All @@ -38,9 +20,6 @@ rxjava3 = { module = "io.reactivex.rxjava3:rxjava" }
testcontainers-spock = { module = "org.testcontainers:spock" }

kotlintest-runner-junit5 = { module = "io.kotlintest:kotlintest-runner-junit5", version.ref = "kotlintest-runner-junit5" }
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger" }
swagger-core = { module = "io.swagger.core.v3:swagger-core", version.ref = "swagger" }
swagger-models = { module = "io.swagger.core.v3:swagger-models", version.ref = "swagger" }
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }

Expand Down
3 changes: 3 additions & 0 deletions openapi-bom/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id "io.micronaut.build.internal.bom"
}
35 changes: 16 additions & 19 deletions openapi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,28 @@ plugins {
}

dependencies {
annotationProcessor(libs.micronaut.inject.java)
annotationProcessor(libs.micronaut.docs.asciidoc.config.props)
compileOnly(mn.micronaut.management)
compileOnly(mn.micronaut.inject.java)

compileOnly(libs.micronaut.management)
compileOnly(libs.micronaut.inject.java)

implementation(libs.micronaut.http)
implementation(libs.micronaut.http.server)
implementation(mn.micronaut.http)
implementation(mn.micronaut.http.server)
implementation(libs.reactor.core)

api(libs.swagger.core)
api(libs.swagger.models)
api(libs.swagger.annotations)
api(libs.managed.swagger.core)
api(libs.managed.swagger.models)
api(libs.managed.swagger.annotations)

testImplementation(libs.spock.core)
testImplementation(libs.micronaut.runtime)
testImplementation(libs.micronaut.security)
testImplementation(libs.micronaut.inject.groovy)
testImplementation(libs.micronaut.inject.groovy.test)
testImplementation(libs.micronaut.inject.java)
testImplementation(libs.micronaut.inject.java.test)
testImplementation(libs.micronaut.hibernate.validator)
testImplementation(mn.micronaut.runtime)
testImplementation(mn.micronaut.security)
testImplementation(mn.micronaut.inject.groovy)
testImplementation(mn.micronaut.inject.groovy.test)
testImplementation(mn.micronaut.inject.java)
testImplementation(mn.micronaut.inject.java.test)
testImplementation(mn.micronaut.hibernate.validator)
testImplementation(libs.rxjava2)
testImplementation(libs.rxjava3)
testImplementation(libs.micronaut.management)
testImplementation(mn.micronaut.management)

if (org.gradle.internal.jvm.Jvm.current().getJavaVersion().isJava8()) {
testImplementation files(org.gradle.internal.jvm.Jvm.current().toolsJar)
}
Expand Down
7 changes: 6 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ pluginManagement {
}

plugins {
id("io.micronaut.build.shared.settings") version "5.3.4"
id("io.micronaut.build.shared.settings") version "5.3.9"
}

rootProject.name="openapi-parent"

include "openapi"
include "openapi-bom"
include 'docs-examples:example-groovy'
include 'docs-examples:example-java'
include 'docs-examples:example-kotlin'

micronautBuild {
importMicronautCatalog()
}