Skip to content

Commit

Permalink
Make more integration tests working
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan Supol <[email protected]>
  • Loading branch information
@jansupol @senivam
jansupol authored and senivam committed Oct 26, 2020
1 parent f10ab67 commit 1c10569
Show file tree
Hide file tree
Showing 44 changed files with 121 additions and 827 deletions.
12 changes: 12 additions & 0 deletions containers/jetty-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
6 changes: 0 additions & 6 deletions ext/mvc-mustache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@
<artifactId>compiler</artifactId>
<version>${mustache.version}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet2.version}</version>
</dependency>
</dependencies>

</project>
42 changes: 5 additions & 37 deletions tests/e2e-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@
<artifactId>jersey-grizzly-connector</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jetty-connector</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-signature</artifactId>
Expand Down Expand Up @@ -158,7 +163,6 @@
<artifactId>jaxb-osgi</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -211,42 +215,6 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>JettyExclude</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
<testExclude>org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java</testExclude>
<testExclude>org/glassfish/jersey/tests/e2e/server/mvc/MvcEncodingTest.java</testExclude>
<testExclude>org/glassfish/jersey/tests/e2e/server/monitoring/StatisticsDestroyTest.java</testExclude>
<testExclude>org/glassfish/jersey/tests/e2e/server/monitoring/ReloadApplicationEventTest.java</testExclude>
</testExcludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>Jetty11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jetty-connector</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
20 changes: 1 addition & 19 deletions tests/integration/async-jersey-filter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,28 +63,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey2730/Jersey2730ITCase.java</exclude>
<exclude>org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
27 changes: 5 additions & 22 deletions tests/integration/jersey-2322/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.glassfish.jersey.media</groupId>-->
<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-metainf-services</artifactId>
Expand Down Expand Up @@ -70,27 +70,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey2322/Jersey2322ITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/jersey-2892/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
87 changes: 0 additions & 87 deletions tests/integration/jetty-response-close/pom.xml
View file

This file was deleted.

28 changes: 0 additions & 28 deletions ...-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java
View file

This file was deleted.

58 changes: 0 additions & 58 deletions .../test/java/org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java
View file

This file was deleted.

Loading

0 comments on commit 1c10569

Please sign in to comment.