Skip to content

Commit 1c10569

Browse files
jansupolsenivam
jansupol
authored and
senivam
committed
Make more integration tests working
Signed-off-by: Jan Supol <jan.supol@oracle.com>
1 parent f10ab67 commit 1c10569

File tree

44 files changed

+121
-827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+121
-827
lines changed

‎containers/jetty-http/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@
4646
<dependency>
4747
<groupId>org.eclipse.jetty</groupId>
4848
<artifactId>jetty-server</artifactId>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>org.eclipse.jetty.toolchain</groupId>
52+
<artifactId>jetty-jakarta-servlet-api</artifactId>
53+
</exclusion>
54+
</exclusions>
55+
</dependency>
56+
<dependency>
57+
<groupId>jakarta.servlet</groupId>
58+
<artifactId>jakarta.servlet-api</artifactId>
59+
<version>${servlet5.version}</version>
60+
<scope>provided</scope>
4961
</dependency>
5062
<dependency>
5163
<groupId>org.eclipse.jetty</groupId>

‎ext/mvc-mustache/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@
6767
<artifactId>compiler</artifactId>
6868
<version>${mustache.version}</version>
6969
</dependency>
70-
71-
<dependency>
72-
<groupId>javax.servlet</groupId>
73-
<artifactId>servlet-api</artifactId>
74-
<version>${servlet2.version}</version>
75-
</dependency>
7670
</dependencies>
7771

7872
</project>

‎tests/e2e-server/pom.xml‎

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@
129129
<artifactId>jersey-grizzly-connector</artifactId>
130130
<scope>test</scope>
131131
</dependency>
132+
<dependency>
133+
<groupId>org.glassfish.jersey.connectors</groupId>
134+
<artifactId>jersey-jetty-connector</artifactId>
135+
<scope>test</scope>
136+
</dependency>
132137
<dependency>
133138
<groupId>org.glassfish.jersey.security</groupId>
134139
<artifactId>oauth1-signature</artifactId>
@@ -158,7 +163,6 @@
158163
<artifactId>jaxb-osgi</artifactId>
159164
<scope>test</scope>
160165
</dependency>
161-
162166
<dependency>
163167
<groupId>com.google.guava</groupId>
164168
<artifactId>guava</artifactId>
@@ -211,42 +215,6 @@
211215
</pluginManagement>
212216
</build>
213217
</profile>
214-
<profile>
215-
<id>JettyExclude</id>
216-
<activation>
217-
<jdk>1.8</jdk>
218-
</activation>
219-
<build>
220-
<plugins>
221-
<plugin>
222-
<groupId>org.apache.maven.plugins</groupId>
223-
<artifactId>maven-compiler-plugin</artifactId>
224-
<configuration>
225-
<testExcludes>
226-
<testExclude>org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java</testExclude>
227-
<testExclude>org/glassfish/jersey/tests/e2e/server/mvc/MvcEncodingTest.java</testExclude>
228-
<testExclude>org/glassfish/jersey/tests/e2e/server/monitoring/StatisticsDestroyTest.java</testExclude>
229-
<testExclude>org/glassfish/jersey/tests/e2e/server/monitoring/ReloadApplicationEventTest.java</testExclude>
230-
</testExcludes>
231-
</configuration>
232-
</plugin>
233-
</plugins>
234-
</build>
235-
</profile>
236-
<profile>
237-
<id>Jetty11</id>
238-
<activation>
239-
<jdk>[11,)</jdk>
240-
</activation>
241-
<dependencies>
242-
<dependency>
243-
<groupId>org.glassfish.jersey.connectors</groupId>
244-
<artifactId>jersey-jetty-connector</artifactId>
245-
<version>${project.version}</version>
246-
<scope>test</scope>
247-
</dependency>
248-
</dependencies>
249-
</profile>
250218
</profiles>
251219

252220
</project>

‎tests/integration/async-jersey-filter/pom.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,10 @@
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-failsafe-plugin</artifactId>
66-
<!-- TODO remove after jakartification is done -->
67-
<configuration>
68-
<excludes>
69-
<exclude>org/glassfish/jersey/tests/integration/jersey2730/Jersey2730ITCase.java</exclude>
70-
<exclude>org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java</exclude>
71-
</excludes>
72-
</configuration>
7366
</plugin>
7467
<plugin>
75-
<groupId>org.mortbay.jetty</groupId>
68+
<groupId>org.eclipse.jetty</groupId>
7669
<artifactId>jetty-maven-plugin</artifactId>
77-
<!--TODO jakartify this -->
78-
<dependencies>
79-
<dependency>
80-
<groupId>jakarta.servlet</groupId>
81-
<artifactId>jakarta.servlet-api</artifactId>
82-
<version>${servlet5.version}</version>
83-
</dependency>
84-
</dependencies>
85-
<configuration>
86-
<skip>true</skip>
87-
</configuration>
8870
</plugin>
8971
</plugins>
9072
</build>

‎tests/integration/jersey-2322/pom.xml‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
<groupId>org.glassfish.jersey.containers</groupId>
3838
<artifactId>jersey-container-servlet-core</artifactId>
3939
</dependency>
40-
<!-- <dependency>-->
41-
<!-- <groupId>org.glassfish.jersey.media</groupId>-->
42-
<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
43-
<!-- </dependency>-->
40+
<dependency>
41+
<groupId>org.glassfish.jersey.media</groupId>
42+
<artifactId>jersey-media-json-jackson</artifactId>
43+
</dependency>
4444
<dependency>
4545
<groupId>org.glassfish.jersey.ext</groupId>
4646
<artifactId>jersey-metainf-services</artifactId>
@@ -70,27 +70,10 @@
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-failsafe-plugin</artifactId>
73-
<!-- TODO remove after jakartification -->
74-
<configuration>
75-
<excludes>
76-
<exclude>org/glassfish/jersey/tests/integration/jersey2322/Jersey2322ITCase.java</exclude>
77-
</excludes>
78-
</configuration>
7973
</plugin>
8074
<plugin>
81-
<groupId>org.mortbay.jetty</groupId>
75+
<groupId>org.eclipse.jetty</groupId>
8276
<artifactId>jetty-maven-plugin</artifactId>
83-
<!--TODO jakartify this -->
84-
<dependencies>
85-
<dependency>
86-
<groupId>jakarta.servlet</groupId>
87-
<artifactId>jakarta.servlet-api</artifactId>
88-
<version>${servlet5.version}</version>
89-
</dependency>
90-
</dependencies>
91-
<configuration>
92-
<skip>true</skip>
93-
</configuration>
9477
</plugin>
9578
</plugins>
9679
</build>

‎tests/integration/jersey-2892/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<artifactId>maven-failsafe-plugin</artifactId>
7171
</plugin>
7272
<plugin>
73-
<groupId>org.mortbay.jetty</groupId>
73+
<groupId>org.eclipse.jetty</groupId>
7474
<artifactId>jetty-maven-plugin</artifactId>
7575
</plugin>
7676
</plugins>

‎tests/integration/jetty-response-close/pom.xml‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎tests/integration/jetty-response-close/src/test/java/org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)