diff options
| author | Zhe Sun <31067185+ZheSun88@users.noreply.github.com> | 2021-05-31 10:15:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 10:15:11 +0300 |
| commit | 45e7afb51c8e5610c363b2afe73cc43381431f1c (patch) | |
| tree | 3299775678e2b17c7fbf655583e78ccd9593bca9 /test/servlet-containers | |
| parent | 49b2ec6b506b441226200641916f4b9220a8ced8 (diff) | |
| download | vaadin-framework-45e7afb51c8e5610c363b2afe73cc43381431f1c.tar.gz vaadin-framework-45e7afb51c8e5610c363b2afe73cc43381431f1c.zip | |
Small updates to servlet container test setup. (#12318)
* 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.
Diffstat (limited to 'test/servlet-containers')
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 0d4010beaa..670d0ca8d5 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.Widgetset; import com.vaadin.server.ClassResource; @@ -15,7 +17,7 @@ import com.vaadin.ui.declarative.Design; @Widgetset("com.vaadin.DefaultWidgetSet") 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 efade777de..1eb92f6415 100644 --- a/test/servlet-containers/pom.xml +++ b/test/servlet-containers/pom.xml @@ -110,7 +110,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> @@ -194,6 +195,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 c0122a41a4..6951bafc75 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 c9f45e4d63..8cdea06fcb 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 8fcf76066b..90afc6271c 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 4b46dabf1b..a8a9892c20 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> |