This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit d87b02b6d76c2c531d7e8fa40b20f841bf2f7f06 Author: kezhenxu94 <[email protected]> AuthorDate: Mon Dec 26 10:46:04 2022 +0800 Add Spring 6 to test case --- .github/workflows/plugins-jdk17-test.0.yaml | 1 + .github/workflows/plugins-test.3.yaml | 1 - test/plugin/scenarios/spring-4.3.x-scenario/pom.xml | 5 +++++ test/plugin/scenarios/spring-4.3.x-scenario/support-version.list | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/plugins-jdk17-test.0.yaml b/.github/workflows/plugins-jdk17-test.0.yaml index d496c158ab..6782cdc909 100644 --- a/.github/workflows/plugins-jdk17-test.0.yaml +++ b/.github/workflows/plugins-jdk17-test.0.yaml @@ -59,6 +59,7 @@ jobs: matrix: case: - jdk17-with-gson-scenario + - spring-4.3.x-scenario # TODO: We can't test it just yet, because it requires a Skywalking release # - resttemplate-6.x-scenario steps: diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index 0a8cdab1d9..84d4aa6aa1 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -61,7 +61,6 @@ jobs: - zookeeper-scenario - spring-3.1.x-scenario - spring-4.1.x-scenario - - spring-4.3.x-scenario - spring-async-scenario - vertx-core-4.x-scenario - vertx-eventbus-3.x-scenario diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml b/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml index e42f589827..7b4e7bdc0b 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml +++ b/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml @@ -98,6 +98,11 @@ <build> <finalName>spring-4.3.x-scenario</finalName> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>3.3.1</version> + </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin.version}</version> diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list b/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list index 48d635b044..a6b3396848 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list @@ -20,3 +20,4 @@ 5.0.15.RELEASE 5.1.10.RELEASE 5.2.0.RELEASE +6.0.0
