diff options
| author | Zhe Sun <31067185+ZheSun88@users.noreply.github.com> | 2021-10-19 16:56:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 16:56:38 +0300 |
| commit | f276a63cfed220e7f46834d8c3dbebddc401ec4e (patch) | |
| tree | 6f345a1612f9fdb8c57a579263783d6661fa5bfc | |
| parent | 0e841f607028c31a1144f1c949ab259e2b852b2f (diff) | |
| download | vaadin-framework-f276a63cfed220e7f46834d8c3dbebddc401ec4e.tar.gz vaadin-framework-f276a63cfed220e7f46834d8c3dbebddc401ec4e.zip | |
Small updates to servlet container test setup. (#12318) (#12447)7.7.28
* Small updates to servlet container test setup.
- Upgraded to use cargo-maven3-plugin since cargo-maven2-plugin is now
EOL.
- Defined supported packagings as the current jetty-maven-plugin default
only covers war.
- Changed a test pojo to implement Serializable in order to prevent an
error in cargo-maven3-plugin stop-container phase.
6 files changed, 10 insertions, 6 deletions
diff --git a/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java index de2b34bbe1..0d2c6feb24 100644 --- a/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java +++ b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java @@ -1,5 +1,7 @@ package com.vaadin.tests.integration; +import java.io.Serializable; + import com.vaadin.annotations.DesignRoot; import com.vaadin.annotations.Theme; import com.vaadin.annotations.Widgetset; @@ -18,7 +20,7 @@ import java.util.Iterator; @Theme("valo") public class ServletIntegrationUI extends UI { - public static class Country { + public static class Country implements Serializable { private final String name; private final String id; private final Resource icon; diff --git a/test/servlet-containers/pom.xml b/test/servlet-containers/pom.xml index 4dd5460b74..d60f7c4abc 100644 --- a/test/servlet-containers/pom.xml +++ b/test/servlet-containers/pom.xml @@ -81,7 +81,8 @@ <!-- Generic cargo plugin configuration. Define container to use in submodule. --> <plugin> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> + <artifactId>cargo-maven3-plugin</artifactId> + <version>1.9.4</version> <configuration> <configuration> <type>standalone</type> @@ -165,6 +166,7 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> + <supportedPackagings>pom,jar,war</supportedPackagings> <webApp> <contextPath>${context.path}</contextPath> </webApp> diff --git a/test/servlet-containers/tomcat7/pom.xml b/test/servlet-containers/tomcat7/pom.xml index 4e4c57f34e..c8d37d9a3d 100644 --- a/test/servlet-containers/tomcat7/pom.xml +++ b/test/servlet-containers/tomcat7/pom.xml @@ -36,7 +36,7 @@ <!-- Server configuration --> <plugin> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> + <artifactId>cargo-maven3-plugin</artifactId> <configuration> <container> <containerId>tomcat7x</containerId> diff --git a/test/servlet-containers/tomcat80/pom.xml b/test/servlet-containers/tomcat80/pom.xml index c79fba6eb5..6476e26778 100644 --- a/test/servlet-containers/tomcat80/pom.xml +++ b/test/servlet-containers/tomcat80/pom.xml @@ -36,7 +36,7 @@ <!-- Server configuration --> <plugin> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> + <artifactId>cargo-maven3-plugin</artifactId> <configuration> <container> <containerId>tomcat8x</containerId> diff --git a/test/servlet-containers/tomcat85/pom.xml b/test/servlet-containers/tomcat85/pom.xml index 405de2a255..6e5775b9b9 100644 --- a/test/servlet-containers/tomcat85/pom.xml +++ b/test/servlet-containers/tomcat85/pom.xml @@ -36,7 +36,7 @@ <!-- Server configuration --> <plugin> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> + <artifactId>cargo-maven3-plugin</artifactId> <configuration> <container> <containerId>tomcat8x</containerId> diff --git a/test/servlet-containers/tomcat9/pom.xml b/test/servlet-containers/tomcat9/pom.xml index 951353b76c..3eef42fe74 100644 --- a/test/servlet-containers/tomcat9/pom.xml +++ b/test/servlet-containers/tomcat9/pom.xml @@ -36,7 +36,7 @@ <!-- Server configuration --> <plugin> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> + <artifactId>cargo-maven3-plugin</artifactId> <configuration> <container> <containerId>tomcat9x</containerId> |