From 852e6a199ff8e96708748c3834f63d32926b0009 Mon Sep 17 00:00:00 2001 From: Lorenz Simon Date: Thu, 23 Nov 2023 21:51:33 +0100 Subject: [PATCH] chore: Bump dependencies (#66) * feat: Implement message model annotations (#43) * feat - Implement message model annotations * chore - Remove unused dependencies * feat: Process message and schema annotations (#44) * feat - Implement Message annotation processing * feat - Merge annotation components * feat - Add schema annotation processor * refactor - Make annotation processor context dynamic test - Add annotation provider integration test * chore - ktlint format * refactor - Refactor dependency management --------- Co-authored-by: lorenzsimon * feat: Channel annotation processing (#45) * feat - Add Channel and Operation annotations * feat - Add Channel processing * refactor - Annotation keys to values * chore - Fix confusing test values * refactor: Annotation mapping (#47) * refactor - Annotation mapping improvements * refactor - Add option for inline messages and schemas * refactor - Use classname for channel component keys if autogenerated * fix - Typo * test - Fix Schemas test * feat: Add Kotlin module to model resolver (#48) feat - Add Kotlin module to model resolver * feat: Bind channels to annotation components (#49) * refactor - Context providers * feat - Bind channels to annotation components * refactor - Annotation components binding * chore - Format * chore: Add Spring Boot example application (#63) * chore: Add Spring Boot example application * fix: Java version * fix: Test * chore: Bump dependencies (#65) * chore: Bump dependencies * chore: Bump dependencies * chore: Set Java version in GH actions * fix: Autoconfig migration * fix: Migrate Jakarta --------- Co-authored-by: Lorenz Simon <95355196+lorenz-scalable@users.noreply.github.com> --- .github/workflows/build.yml | 5 +++ .github/workflows/deploy.yml | 5 +++ .../pom.xml | 6 +-- kotlin-asyncapi-spring-web/pom.xml | 24 ++++++++--- .../springweb/AsyncApiAutoConfiguration.kt | 3 +- .../main/resources/META-INF/spring.factories | 2 - ...ot.autoconfigure.AutoConfiguration.imports | 1 + pom.xml | 40 ++++++++++++++----- 8 files changed, 65 insertions(+), 21 deletions(-) delete mode 100644 kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring.factories create mode 100644 kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba9a372..17677d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,11 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v3 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - name: Restore Cache uses: actions/cache@v1 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d425d1d..f823c91 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,6 +14,11 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - name: Restore cache uses: actions/cache@v1 with: diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml index 433e5e3..114d08c 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml @@ -16,9 +16,9 @@ Example for Kotlin AsyncAPI Spring Boot Application - 11 - 1.8.22 - 2.7.6 + 17 + 1.9.10 + 3.2.0 diff --git a/kotlin-asyncapi-spring-web/pom.xml b/kotlin-asyncapi-spring-web/pom.xml index 4f15c87..0e1001a 100644 --- a/kotlin-asyncapi-spring-web/pom.xml +++ b/kotlin-asyncapi-spring-web/pom.xml @@ -37,7 +37,7 @@ io.swagger.core.v3 - swagger-core + swagger-core-jakarta io.github.classgraph @@ -46,17 +46,17 @@ org.springframework spring-web - [5.3.13,5.3.24] + [5.3.16,5.3.30], [6.1.0,) org.springframework spring-context - [5.3.13,5.3.24] + [5.3.16,5.3.30], [6.1.0,) org.springframework.boot spring-boot-autoconfigure - [2.6.0,2.7.6] + [2.6.4,2.7.17], [3.2.0,) org.jetbrains.kotlin @@ -76,14 +76,26 @@ org.springframework.boot spring-boot-starter-test - 2.7.6 + 3.2.0 test + + + spring-boot-starter-logging + org.springframework.boot + + org.springframework.boot spring-boot-starter-web - 2.7.6 + 3.2.0 test + + + spring-boot-starter-logging + org.springframework.boot + + diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index 22be7a9..9a90cef 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -19,6 +19,7 @@ import org.openfolder.kotlinasyncapi.springweb.service.AsyncApiSerializer import org.openfolder.kotlinasyncapi.springweb.service.AsyncApiService import org.openfolder.kotlinasyncapi.springweb.service.DefaultAsyncApiSerializer import org.openfolder.kotlinasyncapi.springweb.service.DefaultAsyncApiService +import org.springframework.boot.autoconfigure.AutoConfiguration import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnClass import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean @@ -32,7 +33,7 @@ import kotlin.reflect.KClass import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost -@Configuration +@AutoConfiguration @ConditionalOnBean(AsyncApiMarkerConfiguration.Marker::class) @Import(AsyncApiScriptAutoConfiguration::class, AsyncApiAnnotationAutoConfiguration::class) internal open class AsyncApiAutoConfiguration { diff --git a/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring.factories b/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 40fffd1..0000000 --- a/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.openfolder.kotlinasyncapi.springweb.AsyncApiAutoConfiguration \ No newline at end of file diff --git a/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cfd19cf --- /dev/null +++ b/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.openfolder.kotlinasyncapi.springweb.AsyncApiAutoConfiguration \ No newline at end of file diff --git a/pom.xml b/pom.xml index 90d160c..43d1696 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,15 @@ UTF-8 - 1.6.21 + 17 + 1.9.10 + 2.15.3 + 2.2.19 + 4.8.163 + 1.12.3 + 1.5.1 + 5.10.1 + 3.24.2 @@ -214,7 +222,7 @@ io.mockk mockk - 1.12.3 + ${mockk.version} test @@ -244,37 +252,51 @@ com.fasterxml.jackson.core jackson-databind - 2.14.2 + ${jackson.version} com.fasterxml.jackson.module jackson-module-kotlin - 2.14.2 + ${jackson.version} io.swagger.core.v3 - swagger-core - 2.2.8 + swagger-core-jakarta + ${swagger.version} io.github.classgraph classgraph - 4.8.157 + ${classgraph.version} org.jetbrains.kotlin kotlin-scripting-jvm-host ${kotlin.version} + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + test + org.skyscreamer jsonassert - 1.5.0 + ${jsonassert.version} + test org.assertj assertj-core - 3.22.0 + ${assertj.version} + test