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

chore: Bump dependencies #65

Merged
merged 5 commits into from
Nov 23, 2023
Merged

chore: Bump dependencies #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f327276
chore: Bump dependencies
lorenzsimon Nov 22, 2023
280bde4
chore: Bump dependencies
lorenzsimon Nov 23, 2023
04df315
chore: Set Java version in GH actions
lorenzsimon Nov 23, 2023
22477b4
fix: Autoconfig migration
lorenzsimon Nov 23, 2023
d81df56
fix: Migrate Jakarta
lorenzsimon Nov 23, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<description>Example for Kotlin AsyncAPI Spring Boot Application</description>

<properties>
<java.version>11</java.version>
<kotlin.version>1.8.22</kotlin.version>
<spring-boot.version>2.7.6</spring-boot.version>
<java.version>17</java.version>
<kotlin.version>1.9.10</kotlin.version>
<spring-boot.version>3.2.0</spring-boot.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -51,7 +51,7 @@
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
</dependency>
<dependency>

Check warning on line 54 in kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml

View workflow job for this annotation

GitHub Actions / Qodana

Library and maven plugin versions are different 

Plugin version (1.9.10) is not the same as library version (null)
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</dependency>
Expand All @@ -72,7 +72,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
<plugin>

Check warning on line 75 in kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml

View workflow job for this annotation

GitHub Actions / Qodana

Library and maven plugin versions are different 

Plugin version (null) is not the same as library version (1.9.20)
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<configuration>
Expand Down
24 changes: 18 additions & 6 deletions kotlin-asyncapi-spring-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<artifactId>swagger-core-jakarta</artifactId>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
Expand All @@ -46,17 +46,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>[5.3.13,5.3.24]</version>
<version>[5.3.16,5.3.30], [6.1.0,)</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>[5.3.13,5.3.24]</version>
<version>[5.3.16,5.3.30], [6.1.0,)</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>[2.6.0,2.7.6]</version>
<version>[2.6.4,2.7.17], [3.2.0,)</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -76,14 +76,26 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.6</version>
<version>3.2.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-logging</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.7.6</version>
<version>3.2.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-logging</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
3 changes: 2 additions & 1 deletion ...-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring.factories
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.openfolder.kotlinasyncapi.springweb.AsyncApiAutoConfiguration
40 changes: 31 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>1.6.21</kotlin.version>
<java.version>17</java.version>
<kotlin.version>1.9.10</kotlin.version>
<jackson.version>2.15.3</jackson.version>
<swagger.version>2.2.19</swagger.version>
<classgraph.version>4.8.163</classgraph.version>
<mockk.version>1.12.3</mockk.version>
<jsonassert.version>1.5.1</jsonassert.version>
<junit-jupiter.version>5.10.1</junit-jupiter.version>
<assertj.version>3.24.2</assertj.version>
</properties>

<build>
Expand Down Expand Up @@ -214,7 +222,7 @@
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk</artifactId>
<version>1.12.3</version>
<version>${mockk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -244,37 +252,51 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.2</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<version>2.14.2</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<version>2.2.8</version>
<artifactId>swagger-core-jakarta</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.157</version>
<version>${classgraph.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<version>${jsonassert.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.22.0</version>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Loading