diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9ecf1a03..dd4a2b00 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -87,7 +87,7 @@ jobs: depend_tasks: ":vul:vul-webapp:war" - middleware: "weblogic" depend_tasks: ":vul:vul-webapp:war" - - middleware: "springmvc" + - middleware: "springwebmvc" depend_tasks: ":vul:vul-springboot1:bootJar :vul:vul-springboot2:bootJar :vul:vul-springboot2-jetty:bootJar :vul:vul-springboot2-undertow:bootJar :vul:vul-springboot2:bootWar :vul:vul-springboot3:bootJar" - middleware: "springwebflux" depend_tasks: ":vul:vul-springboot2-webflux:bootJar :vul:vul-springboot3-webflux:bootJar" diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot1ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot1ContainerTest.java similarity index 98% rename from integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot1ContainerTest.java rename to integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot1ContainerTest.java index 62aab06b..3e2e7a28 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot1ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot1ContainerTest.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.integration.springmvc; +package com.reajason.javaweb.integration.springwebmvc; import com.reajason.javaweb.integration.TestCasesProvider; import com.reajason.javaweb.memshell.Packers; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java similarity index 98% rename from integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java rename to integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java index 65d8f3bb..fe938a1d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.integration.springmvc; +package com.reajason.javaweb.integration.springwebmvc; import com.reajason.javaweb.integration.TestCasesProvider; import com.reajason.javaweb.memshell.Packers; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2JettyContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2JettyContainerTest.java similarity index 98% rename from integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2JettyContainerTest.java rename to integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2JettyContainerTest.java index c14dbefc..b534719a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2JettyContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2JettyContainerTest.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.integration.springmvc; +package com.reajason.javaweb.integration.springwebmvc; import com.reajason.javaweb.integration.TestCasesProvider; import com.reajason.javaweb.memshell.Packers; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2UndertowContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2UndertowContainerTest.java similarity index 98% rename from integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2UndertowContainerTest.java rename to integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2UndertowContainerTest.java index e5655ff3..2cb7049d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2UndertowContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2UndertowContainerTest.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.integration.springmvc; +package com.reajason.javaweb.integration.springwebmvc; import com.reajason.javaweb.integration.TestCasesProvider; import com.reajason.javaweb.memshell.Packers; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2WarContainerTest.java similarity index 98% rename from integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java rename to integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2WarContainerTest.java index 4ef93d24..136f9834 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2WarContainerTest.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.integration.springmvc; +package com.reajason.javaweb.integration.springwebmvc; import com.reajason.javaweb.integration.TestCasesProvider; import com.reajason.javaweb.memshell.Packers; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot3ContainerTest.java similarity index 98% rename from integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java rename to integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot3ContainerTest.java index 6e586971..c3968cf9 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot3ContainerTest.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.integration.springmvc; +package com.reajason.javaweb.integration.springwebmvc; import com.reajason.javaweb.integration.TestCasesProvider; import com.reajason.javaweb.memshell.Packers;