diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8bff96d1..a95a4bad 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,7 +17,7 @@ jobs: distribution: 'zulu' cache: 'maven' - name: Build with Maven - run: mvn clean package -P full + run: mvn clean install -P full windows_build: runs-on: windows-2019 @@ -33,7 +33,7 @@ jobs: distribution: 'zulu' cache: 'maven' - name: Build with Maven - run: mvn clean package -P full + run: mvn clean install -P full macos_build: runs-on: macos-latest @@ -49,4 +49,4 @@ jobs: distribution: 'zulu' cache: 'maven' - name: Build with Maven - run: mvn clean package -P full \ No newline at end of file + run: mvn clean install -P full \ No newline at end of file diff --git a/arthas-spring-boot-starter/pom.xml b/arthas-spring-boot-starter/pom.xml index 32f7906d..49a21ad9 100644 --- a/arthas-spring-boot-starter/pom.xml +++ b/arthas-spring-boot-starter/pom.xml @@ -15,6 +15,10 @@ ${project.artifactId} https://github.com/alibaba/arthas + + */pom.xml + + @@ -64,6 +68,19 @@ + + + jdk-lt-17 + + [1.8,17) + + + + arthas-spring-boot-starter-example/pom.xml + + + + @@ -79,12 +96,13 @@ true setup verify + ${it.pom.includes} integration-test - test + install run diff --git a/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/pom.xml b/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/pom.xml index b2f9d536..f199da81 100644 --- a/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/pom.xml +++ b/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/pom.xml @@ -5,17 +5,17 @@ org.springframework.boot spring-boot-starter-parent - @spring-boot.version@ + @spring-boot3.version@ com.example - arthas-spring-boot-starter-example + arthas-spring-boot3-starter-example 0.0.1-SNAPSHOT - arthas-spring-boot-starter-example + arthas-spring-boot3-starter-example Demo project for Spring Boot - 1.8 + 17 diff --git a/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/main/java/com/example/arthasspringbootstarterexample/ArthasSpringBootStarterExampleApplication.java b/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/main/java/com/example/arthasspringboot3starterexample/ArthasSpringBoot3StarterExampleApplication.java similarity index 64% rename from arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/main/java/com/example/arthasspringbootstarterexample/ArthasSpringBootStarterExampleApplication.java rename to arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/main/java/com/example/arthasspringboot3starterexample/ArthasSpringBoot3StarterExampleApplication.java index ff37c8ae..1371bbfb 100644 --- a/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/main/java/com/example/arthasspringbootstarterexample/ArthasSpringBootStarterExampleApplication.java +++ b/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/main/java/com/example/arthasspringboot3starterexample/ArthasSpringBoot3StarterExampleApplication.java @@ -1,4 +1,4 @@ -package com.example.arthasspringbootstarterexample; +package com.example.arthasspringboot3starterexample; import java.util.concurrent.TimeUnit; @@ -6,10 +6,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class ArthasSpringBootStarterExampleApplication { +public class ArthasSpringBoot3StarterExampleApplication { public static void main(String[] args) throws InterruptedException { - SpringApplication.run(ArthasSpringBootStarterExampleApplication.class, args); + SpringApplication.run(ArthasSpringBoot3StarterExampleApplication.class, args); System.out.println("xxxxxxxxxxxxxxxxxx"); TimeUnit.SECONDS.sleep(3); System.exit(0); diff --git a/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/test/java/com/example/arthasspringbootstarterexample/ArthasSpringBootStarterExampleApplicationTests.java b/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/test/java/com/example/arthasspringboot3starterexample/ArthasSpringBoot3StarterExampleApplicationTests.java similarity index 58% rename from arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/test/java/com/example/arthasspringbootstarterexample/ArthasSpringBootStarterExampleApplicationTests.java rename to arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/test/java/com/example/arthasspringboot3starterexample/ArthasSpringBoot3StarterExampleApplicationTests.java index 4468ab7a..ca29a339 100644 --- a/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/test/java/com/example/arthasspringbootstarterexample/ArthasSpringBootStarterExampleApplicationTests.java +++ b/arthas-spring-boot-starter/src/it/arthas-spring-boot3-starter-example/src/test/java/com/example/arthasspringboot3starterexample/ArthasSpringBoot3StarterExampleApplicationTests.java @@ -1,10 +1,10 @@ -package com.example.arthasspringbootstarterexample; +package com.example.arthasspringbootstarterexample3; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class ArthasSpringBootStarterExampleApplicationTests { +class ArthasSpringBoot3StarterExampleApplicationTests { @Test void contextLoads() { diff --git a/arthas-spring-boot-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/arthas-spring-boot-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b9db5dbf..00000000 --- a/arthas-spring-boot-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ - com.alibaba.arthas.spring.ArthasConfiguration - com.alibaba.arthas.spring.endpoints.ArthasEndPointAutoConfiguration \ No newline at end of file diff --git a/arthas-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/arthas-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..9fde570a --- /dev/null +++ b/arthas-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.alibaba.arthas.spring.ArthasConfiguration +com.alibaba.arthas.spring.endpoints.ArthasEndPointAutoConfiguration \ No newline at end of file