Skip to content

Commit 5354193

Browse files
authored
DEVX-496 update spring boot version for examples (#765)
1 parent 9ffd3aa commit 5354193

File tree

33 files changed

+62
-121
lines changed

33 files changed

+62
-121
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ tasks.register("writeVersionToExamples") {
371371
include(name: 'examples/spring-otel/build.gradle')
372372
include(name: 'examples/spring-datadog/build.gradle')
373373
include(name: 'examples/spring-datadog-statsd/build.gradle')
374+
include(name: 'examples/spring-dynatrace-oneagent/build.gradle')
374375
}
375376
}
376377
ant.replaceregexp(match: '<commercetools.version>.+</commercetools.version>', replace: "<commercetools.version>${globalVersion}</commercetools.version>", flags:'g', byline:true) {

examples/spring-datadog-statsd/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.0.4'
3+
id 'org.springframework.boot' version '3.4.0'
44
id 'io.spring.dependency-management' version '1.1.0'
55
}
66

examples/spring-datadog-statsd/src/main/java/com/commercetools/sdk/examples/springmvc/web/AppController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public String pop(Model model, HttpSession session) throws ExecutionException, I
4242
}
4343

4444
@GetMapping("/cart")
45-
public String cart(Model model, HttpSession session) {
45+
public String cart(Model model, HttpSession session) throws ExecutionException, InterruptedException {
4646
final CompletableFuture<Cart> cart = new CartRepository(apiRoot, session).meCart();
47-
model.addAttribute("cart", cart);
47+
model.addAttribute("cart", cart.get());
4848
return "mycart/index";
4949
}
5050

examples/spring-datadog-statsd/src/test/java/com/commercetools/sdk/examples/springmvc/SpringmvcApplicationTests.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

examples/spring-datadog/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.0.4'
3+
id 'org.springframework.boot' version '3.4.0'
44
id 'io.spring.dependency-management' version '1.1.0'
55
id "de.undercouch.download" version "5.3.0"
66
}
@@ -30,12 +30,11 @@ dependencies {
3030
implementation "com.commercetools.sdk:commercetools-apachehttp-client:${versions.commercetools}"
3131
implementation "com.commercetools.sdk:commercetools-monitoring-datadog:${versions.commercetools}"
3232
implementation 'javax.inject:javax.inject:1'
33-
implementation 'com.dynatrace.metric.util:dynatrace-metric-utils-java:2.2.0'
3433
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
3534
implementation 'org.springframework.boot:spring-boot-starter-security'
3635
implementation 'org.springframework.boot:spring-boot-starter-webflux'
3736
implementation 'org.springframework.session:spring-session-core'
38-
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE'
37+
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.2.RELEASE'
3938
implementation "com.datadoghq:datadog-api-client:2.20.0"
4039
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4140
testImplementation 'org.springframework.security:spring-security-test'
121 Bytes
Binary file not shown.

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.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

examples/spring-datadog/gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

examples/spring-datadog/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.web.reactive.config.ResourceHandlerRegistry;
1313
import org.springframework.web.reactive.config.ViewResolverRegistry;
1414
import org.springframework.web.reactive.config.WebFluxConfigurer;
15-
import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
15+
import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
1616
import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
1717
import org.thymeleaf.spring6.SpringWebFluxTemplateEngine;
1818
import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;

0 commit comments

Comments
 (0)