diff options
Diffstat (limited to 'test/servlet-containers/generic/pom.xml')
| -rw-r--r-- | test/servlet-containers/generic/pom.xml | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml index 8ff752483c..4c1c9b8292 100644 --- a/test/servlet-containers/generic/pom.xml +++ b/test/servlet-containers/generic/pom.xml @@ -11,6 +11,9 @@ <artifactId>vaadin-test-generic-integration</artifactId> <name>vaadin-test-generic-integration</name> <packaging>war</packaging> + <properties> + <osgi.bundle.version>8.0.0</osgi.bundle.version> + </properties> <dependencies> @@ -26,7 +29,7 @@ </dependency> <dependency> <groupId>com.vaadin</groupId> - <artifactId>vaadin-push</artifactId> + <artifactId>vaadin-compatibility-themes</artifactId> </dependency> <dependency> <groupId>com.vaadin</groupId> @@ -34,6 +37,10 @@ </dependency> <dependency> <groupId>com.vaadin</groupId> + <artifactId>vaadin-push</artifactId> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> <artifactId>vaadin-uitest-common</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -67,6 +74,11 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> <!-- This execution builds an additional .war file with JBoss 6 specific descriptor --> <executions> <execution> @@ -86,7 +98,33 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.0.1</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Name>${project.name}</Bundle-Name> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Import-Package>javax.servlet,javax.servlet.http,javax.websocket,javax.websocket.server,!com.vaadin.*,*</Import-Package> + <Web-ContextPath>run</Web-ContextPath> + </instructions> + <supportedProjectTypes> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + </configuration> + <executions> + <execution> + <id>osgi-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> - </project> |