* 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.tags/7.7.28^0
@@ -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; |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |