Skip to content

Commit eab7765

Browse files
authored
Merge pull request #1055 from commercetools/DEVX-772-Spring-Boot-update-to-version-4-in-Java-SDK
DEVX-772-Spring-Boot-update-to-version-4-in-Java-SDK
2 parents b503416 + 02ad986 commit eab7765

33 files changed

Lines changed: 113 additions & 93 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,20 @@ jobs:
141141
CTP_CLIENT_SECRET: ${{ secrets.CTP_CLIENT_SECRET }}
142142
CTP_PROJECT_KEY: ${{ secrets.CTP_PROJECT_KEY }}
143143

144+
- name: Setup Java 21 for Spring examples
145+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
146+
with:
147+
distribution: 'temurin'
148+
java-version: '21'
149+
- name: Test Spring examples
150+
run: |
151+
cd examples/spring && ./gradlew test
152+
cd ../spring-datadog && ./gradlew test
153+
cd ../spring-datadog-statsd && ./gradlew test
154+
cd ../spring-dynatrace-oneagent && ./gradlew test
155+
cd ../spring-newrelic && ./gradlew test
156+
cd ../spring-otel && ./gradlew test
157+
144158
- name: Collect code coverage
145159
run: ./gradlew codeCoverageReport
146160

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ plugins {
2424
id "srcinfo"
2525
}
2626

27+
/*
28+
dependencies {
29+
runtimeOnly 'org.springframework.boot:spring-boot-properties-migrator'
30+
}*/
31+
32+
2733
import java.text.SimpleDateFormat
2834

2935
apply plugin: 'versioning'

commercetools/commercetools-sdk-java-api/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,15 @@ tasks.register('runMainMethodThreadLeakTest', JavaExec) {
360360
classpath = sourceSets.test.runtimeClasspath
361361
mainClass = "com.commercetools.MainMethodThreadLeakTest"
362362
timeout = Duration.ofSeconds(20)
363+
javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(21) }
363364
}
364365
tasks.register('runMainMethodMemoryLeakTest', JavaExec) {
365366
group = "Execution"
366367
description = "Run the main method thread leak test class"
367368
classpath = sourceSets.test.runtimeClasspath
368369
mainClass = "com.commercetools.MainMethodMemoryLeakTest"
369370
maxHeapSize("128m")
371+
javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(21) }
370372
}
371373

372374

examples/spring-datadog-statsd/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.4.0'
4-
id 'io.spring.dependency-management' version '1.1.0'
3+
id 'org.springframework.boot' version '4.0.5'
4+
id 'io.spring.dependency-management' version '1.1.7'
55
}
66

77
group = 'com.commercetools.sdk.examples'
88
version = '0.0.1-SNAPSHOT'
99

1010
java {
1111
toolchain {
12-
languageVersion = JavaLanguageVersion.of(17)
12+
languageVersion = JavaLanguageVersion.of(21)
1313
}
1414
}
1515

examples/spring-datadog-statsd/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

examples/spring-datadog-statsd/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
1717
http
1818
.anonymous(anonymous -> anonymous.authorities("ROLE_ANON"))
1919
.authorizeHttpRequests((requests) -> requests
20-
.requestMatchers("**").permitAll()
20+
.requestMatchers("/**").permitAll()
2121
.requestMatchers("/resources/**").permitAll()
2222
.anyRequest().permitAll()
2323
);

examples/spring-datadog-statsd/src/main/resources/static/lib/jquery/dist/jquery.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5063,7 +5063,7 @@ jQuery.event = {
50635063
( !handler || handler.guid === handleObj.guid ) &&
50645064
( !tmp || tmp.test( handleObj.namespace ) ) &&
50655065
( !selector || selector === handleObj.selector ||
5066-
selector === "**" && handleObj.selector ) ) {
5066+
selector === "/**" && handleObj.selector ) ) {
50675067
handlers.splice( j, 1 );
50685068

50695069
if ( handleObj.selector ) {
@@ -10555,8 +10555,8 @@ jQuery.fn.extend( {
1055510555

1055610556
// ( namespace ) or ( selector, types [, fn] )
1055710557
return arguments.length === 1 ?
10558-
this.off( selector, "**" ) :
10559-
this.off( types, selector || "**", fn );
10558+
this.off( selector, "/**" ) :
10559+
this.off( types, selector || "/**", fn );
1056010560
},
1056110561

1056210562
hover: function( fnOver, fnOut ) {

examples/spring-datadog-statsd/src/main/resources/static/lib/jquery/dist/jquery.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/spring-datadog/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.4.0'
4-
id 'io.spring.dependency-management' version '1.1.0'
3+
id 'org.springframework.boot' version '4.0.5'
4+
id 'io.spring.dependency-management' version '1.1.7'
55
id "de.undercouch.download" version "5.3.0"
66
}
77

@@ -10,7 +10,7 @@ version = '0.0.1-SNAPSHOT'
1010

1111
java {
1212
toolchain {
13-
languageVersion = JavaLanguageVersion.of(17)
13+
languageVersion = JavaLanguageVersion.of(21)
1414
}
1515
}
1616

@@ -29,12 +29,12 @@ dependencies {
2929
implementation "com.commercetools.sdk:commercetools-sdk-java-api:${versions.commercetools}"
3030
implementation "com.commercetools.sdk:commercetools-apachehttp-client:${versions.commercetools}"
3131
implementation "com.commercetools.sdk:commercetools-monitoring-datadog:${versions.commercetools}"
32-
implementation 'javax.inject:javax.inject:1'
32+
implementation 'jakarta.inject:jakarta.inject-api:2.0.1'
3333
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
3434
implementation 'org.springframework.boot:spring-boot-starter-security'
3535
implementation 'org.springframework.boot:spring-boot-starter-webflux'
3636
implementation 'org.springframework.session:spring-session-core'
37-
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.2.RELEASE'
37+
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
3838
implementation "com.datadoghq:datadog-api-client:2.20.0"
3939
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4040
testImplementation 'org.springframework.security:spring-security-test'

examples/spring-datadog/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)