diff options
Diffstat (limited to 'test')
3 files changed, 0 insertions, 44 deletions
diff --git a/test/servlet-containers/generic/integration_tests.xml b/test/servlet-containers/generic/integration_tests.xml index c10af3042b..3543cf24de 100644 --- a/test/servlet-containers/generic/integration_tests.xml +++ b/test/servlet-containers/generic/integration_tests.xml @@ -96,13 +96,6 @@ </antcall> </target> - <target name="integration-test-osgi"> - <antcall target="run-generic-integration-test"> - <param name="startDelay" value="10" /> - <param name="target-server" value="karaf4" /> - </antcall> - </target> - <target name="integration-test-jetty8"> <antcall target="run-generic-integration-test"> <param name="startDelay" value="90" /> @@ -193,7 +186,6 @@ <antcall target="integration-test-jetty9" /> <antcall target="integration-test-tomcat7" /> <antcall target="integration-test-tomcat8" /> - <antcall target="integration-test-osgi" /> <antcall target="integration-test-tomcat7apacheproxy" /> </parallel> diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml index 052887ba31..843d51fcfb 100644 --- a/test/servlet-containers/generic/pom.xml +++ b/test/servlet-containers/generic/pom.xml @@ -12,7 +12,6 @@ <name>vaadin-test-generic-integration</name> <packaging>war</packaging> <properties> - <osgi.bundle.version>8.0.0</osgi.bundle.version> <jetty.skip>true</jetty.skip> </properties> @@ -83,11 +82,6 @@ </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> @@ -108,33 +102,6 @@ </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> diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationTests.java b/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationTests.java index 3f9fdd78de..36b6c5b9f7 100644 --- a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationTests.java +++ b/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationTests.java @@ -23,9 +23,6 @@ public class ServletIntegrationTests { notWebsocketCompatible.add("weblogic10"); notWebsocketCompatible.add("wildfly9-nginx"); - // Jetty 9 but no ws support by default - notWebsocketCompatible.add("karaf4"); - notJSR356Compatible.add("jetty8"); notJSR356Compatible.add("tomcat7"); } |