Skip to content
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.

Sign up for GitHub

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

Update remaining projects to spring boot 3.2 #3446

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Update remaining projects to spring boot 3.2 #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a43339
Update remaining project to spring boot 3.2
JonasKunz Nov 29, 2023
c24dc02
Fix jetty tests
JonasKunz Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.1.5</version> <!-- update IT in case of major upgrade -->
<version>3.2.0</version> <!-- update IT in case of major upgrade -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.1.5</version> <!-- must be 3.X to correspond to spring 6 -->
<version>3.2.0</version> <!-- must be 3.X to correspond to spring 6 -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-spring-webmvc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.1.5</version> <!-- must be 3.X to correspond to spring 6 -->
<version>3.2.0</version> <!-- must be 3.X to correspond to spring 6 -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public static void beforeClass() {
public void setUp() {
doReturn(true).when(config.getConfig(ReporterConfiguration.class)).isReportSynchronously();
restTemplate = new TestRestTemplate(new RestTemplateBuilder()
.setConnectTimeout(Duration.ZERO)
.setReadTimeout(Duration.ZERO)
.setConnectTimeout(Duration.ofSeconds(10))
.setReadTimeout(Duration.ofSeconds(10))
.basicAuthentication("username", "password"));
reporter.reset();
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/spring-boot-3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.1.5</version>
<version>3.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/spring-boot-3/spring-boot-3-jetty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
</properties>

<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version> <!-- jetty doesn't support servlet API 6.x -->
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-2-base</artifactId>
Expand Down
Loading