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.

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

Upgrade to spring boot 3 #146

Merged
merged 12 commits into from
Mar 14, 2023
7 changes: 4 additions & 3 deletions .github/workflows/publish-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/springwolf-amqp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/springwolf-cloud-stream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/springwolf-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/springwolf-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ plugins {
id 'signing'
id 'maven-publish'

id 'org.springframework.boot' version '2.7.8'
id 'org.springframework.boot' version '3.0.2'
id 'io.spring.dependency-management' version '1.1.0'
}

def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT'))

group 'io.github.springwolf'
version '0.1.2' + (isSnapshot ? '-SNAPSHOT' : '')
sourceCompatibility = 1.8

repositories {
mavenCentral()
Expand All @@ -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.9.2'
testImplementation 'org.junit.platform:junit-platform-commons:1.9.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
Expand All @@ -38,6 +39,8 @@ bootJar.enabled = false
java {
withJavadocJar()
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
}

test {
Expand Down
6 changes: 4 additions & 2 deletions springwolf-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ plugins {
id 'signing'
id 'maven-publish'

id 'org.springframework.boot' version '2.7.8'
id 'org.springframework.boot' version '3.0.2'
id 'io.spring.dependency-management' version '1.1.0'
}

def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT'))

group = 'io.github.springwolf'
version = '0.9.3' + (isSnapshot ? '-SNAPSHOT' : '')
sourceCompatibility = 1.8

repositories {
mavenCentral()
Expand All @@ -24,6 +23,7 @@ dependencies {
implementation 'io.swagger:swagger-inflector:2.0.8'
implementation 'io.swagger.core.v3:swagger-core:2.2.8'
implementation 'io.swagger.parser.v3:swagger-parser-core:2.1.11'
implementation 'javax.xml.bind:jaxb-api:2.3.1'

implementation 'org.springframework:spring-web'
implementation 'org.springframework:spring-context'
Expand Down Expand Up @@ -56,6 +56,8 @@ bootJar.enabled = false
java {
withJavadocJar()
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,13 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
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;
import jakarta.annotation.PostConstruct;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;

@Service
public class DefaultAsyncApiSerializerService implements AsyncApiSerializerService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.HashMap;
import java.util.List;
Expand Down
12 changes: 8 additions & 4 deletions springwolf-examples/springwolf-amqp-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
plugins {
id 'java'

id 'org.springframework.boot' version '2.7.8'
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 '6.7.0'
id 'com.bmuschko.docker-spring-boot-application' version '8.1.0'
}

sourceCompatibility = '1.8'
version '0.6.0'

repositories {
Expand Down Expand Up @@ -35,6 +34,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.1'
testImplementation 'commons-io:commons-io:2.11.0'
Expand All @@ -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}"]
}
Expand All @@ -54,6 +54,10 @@ docker {
}
}

java {
sourceCompatibility = JavaVersion.VERSION_17
}

test {
dependsOn dockerBuildImage

Expand Down
15 changes: 9 additions & 6 deletions springwolf-examples/springwolf-cloud-stream-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id 'java'

id 'org.springframework.boot' version '2.7.8'
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 '6.7.0'
id 'com.bmuschko.docker-spring-boot-application' version '8.1.0'
}

ext {
set('springCloudVersion', "Hoxton.SR8")
set('springCloudVersion', "2022.0.1")
}

dependencyManagement {
Expand All @@ -17,7 +17,6 @@ dependencyManagement {
}
}

sourceCompatibility = '1.8'
version '0.1.0'


Expand All @@ -41,13 +40,13 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.cloud:spring-cloud-stream'
implementation 'org.springframework.cloud:spring-cloud-stream-binder-kafka-streams'
implementation 'org.apache.kafka:kafka-streams:3.4.0'
implementation 'com.google.guava:guava:31.1-jre'
implementation 'org.slf4j:slf4j-api'
implementation 'io.swagger.core.v3:swagger-core:2.2.8'

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.1'
Expand All @@ -57,7 +56,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}"]
}
Expand All @@ -68,6 +67,10 @@ docker {
}
}

java {
sourceCompatibility = JavaVersion.VERSION_17
}

test {
dependsOn dockerBuildImage

Expand Down
12 changes: 8 additions & 4 deletions springwolf-examples/springwolf-kafka-example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
plugins {
id 'java'

id 'org.springframework.boot' version '2.7.8'
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 '6.7.0'
id 'com.bmuschko.docker-spring-boot-application' version '8.1.0'
id 'org.springdoc.openapi-gradle-plugin' version '1.6.0'
}

sourceCompatibility = '1.8'
version '0.10.0'


Expand Down Expand Up @@ -39,6 +38,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.1'
Expand All @@ -49,7 +49,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}"]
}
Expand All @@ -60,6 +60,10 @@ docker {
}
}

java {
sourceCompatibility = JavaVersion.VERSION_17
}

test {
dependsOn dockerBuildImage

Expand Down
6 changes: 4 additions & 2 deletions springwolf-plugins/springwolf-amqp-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ plugins {
id 'signing'
id 'maven-publish'

id 'org.springframework.boot' version '2.7.8'
id 'org.springframework.boot' version '3.0.2'
id 'io.spring.dependency-management' version '1.1.0'
}

def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT'))

group 'io.github.springwolf'
version '0.6.0' + (isSnapshot ? '-SNAPSHOT' : '')
sourceCompatibility = 1.8

repositories {
mavenCentral()
Expand All @@ -27,6 +26,7 @@ dependencies {

implementation 'com.google.guava:guava:31.1-jre'
implementation 'org.slf4j:slf4j-api'
implementation 'javax.xml.bind:jaxb-api:2.3.1'

compileOnly 'org.projectlombok:lombok:1.18.26'
annotationProcessor 'org.projectlombok:lombok:1.18.26'
Expand All @@ -49,6 +49,8 @@ bootJar.enabled = false
java {
withJavadocJar()
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
}

test {
Expand Down
Loading