summaryrefslogtreecommitdiffstats
path: root/test/servlet-containers/generic/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'test/servlet-containers/generic/pom.xml')
-rw-r--r--test/servlet-containers/generic/pom.xml66
1 files changed, 29 insertions, 37 deletions
diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml
index 545ef8b52e..8ff752483c 100644
--- a/test/servlet-containers/generic/pom.xml
+++ b/test/servlet-containers/generic/pom.xml
@@ -14,37 +14,26 @@
<dependencies>
- <!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.vaadin</groupId>
<artifactId>vaadin-compatibility-server</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.vaadin</groupId>
<artifactId>vaadin-compatibility-client-compiled</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>vaadin-client-compiled</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>vaadin-themes</artifactId>
- <version>${project.version}</version>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-push</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>vaadin-push</artifactId>
- <version>${project.version}</version>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-client-compiled</artifactId>
</dependency>
-
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.vaadin</groupId>
<artifactId>vaadin-uitest-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -57,7 +46,9 @@
<plugins>
<!--TODO run this on different servers-->
<plugin>
- <artifactId>maven-install-plugin</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -75,24 +66,25 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <configuration>
- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <artifactId>maven-war-plugin</artifactId>
+ <!-- This execution builds an additional .war file with JBoss 6 specific descriptor -->
+ <executions>
+ <execution>
+ <id>jboss6-war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <classifier>jboss6</classifier>
+ <webResources>
+ <resource>
+ <directory>src/main/jboss-6</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>