Skip to content

Commit d7bbbe1

Browse files
jansupoljansupol
committed
Merge jersey-container-servlet-core and jersey-container-servlet modules
Signed-off-by: jansupol <jan.supol@oracle.com>
1 parent 1194ef0 commit d7bbbe1

File tree

109 files changed

+241
-753
lines changed

Some content is hidden

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

109 files changed

+241
-753
lines changed

‎archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.glassfish.jersey.containers</groupId>
48-
<artifactId>jersey-container-servlet-core</artifactId>
49-
<!-- use the following artifactId if you don't need servlet 2.x compatibility -->
50-
<!-- artifactId>jersey-container-servlet</artifactId -->
48+
<artifactId>jersey-container-servlet</artifactId>
5149
</dependency>
5250
<dependency>
5351
<groupId>org.glassfish.jersey.inject</groupId>

‎bom/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
<artifactId>jersey-container-servlet</artifactId>
134134
<version>${project.version}</version>
135135
</dependency>
136-
<dependency>
137-
<groupId>org.glassfish.jersey.containers</groupId>
138-
<artifactId>jersey-container-servlet-core</artifactId>
139-
<version>${project.version}</version>
140-
</dependency>
141136
<dependency>
142137
<groupId>org.glassfish.jersey.containers.glassfish</groupId>
143138
<artifactId>jersey-gf-ejb</artifactId>

‎bundles/apidocs/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,6 @@
106106
<artifactId>jersey-container-servlet</artifactId>
107107
<version>${project.version}</version>
108108
</dependency>
109-
<dependency>
110-
<groupId>org.glassfish.jersey.containers</groupId>
111-
<artifactId>jersey-container-servlet-core</artifactId>
112-
<version>${project.version}</version>
113-
</dependency>
114109
<!-- need to explicitly include the servlet dependency here
115110
as it is scoped as provided in the jersey-servet modules -->
116111
<dependency>

‎bundles/jaxrs-ri/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,6 @@
8282
<artifactId>jersey-server</artifactId>
8383
<version>${project.version}</version>
8484
</dependency>
85-
<dependency>
86-
<groupId>org.glassfish.jersey.containers</groupId>
87-
<artifactId>jersey-container-servlet-core</artifactId>
88-
<version>${project.version}</version>
89-
</dependency>
9085
<dependency>
9186
<groupId>org.glassfish.jersey.containers</groupId>
9287
<artifactId>jersey-container-servlet</artifactId>
@@ -134,13 +129,6 @@
134129
<classifier>sources</classifier>
135130
<optional>true</optional>
136131
</dependency>
137-
<dependency>
138-
<groupId>org.glassfish.jersey.containers</groupId>
139-
<artifactId>jersey-container-servlet-core</artifactId>
140-
<version>${project.version}</version>
141-
<classifier>sources</classifier>
142-
<optional>true</optional>
143-
</dependency>
144132
<dependency>
145133
<groupId>org.glassfish.jersey.containers</groupId>
146134
<artifactId>jersey-container-servlet</artifactId>

‎containers/jersey-servlet-core/pom.xml‎

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

‎containers/jersey-servlet-core/src/main/resources/META-INF/services/org.glassfish.jersey.innate.BootstrapPreinitialization‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎containers/jersey-servlet-core/src/test/java/org/glassfish/jersey/servlet/internal/ContextPathEncodingTest.java‎

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

0 commit comments

Comments
 (0)