Skip to content

Commit 11bc1a3

Browse files
committed
Add dependency management for Spring Boot in pom.xml (Resolve log component conflicts)
1 parent d06112c commit 11bc1a3

4 files changed

Lines changed: 16 additions & 40 deletions

File tree

test/plugin/scenarios/lettuce-webflux-6x-scenario/pom.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,22 @@
3131
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
3232
<test.framework.version>6.4.2.RELEASE</test.framework.version>
3333
<docker.image.version>${test.framework.version}</docker.image.version>
34-
<spring.boot.version>3.0.0</spring.boot.version>
34+
<spring.boot.version>3.0.13</spring.boot.version>
3535
</properties>
3636

3737
<name>skywalking-lettuce-webflux-6x-scenario</name>
38+
39+
<dependencyManagement>
40+
<dependencies>
41+
<dependency>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-dependencies</artifactId>
44+
<version>${spring.boot.version}</version>
45+
<type>pom</type>
46+
<scope>import</scope>
47+
</dependency>
48+
</dependencies>
49+
</dependencyManagement>
3850

3951
<dependencies>
4052
<dependency>
@@ -49,8 +61,8 @@
4961
<version>${spring.boot.version}</version>
5062
<exclusions>
5163
<exclusion>
52-
<groupId>ch.qos.logback</groupId>
53-
<artifactId>logback-classic</artifactId>
64+
<groupId>org.apache.logging.log4j</groupId>
65+
<artifactId>log4j-api</artifactId>
5466
</exclusion>
5567
</exclusions>
5668
</dependency>

test/plugin/scenarios/lettuce-webflux-6x-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/Application.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
public class Application {
2626

2727
public static void main(String[] args) {
28-
try {
29-
SpringApplication.run(Application.class, args);
30-
} catch (Exception e) {
31-
// Never do this
32-
}
28+
SpringApplication.run(Application.class, args);
3329
}
3430
}

test/plugin/scenarios/lettuce-webflux-6x-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/controller/LettuceReactiveController.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.lettuce.core.api.reactive.RedisReactiveCommands;
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.beans.factory.annotation.Value;
25-
import org.springframework.context.annotation.PropertySource;
2625
import org.springframework.web.bind.annotation.GetMapping;
2726
import org.springframework.web.bind.annotation.RequestMapping;
2827
import org.springframework.web.bind.annotation.RestController;
@@ -31,7 +30,6 @@
3130

3231
@RestController
3332
@RequestMapping("/case")
34-
@PropertySource("classpath:application.properties")
3533
public class LettuceReactiveController {
3634

3735
@Value("${redis.servers:127.0.0.1:6379}")

test/plugin/scenarios/lettuce-webflux-6x-scenario/src/main/resources/log4j2.xml

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

0 commit comments

Comments
 (0)