-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from christophetd/java-21-upgrade
Upgrade Java, Gradle and Spring Boot versions
- Loading branch information
Showing
4 changed files
with
94 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,33 @@ | ||
| plugins { | ||
| id 'org.springframework.boot' version '2.7.3' | ||
| id 'io.spring.dependency-management' version '1.0.13.RELEASE' | ||
| id 'java' | ||
| id 'java' | ||
| id 'org.springframework.boot' version '3.2.5' | ||
| id 'io.spring.dependency-management' version '1.1.4' | ||
| } | ||
|
|
||
| group = 'com.datadoghq.workshops' | ||
| version = '0.0.1-SNAPSHOT' | ||
| sourceCompatibility = '17' | ||
|
|
||
| java { | ||
| sourceCompatibility = '21' | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation 'org.springframework.boot:spring-boot-starter-web' | ||
| implementation 'ch.qos.logback:logback-classic:1.2.11' | ||
| implementation 'net.logstash.logback:logstash-logback-encoder:7.2' | ||
| implementation 'org.projectlombok:lombok:1.18.22' | ||
| compileOnly 'org.projectlombok:lombok:1.18.24' | ||
| annotationProcessor 'org.projectlombok:lombok:1.18.24' | ||
| testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
| implementation 'org.springframework.boot:spring-boot-starter-web' | ||
| testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
| testRuntimeOnly 'org.junit.platform:junit-platform-launcher' | ||
| implementation 'net.logstash.logback:logstash-logback-encoder:7.2' | ||
| compileOnly 'org.projectlombok:lombok:1.18.32' | ||
| annotationProcessor 'org.projectlombok:lombok:1.18.32' | ||
| } | ||
|
|
||
| tasks.named('test') { | ||
| useJUnitPlatform() | ||
| useJUnitPlatform() | ||
| } | ||
|
|
||
| dependencyLocking { | ||
| lockAllConfigurations() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # This is a Gradle generated file for dependency locking. | ||
| # Manual edits can break the build and are not advised. | ||
| # This file is expected to be part of source control. | ||
| ch.qos.logback:logback-classic:1.4.14=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| ch.qos.logback:logback-core:1.4.14=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testRuntimeClasspath | ||
| com.vaadin.external.google:android-json:0.0.20131108.vaadin1=testCompileClasspath,testRuntimeClasspath | ||
| io.micrometer:micrometer-commons:1.12.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| io.micrometer:micrometer-observation:1.12.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| jakarta.activation:jakarta.activation-api:2.1.3=testCompileClasspath,testRuntimeClasspath | ||
| jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=testCompileClasspath,testRuntimeClasspath | ||
| net.bytebuddy:byte-buddy-agent:1.14.13=testCompileClasspath,testRuntimeClasspath | ||
| net.bytebuddy:byte-buddy:1.14.13=testCompileClasspath,testRuntimeClasspath | ||
| net.logstash.logback:logstash-logback-encoder:7.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| net.minidev:accessors-smart:2.5.1=testCompileClasspath,testRuntimeClasspath | ||
| net.minidev:json-smart:2.5.1=testCompileClasspath,testRuntimeClasspath | ||
| org.apache.logging.log4j:log4j-api:2.21.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.apache.logging.log4j:log4j-to-slf4j:2.21.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.apache.tomcat.embed:tomcat-embed-core:10.1.20=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.apache.tomcat.embed:tomcat-embed-el:10.1.20=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.apache.tomcat.embed:tomcat-embed-websocket:10.1.20=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath | ||
| org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath | ||
| org.awaitility:awaitility:4.2.1=testCompileClasspath,testRuntimeClasspath | ||
| org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath | ||
| org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath | ||
| org.junit.jupiter:junit-jupiter-engine:5.10.2=testRuntimeClasspath | ||
| org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath | ||
| org.junit.jupiter:junit-jupiter:5.10.2=testCompileClasspath,testRuntimeClasspath | ||
| org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath | ||
| org.junit.platform:junit-platform-engine:1.10.2=testRuntimeClasspath | ||
| org.junit.platform:junit-platform-launcher:1.10.2=testRuntimeClasspath | ||
| org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath | ||
| org.mockito:mockito-core:5.7.0=testCompileClasspath,testRuntimeClasspath | ||
| org.mockito:mockito-junit-jupiter:5.7.0=testCompileClasspath,testRuntimeClasspath | ||
| org.objenesis:objenesis:3.3=testRuntimeClasspath | ||
| org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath | ||
| org.ow2.asm:asm:9.6=testCompileClasspath,testRuntimeClasspath | ||
| org.projectlombok:lombok:1.18.32=annotationProcessor,compileClasspath | ||
| org.skyscreamer:jsonassert:1.5.1=testCompileClasspath,testRuntimeClasspath | ||
| org.slf4j:jul-to-slf4j:2.0.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.slf4j:slf4j-api:2.0.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-autoconfigure:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-starter-json:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-starter-logging:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-starter-test:3.2.5=testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-starter-tomcat:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-starter-web:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-starter:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-test-autoconfigure:3.2.5=testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot-test:3.2.5=testCompileClasspath,testRuntimeClasspath | ||
| org.springframework.boot:spring-boot:3.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-aop:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-beans:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-context:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-core:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-expression:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-jcl:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-test:6.1.6=testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-web:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.springframework:spring-webmvc:6.1.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath | ||
| org.yaml:snakeyaml:2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| empty=developmentOnly,testAndDevelopmentOnly,testAnnotationProcessor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |