Skip to content
This repository was archived by the owner on Aug 6, 2024. It is now read-only.

Bump to Spring Boot 3.2 and move to .imports file #245

Merged
merged 1 commit into from
Dec 6, 2023
Merged

Bump to Spring Boot 3.2 and move to .imports file #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-spring-boot-build</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Wavefront Spring Boot Build</name>
<description>Wavefront by VMware integration for Spring Boot</description>
Expand Down
2 changes: 1 addition & 1 deletion wavefront-spring-boot-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-spring-boot-build</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wavefront-spring-boot-bom</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions wavefront-spring-boot-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-spring-boot-bom</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../wavefront-spring-boot-bom</relativePath>
</parent>
<artifactId>wavefront-spring-boot-parent</artifactId>
Expand All @@ -19,7 +19,7 @@

<properties>
<java.version>17</java.version>
<spring-boot.version>3.0.6</spring-boot.version>
<spring-boot.version>3.2.0</spring-boot.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion wavefront-spring-boot-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-spring-boot-parent</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../wavefront-spring-boot-parent</relativePath>
</parent>
<artifactId>wavefront-spring-boot-sample</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion wavefront-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-spring-boot-parent</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../wavefront-spring-boot-parent</relativePath>
</parent>
<artifactId>wavefront-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion wavefront-spring-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-spring-boot-parent</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../wavefront-spring-boot-parent</relativePath>
</parent>
<artifactId>wavefront-spring-boot</artifactId>
Expand Down
3 changes: 0 additions & 3 deletions wavefront-spring-boot/src/main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
org.springframework.boot.env.EnvironmentPostProcessor=\
com.wavefront.spring.autoconfigure.AccountManagementEnvironmentPostProcessor

org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.wavefront.spring.actuate.WavefrontEndpointAutoConfiguration
1 change: 1 addition & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.wavefront.spring.actuate.WavefrontEndpointAutoConfiguration
2 changes: 0 additions & 2 deletions ...t/src/test/java/com/wavefront/spring/autoconfigure/AccountManagementIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.wavefront.spring.actuate.WavefrontEndpointAutoConfiguration;
import com.wavefront.spring.autoconfigure.AccountManagementIntegrationTests.TestConfiguration;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

Expand All @@ -19,7 +18,6 @@
*
* @author Stephane Nicoll
*/
@Disabled("TODO")
@SpringBootTest(classes = TestConfiguration.class)
@ExtendWith(OutputCaptureExtension.class)
class AccountManagementIntegrationTests {
Expand Down
2 changes: 1 addition & 1 deletion wavefront-spring-boot/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
<property name="CONSOLE_LOG_PATTERN"
value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{1.} : %m%n"/>
value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger : %m%n"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
Expand Down