From 07eaf7e280b06eaa82ff6b875f9d6e212765e2eb Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 17 Dec 2022 17:28:25 +0100 Subject: [PATCH 1/8] Upgrade spring boot=3.0.0 --- .../springwolf-common-model-converters/build.gradle | 2 +- springwolf-core/build.gradle | 2 +- springwolf-examples/springwolf-amqp-example/build.gradle | 2 +- .../springwolf-cloud-stream-example/build.gradle | 2 +- springwolf-examples/springwolf-kafka-example/build.gradle | 2 +- springwolf-plugins/springwolf-amqp-plugin/build.gradle | 2 +- springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle | 2 +- springwolf-plugins/springwolf-kafka-plugin/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/springwolf-add-ons/springwolf-common-model-converters/build.gradle b/springwolf-add-ons/springwolf-common-model-converters/build.gradle index fd2574842..88fef5d32 100644 --- a/springwolf-add-ons/springwolf-common-model-converters/build.gradle +++ b/springwolf-add-ons/springwolf-common-model-converters/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' } diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index d96778441..e4d50aff1 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -4,7 +4,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' } diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 6cc92e61e..1c1497ca1 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' id 'com.bmuschko.docker-spring-boot-application' version '6.7.0' diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index 98103c68c..a9b8c10f4 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' id 'com.bmuschko.docker-spring-boot-application' version '6.7.0' diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index f76ccc260..de3255680 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' id 'com.bmuschko.docker-spring-boot-application' version '6.7.0' diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index 609892926..28fbf29fc 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' } diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index 696354740..5a3540232 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' } diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index f3a37054e..ee3263f6c 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '2.7.6' + id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' } From fa3fe005ad3ab8ca67253c39dcc0aef09d631625 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 17 Dec 2022 17:58:33 +0100 Subject: [PATCH 2/8] Upgrade spring boot=3.0.0 --- .github/workflows/publish-releases.yml | 7 ++++--- .github/workflows/springwolf-amqp.yml | 7 ++++--- .github/workflows/springwolf-cloud-stream.yml | 7 ++++--- .github/workflows/springwolf-core.yml | 7 ++++--- .github/workflows/springwolf-kafka.yml | 7 ++++--- .../build.gradle | 2 +- springwolf-core/build.gradle | 2 +- .../asyncapi/DefaultAsyncApiSerializerService.java | 2 +- .../asyncapi/DefaultAsyncApiService.java | 3 +-- .../springwolf-amqp-example/build.gradle | 4 ++-- .../springwolf-cloud-stream-example/build.gradle | 4 ++-- .../springwolf-kafka-example/build.gradle | 14 ++------------ .../springwolf-amqp-plugin/build.gradle | 2 +- .../springwolf-cloud-stream-plugin/build.gradle | 2 +- .../cloudstream/FunctionalChannelBeanData.java | 2 +- .../springwolf-kafka-plugin/build.gradle | 2 +- 16 files changed, 34 insertions(+), 40 deletions(-) diff --git a/.github/workflows/publish-releases.yml b/.github/workflows/publish-releases.yml index ac150d27a..e86f39bc2 100644 --- a/.github/workflows/publish-releases.yml +++ b/.github/workflows/publish-releases.yml @@ -11,10 +11,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '17' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/springwolf-amqp.yml b/.github/workflows/springwolf-amqp.yml index 42973526f..53a572b70 100644 --- a/.github/workflows/springwolf-amqp.yml +++ b/.github/workflows/springwolf-amqp.yml @@ -30,10 +30,11 @@ jobs: options: -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} run: spectral lint --ruleset ./.spectral.yaml --fail-on-unmatched-globs ./springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '17' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/springwolf-cloud-stream.yml b/.github/workflows/springwolf-cloud-stream.yml index 2da142665..9aafb33a9 100644 --- a/.github/workflows/springwolf-cloud-stream.yml +++ b/.github/workflows/springwolf-cloud-stream.yml @@ -30,10 +30,11 @@ jobs: options: -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} run: spectral lint --ruleset ./.spectral.yaml --fail-on-unmatched-globs ./springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '17' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/springwolf-core.yml b/.github/workflows/springwolf-core.yml index 8264ff63f..192daa796 100644 --- a/.github/workflows/springwolf-core.yml +++ b/.github/workflows/springwolf-core.yml @@ -18,10 +18,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '17' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/springwolf-kafka.yml b/.github/workflows/springwolf-kafka.yml index c61144a8b..73e2f0d7b 100644 --- a/.github/workflows/springwolf-kafka.yml +++ b/.github/workflows/springwolf-kafka.yml @@ -30,10 +30,11 @@ jobs: options: -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} run: spectral lint --ruleset ./.spectral.yaml --fail-on-unmatched-globs ./springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '17' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/springwolf-add-ons/springwolf-common-model-converters/build.gradle b/springwolf-add-ons/springwolf-common-model-converters/build.gradle index 88fef5d32..edfb92f3b 100644 --- a/springwolf-add-ons/springwolf-common-model-converters/build.gradle +++ b/springwolf-add-ons/springwolf-common-model-converters/build.gradle @@ -11,7 +11,7 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.1.2' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = 1.8 +sourceCompatibility = '17' repositories { mavenCentral() diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index e4d50aff1..914e1d323 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -12,7 +12,7 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group = 'io.github.springwolf' version = '0.9.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = 1.8 +sourceCompatibility = '17' repositories { mavenCentral() diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java index 211b042b1..7325801e6 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java @@ -18,9 +18,9 @@ import io.github.stavshamir.springwolf.asyncapi.types.AsyncAPI; import io.github.stavshamir.springwolf.asyncapi.types.channel.bindings.EmptyChannelBinding; import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.bindings.EmptyOperationBinding; +import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; @Service public class DefaultAsyncApiSerializerService implements AsyncApiSerializerService { diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java index 4f7ea8c17..8f244ca94 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java @@ -5,12 +5,11 @@ import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService; import io.github.stavshamir.springwolf.schemas.SchemasService; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; - @Slf4j @Service @RequiredArgsConstructor diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 1c1497ca1..cf88ee35b 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -4,10 +4,10 @@ plugins { id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' - id 'com.bmuschko.docker-spring-boot-application' version '6.7.0' + id 'com.bmuschko.docker-spring-boot-application' version '9.0.1' } -sourceCompatibility = '1.8' +sourceCompatibility = '17' version '0.6.0' repositories { diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index a9b8c10f4..7d2ef388a 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -4,7 +4,7 @@ plugins { id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' - id 'com.bmuschko.docker-spring-boot-application' version '6.7.0' + id 'com.bmuschko.docker-spring-boot-application' version '9.0.1' } ext { @@ -17,7 +17,7 @@ dependencyManagement { } } -sourceCompatibility = '1.8' +sourceCompatibility = '17' version '0.1.0' diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index de3255680..0320fee6e 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -4,11 +4,11 @@ plugins { id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.1.0' - id 'com.bmuschko.docker-spring-boot-application' version '6.7.0' + id 'com.bmuschko.docker-spring-boot-application' version '9.0.1' id 'org.springdoc.openapi-gradle-plugin' version '1.6.0' } -sourceCompatibility = '1.8' +sourceCompatibility = '17' version '0.10.0' @@ -68,13 +68,3 @@ test { exceptionFormat = 'full' } } - -openApi { - apiDocsUrl = "http://localhost:8080/springwolf/docs" - // For testing purposes we put the generated json into the test resources, but it could be any other directory - outputDir = file("$buildDir/resources/test") - outputFileName = "openapi-generated.json" -} - -// generate the open api docs before tests are executed so that if it works, the json is already there -test.dependsOn("generateOpenApiDocs") diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index 28fbf29fc..93b7d47cf 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -11,7 +11,7 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.6.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = 1.8 +sourceCompatibility = '17' repositories { mavenCentral() diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index 5a3540232..de566c96e 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -11,7 +11,7 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.1.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = 1.8 +sourceCompatibility = '17' repositories { mavenCentral() diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java index 186094389..179b90f7e 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java @@ -83,7 +83,7 @@ private static Class toClassObject(Type type) { return (Class) ((ParameterizedType) type).getActualTypeArguments()[1]; } - return (Class) rawType; + return (Class) rawType.getClass(); } throw new IllegalArgumentException("Cannot handle Type which is not Class or ParameterizedType, but was given: " + type.getClass()); diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index ee3263f6c..270d5e03d 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -11,7 +11,7 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.10.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = 1.8 +sourceCompatibility = '17' repositories { mavenCentral() From 22cea9f5f3a8939ded2b4e75a535d8fa63e804de Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 17 Dec 2022 18:14:23 +0100 Subject: [PATCH 3/8] Upgrade spring boot=3.0.0 --- springwolf-core/build.gradle | 1 + springwolf-plugins/springwolf-amqp-plugin/build.gradle | 1 + springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle | 1 + springwolf-plugins/springwolf-kafka-plugin/build.gradle | 1 + 4 files changed, 4 insertions(+) diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index 914e1d323..e521009b5 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -24,6 +24,7 @@ dependencies { implementation 'io.swagger:swagger-inflector:2.0.8' implementation 'io.swagger.core.v3:swagger-core:2.2.7' implementation 'io.swagger.parser.v3:swagger-parser-core:2.1.9' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' implementation 'org.springframework:spring-web' implementation 'org.springframework:spring-context' diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index 93b7d47cf..b1ee733f7 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -27,6 +27,7 @@ dependencies { implementation 'com.google.guava:guava:31.1-jre' implementation 'org.slf4j:slf4j-api' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index de566c96e..dd3146418 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation 'com.google.guava:guava:31.1-jre' implementation 'org.slf4j:slf4j-api' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index 270d5e03d..de93efdb1 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -25,6 +25,7 @@ dependencies { implementation 'org.springframework:spring-web' implementation 'org.springframework.kafka:spring-kafka' implementation 'io.swagger.core.v3:swagger-models:2.2.0' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' implementation 'com.google.guava:guava:31.1-jre' implementation 'org.slf4j:slf4j-api' From 8d61a1568d1eae32b592cbcc6d2712a8abbcf137 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 17 Dec 2022 18:30:08 +0100 Subject: [PATCH 4/8] Upgrade spring boot=3.0.0 --- springwolf-core/build.gradle | 2 +- springwolf-plugins/springwolf-amqp-plugin/build.gradle | 2 +- springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle | 2 +- .../channels/cloudstream/FunctionalChannelBeanData.java | 2 +- springwolf-plugins/springwolf-kafka-plugin/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index e521009b5..9e55e8e6a 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation 'io.swagger:swagger-inflector:2.0.8' implementation 'io.swagger.core.v3:swagger-core:2.2.7' implementation 'io.swagger.parser.v3:swagger-parser-core:2.1.9' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' + implementation 'javax.xml.bind:jaxb-api:2.3.1' implementation 'org.springframework:spring-web' implementation 'org.springframework:spring-context' diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index b1ee733f7..f9c53e6c8 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation 'com.google.guava:guava:31.1-jre' implementation 'org.slf4j:slf4j-api' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' + implementation 'javax.xml.bind:jaxb-api:2.3.1' compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index dd3146418..de16aa670 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation 'com.google.guava:guava:31.1-jre' implementation 'org.slf4j:slf4j-api' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' + implementation 'javax.xml.bind:jaxb-api:2.3.1' compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java index 179b90f7e..186094389 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java @@ -83,7 +83,7 @@ private static Class toClassObject(Type type) { return (Class) ((ParameterizedType) type).getActualTypeArguments()[1]; } - return (Class) rawType.getClass(); + return (Class) rawType; } throw new IllegalArgumentException("Cannot handle Type which is not Class or ParameterizedType, but was given: " + type.getClass()); diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index de93efdb1..8142f4f8d 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation 'org.springframework:spring-web' implementation 'org.springframework.kafka:spring-kafka' implementation 'io.swagger.core.v3:swagger-models:2.2.0' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' + implementation 'javax.xml.bind:jaxb-api:2.3.1' implementation 'com.google.guava:guava:31.1-jre' implementation 'org.slf4j:slf4j-api' From 29350cc8df1adab8b5c3d59379a2179408025747 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 17 Dec 2022 18:41:34 +0100 Subject: [PATCH 5/8] Upgrade spring boot=3.0.0 --- springwolf-examples/springwolf-amqp-example/build.gradle | 1 + springwolf-examples/springwolf-cloud-stream-example/build.gradle | 1 + springwolf-examples/springwolf-kafka-example/build.gradle | 1 + 3 files changed, 3 insertions(+) diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index cf88ee35b..14c1373d1 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -35,6 +35,7 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.testcontainers:testcontainers:1.17.6' + testImplementation 'org.junit.platform:junit-platform-launcher:1.9.1' testImplementation 'org.testcontainers:junit-jupiter:1.17.6' testImplementation 'org.skyscreamer:jsonassert:1.5.0' testImplementation 'org.apache.directory.studio:org.apache.commons.io:2.4' diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index 7d2ef388a..82c751cdd 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -48,6 +48,7 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.kafka:spring-kafka-test' + testImplementation 'org.junit.platform:junit-platform-launcher:1.9.1' testImplementation 'org.testcontainers:testcontainers:1.17.6' testImplementation 'org.testcontainers:junit-jupiter:1.17.6' testImplementation 'org.skyscreamer:jsonassert:1.5.0' diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index 0320fee6e..0599e00fb 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -39,6 +39,7 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.kafka:spring-kafka-test' + testImplementation 'org.junit.platform:junit-platform-launcher:1.9.1' testImplementation 'org.testcontainers:testcontainers:1.17.6' testImplementation 'org.testcontainers:junit-jupiter:1.17.6' testImplementation 'org.skyscreamer:jsonassert:1.5.0' From 83c84408c7dd586aca9d7a612bb1419962ce405e Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sun, 5 Feb 2023 10:50:26 +0100 Subject: [PATCH 6/8] Upgrade spring boot=3.0.0 --- .../springwolf-common-model-converters/build.gradle | 7 +++++-- springwolf-core/build.gradle | 5 +++-- .../asyncapi/DefaultAsyncApiSerializerService.java | 6 +----- .../springwolf/asyncapi/DefaultChannelsService.java | 2 +- springwolf-examples/springwolf-amqp-example/build.gradle | 9 ++++++--- .../springwolf-cloud-stream-example/build.gradle | 9 ++++++--- .../springwolf-kafka-example/build.gradle | 9 ++++++--- springwolf-plugins/springwolf-amqp-plugin/build.gradle | 5 +++-- .../springwolf-cloud-stream-plugin/build.gradle | 5 +++-- springwolf-plugins/springwolf-kafka-plugin/build.gradle | 5 +++-- 10 files changed, 37 insertions(+), 25 deletions(-) diff --git a/springwolf-add-ons/springwolf-common-model-converters/build.gradle b/springwolf-add-ons/springwolf-common-model-converters/build.gradle index edfb92f3b..e1aaabea0 100644 --- a/springwolf-add-ons/springwolf-common-model-converters/build.gradle +++ b/springwolf-add-ons/springwolf-common-model-converters/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' } @@ -11,7 +11,6 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.1.2' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = '17' repositories { mavenCentral() @@ -23,6 +22,8 @@ dependencies { implementation 'org.springframework:spring-context' + implementation 'javax.xml.bind:jaxb-api:2.3.1' + testImplementation 'org.junit.platform:junit-platform-engine:1.8.2' testImplementation 'org.junit.platform:junit-platform-commons:1.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' @@ -35,6 +36,8 @@ bootJar.enabled = false java { withJavadocJar() withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 } test { diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index 9e55e8e6a..128f8b73f 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -4,7 +4,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' } @@ -12,7 +12,6 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group = 'io.github.springwolf' version = '0.9.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = '17' repositories { mavenCentral() @@ -54,6 +53,8 @@ bootJar.enabled = false java { withJavadocJar() withSourcesJar() + + sourceCompatibility = '17' } test { diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java index 7325801e6..e34b8a93f 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerService.java @@ -10,11 +10,7 @@ import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.github.stavshamir.springwolf.asyncapi.serializers.EmptyChannelBindingSerializer; -import io.github.stavshamir.springwolf.asyncapi.serializers.EmptyOperationBindingSerializer; -import io.github.stavshamir.springwolf.asyncapi.serializers.AmqpOperationBindingSerializer; -import io.github.stavshamir.springwolf.asyncapi.serializers.KafkaChannelBindingSerializer; -import io.github.stavshamir.springwolf.asyncapi.serializers.KafkaOperationBindingSerializer; +import io.github.stavshamir.springwolf.asyncapi.serializers.*; import io.github.stavshamir.springwolf.asyncapi.types.AsyncAPI; import io.github.stavshamir.springwolf.asyncapi.types.channel.bindings.EmptyChannelBinding; import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.bindings.EmptyOperationBinding; diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java index 1b74da9de..73abe2b61 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java @@ -3,11 +3,11 @@ import com.asyncapi.v2.model.channel.ChannelItem; import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelMerger; import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 14c1373d1..5f1b0c195 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -1,13 +1,12 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' - id 'com.bmuschko.docker-spring-boot-application' version '9.0.1' + id 'com.bmuschko.docker-spring-boot-application' version '8.1.0' } -sourceCompatibility = '17' version '0.6.0' repositories { @@ -55,6 +54,10 @@ docker { } } +java { + sourceCompatibility = '17' +} + test { dependsOn dockerBuildImage diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index 82c751cdd..b91643139 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -1,10 +1,10 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' - id 'com.bmuschko.docker-spring-boot-application' version '9.0.1' + id 'com.bmuschko.docker-spring-boot-application' version '8.1.0' } ext { @@ -17,7 +17,6 @@ dependencyManagement { } } -sourceCompatibility = '17' version '0.1.0' @@ -69,6 +68,10 @@ docker { } } +java { + sourceCompatibility = JavaVersion.VERSION_17 +} + test { dependsOn dockerBuildImage diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index 0599e00fb..18943eb54 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -1,14 +1,13 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' - id 'com.bmuschko.docker-spring-boot-application' version '9.0.1' + id 'com.bmuschko.docker-spring-boot-application' version '8.1.0' id 'org.springdoc.openapi-gradle-plugin' version '1.6.0' } -sourceCompatibility = '17' version '0.10.0' @@ -60,6 +59,10 @@ docker { } } +java { + sourceCompatibility = '17' +} + test { dependsOn dockerBuildImage diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index f9c53e6c8..74da26b7e 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' } @@ -11,7 +11,6 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.6.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = '17' repositories { mavenCentral() @@ -47,6 +46,8 @@ bootJar.enabled = false java { withJavadocJar() withSourcesJar() + + sourceCompatibility = '17' } test { diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index de16aa670..c7aaba58c 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' } @@ -11,7 +11,6 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.1.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = '17' repositories { mavenCentral() @@ -52,6 +51,8 @@ bootJar.enabled = false java { withJavadocJar() withSourcesJar() + + sourceCompatibility = '17' } test { diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index 8142f4f8d..f6fe164b2 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'maven-publish' - id 'org.springframework.boot' version '3.0.0' + id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' } @@ -11,7 +11,6 @@ def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) group 'io.github.springwolf' version '0.10.0' + (isSnapshot ? '-SNAPSHOT' : '') -sourceCompatibility = '17' repositories { mavenCentral() @@ -47,6 +46,8 @@ bootJar.enabled = false java { withJavadocJar() withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 } test { From df68fb5210b33cc09a6c47e84d8eafa9e5af5f25 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sun, 5 Feb 2023 11:04:00 +0100 Subject: [PATCH 7/8] Upgrade spring boot=3.0.0 --- springwolf-core/build.gradle | 2 +- .../springwolf-amqp-example/build.gradle | 2 +- .../springwolf-kafka-example/build.gradle | 12 +++++++++++- .../springwolf-amqp-plugin/build.gradle | 2 +- .../springwolf-cloud-stream-plugin/build.gradle | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index 128f8b73f..e425eba79 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -54,7 +54,7 @@ java { withJavadocJar() withSourcesJar() - sourceCompatibility = '17' + sourceCompatibility = JavaVersion.VERSION_17 } test { diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 5f1b0c195..0e629b58c 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -55,7 +55,7 @@ docker { } java { - sourceCompatibility = '17' + sourceCompatibility = JavaVersion.VERSION_17 } test { diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index 18943eb54..d943de7c3 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -60,7 +60,7 @@ docker { } java { - sourceCompatibility = '17' + sourceCompatibility = JavaVersion.VERSION_17 } test { @@ -72,3 +72,13 @@ test { exceptionFormat = 'full' } } + +openApi { + apiDocsUrl = "http://localhost:8080/springwolf/docs" + // For testing purposes we put the generated json into the test resources, but it could be any other directory + outputDir = file("$buildDir/resources/test") + outputFileName = "openapi-generated.json" +} + +// generate the open api docs before tests are executed so that if it works, the json is already there +test.dependsOn("generateOpenApiDocs") diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index 74da26b7e..9d45adfbe 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -47,7 +47,7 @@ java { withJavadocJar() withSourcesJar() - sourceCompatibility = '17' + sourceCompatibility = JavaVersion.VERSION_17 } test { diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index c7aaba58c..5428f999e 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -52,7 +52,7 @@ java { withJavadocJar() withSourcesJar() - sourceCompatibility = '17' + sourceCompatibility = JavaVersion.VERSION_17 } test { From 31c1ec99a94e95b4e44d2e5c3f328c2e6cce2467 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sun, 5 Feb 2023 11:11:47 +0100 Subject: [PATCH 8/8] Upgrade spring boot=3.0.0 --- springwolf-examples/springwolf-amqp-example/build.gradle | 2 +- .../springwolf-cloud-stream-example/build.gradle | 2 +- springwolf-examples/springwolf-kafka-example/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 0e629b58c..a71c086e4 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -43,7 +43,7 @@ dependencies { docker { springBootApplication { maintainer = 'shamir.stav@gmail.com' - baseImage = 'openjdk:8-alpine' + baseImage = 'openjdk:17-alpine' ports = [8080] images = ["stavshamir/springwolf-amqp-example:${project.version}"] } diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index b91643139..dcab972a1 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -57,7 +57,7 @@ dependencies { docker { springBootApplication { maintainer = 'shamir.stav@gmail.com' - baseImage = 'openjdk:8-alpine' + baseImage = 'openjdk:17-alpine' ports = [8080] images = ["stavshamir/springwolf-cloud-stream-example:${project.version}"] } diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index d943de7c3..1855705b0 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -48,7 +48,7 @@ dependencies { docker { springBootApplication { maintainer = 'shamir.stav@gmail.com' - baseImage = 'openjdk:8-alpine' + baseImage = 'openjdk:17-alpine' ports = [8080] images = ["stavshamir/springwolf-kafka-example:${project.version}"] }