-
Notifications
You must be signed in to change notification settings - Fork 14
Migrate to Spring Boot 3.2 / Java 21 #915
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
base: master
Are you sure you want to change the base?
Changes from all commits
8e6b9f9
bd37afa
089e642
6096ce3
ed53750
4aa9e56
aee494f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| name: Java CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - '**' | ||
| tags: | ||
| - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 | ||
| pull_request: | ||
| branches: | ||
| - '**' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up JDK 21 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: zulu | ||
| java-version: '21' | ||
| - uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| ~/.gradle/caches | ||
| ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Build with Gradle | ||
| run: ./gradlew clean build |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,19 @@ | ||
| plugins { | ||
| id 'org.springframework.boot' version '2.6.3' | ||
| id 'io.spring.dependency-management' version '1.0.11.RELEASE' | ||
| id 'org.springframework.boot' version '3.2.5' | ||
| id 'io.spring.dependency-management' version '1.1.4' | ||
| id 'java' | ||
| id "com.netflix.dgs.codegen" version "5.0.6" | ||
| id "com.diffplug.spotless" version "6.2.1" | ||
| id "com.netflix.dgs.codegen" version "6.0.3" | ||
| id "com.diffplug.spotless" version "6.25.0" | ||
| } | ||
|
|
||
| version = '0.0.1-SNAPSHOT' | ||
| sourceCompatibility = '11' | ||
| targetCompatibility = '11' | ||
| sourceCompatibility = '21' | ||
| targetCompatibility = '21' | ||
|
|
||
| spotless { | ||
| java { | ||
| target project.fileTree(project.rootDir) { | ||
| include '**/*.java' | ||
| exclude 'build/generated/**/*.*', 'build/generated-examples/**/*.*' | ||
| include 'src/**/*.java' | ||
| } | ||
|
Comment on lines
15
to
17
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 Info: Spotless no longer formats sources outside src/ Narrowing the target from Was this helpful? React with 👍 or 👎 to provide feedback.
Comment on lines
15
to
17
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 Info: Spotless no longer excludes generated sources but now scans only src Narrowing the target to Was this helpful? React with 👍 or 👎 to provide feedback. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Codegen writes to |
||
| googleJavaFormat() | ||
| } | ||
|
|
@@ -35,25 +34,25 @@ dependencies { | |
| implementation 'org.springframework.boot:spring-boot-starter-validation' | ||
| implementation 'org.springframework.boot:spring-boot-starter-hateoas' | ||
| implementation 'org.springframework.boot:spring-boot-starter-security' | ||
| implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2' | ||
| implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:4.9.21' | ||
| implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3' | ||
| implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:8.5.3' | ||
| implementation 'org.flywaydb:flyway-core' | ||
| implementation 'io.jsonwebtoken:jjwt-api:0.11.2' | ||
| runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2', | ||
| 'io.jsonwebtoken:jjwt-jackson:0.11.2' | ||
| implementation 'joda-time:joda-time:2.10.13' | ||
| implementation 'org.xerial:sqlite-jdbc:3.36.0.3' | ||
| implementation 'io.jsonwebtoken:jjwt-api:0.12.5' | ||
| runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5', | ||
| 'io.jsonwebtoken:jjwt-jackson:0.12.5' | ||
| implementation 'joda-time:joda-time:2.12.7' | ||
| implementation 'org.xerial:sqlite-jdbc:3.45.3.0' | ||
|
|
||
| compileOnly 'org.projectlombok:lombok' | ||
| annotationProcessor 'org.projectlombok:lombok' | ||
|
|
||
| testImplementation 'io.rest-assured:rest-assured:4.5.1' | ||
| testImplementation 'io.rest-assured:json-path:4.5.1' | ||
| testImplementation 'io.rest-assured:xml-path:4.5.1' | ||
| testImplementation 'io.rest-assured:spring-mock-mvc:4.5.1' | ||
| testImplementation 'io.rest-assured:rest-assured:5.4.0' | ||
| testImplementation 'io.rest-assured:json-path:5.4.0' | ||
| testImplementation 'io.rest-assured:xml-path:5.4.0' | ||
| testImplementation 'io.rest-assured:spring-mock-mvc:5.4.0' | ||
| testImplementation 'org.springframework.security:spring-security-test' | ||
| testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
| testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:2.2.2' | ||
| testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.3' | ||
| } | ||
|
|
||
| tasks.named('test') { | ||
|
|
@@ -69,4 +68,5 @@ tasks.named('clean') { | |
| tasks.named('generateJava') { | ||
| schemaPaths = ["${projectDir}/src/main/resources/schema"] // List of directories containing schema files | ||
| packageName = 'io.spring.graphql' // The package name to use to generate sources | ||
| typeMapping = ["PageInfo": "graphql.relay.PageInfo"] | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 Info: Codegen typeMapping to graphql.relay.PageInfo relies on schema compatibility Mapping the schema's Was this helpful? React with 👍 or 👎 to provide feedback. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 Info: PageInfo type mapping keeps the relay type but couples codegen to graphql-java internals
Was this helpful? React with 👍 or 👎 to provide feedback. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agreed that migrating the data fetchers to the generated |
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
|
devin-ai-integration[bot] marked this conversation as resolved.
|
||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
Uh oh!
There was an error while loading. Please reload this page.