Skip to content

Commit

Permalink
DEVX-496 update spring-newrelic example
Browse files Browse the repository at this point in the history
  • Loading branch information
lojzatran committed Dec 5, 2024
1 parent b3ce1f5 commit 77e4e62
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 20 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ tasks.register("writeVersionToExamples") {
include(name: 'examples/spring-otel/build.gradle')
include(name: 'examples/spring-datadog/build.gradle')
include(name: 'examples/spring-datadog-statsd/build.gradle')
include(name: 'examples/spring-dynatrace-oneagent/build.gradle')
}
}
ant.replaceregexp(match: '<commercetools.version>.+</commercetools.version>', replace: "<commercetools.version>${globalVersion}</commercetools.version>", flags:'g', byline:true) {
Expand Down
6 changes: 3 additions & 3 deletions examples/spring-newrelic/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.0.4'
id 'org.springframework.boot' version '3.4.0'
id 'io.spring.dependency-management' version '1.1.0'
id "de.undercouch.download" version "5.3.0"
}
Expand All @@ -21,8 +21,8 @@ repositories {

ext {
versions = [
commercetools: "17.19.0",
newrelic: "8.0.1"
commercetools: "17.20.0",
newrelic: "8.16.0"
]
}

Expand Down
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public ApiHttpClient client() {
}

@Bean
@RequestScope
@Trace(dispatcher = true)
public ProjectScopedApiRoot apiRoot(ApiHttpClient client) {
ContextApiHttpClient contextClient = ContextApiHttpClient.of(client, new MDCContext(), false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public String pop(Model model, HttpSession session) throws ExecutionException, I
}

@GetMapping("/cart")
public String cart(Model model, HttpSession session) {
public String cart(Model model, HttpSession session) throws ExecutionException, InterruptedException {
final CompletableFuture<Cart> cart = new CartRepository(apiRoot, session).meCart();

model.addAttribute("cart", cart);
model.addAttribute("cart", cart.get());
return "mycart/index";
}

Expand Down

This file was deleted.

0 comments on commit 77e4e62

Please sign in to comment.