Skip to content

Commit 4e81a50

Browse files
senivamsenivam
authored
Documentation and example fixes related to jakartification (#4633)
* Documentation and example fixes related to jakartification Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent e9707c8 commit 4e81a50

File tree

5 files changed

+141
-21
lines changed

5 files changed

+141
-21
lines changed

‎bundles/apidocs/pom.xml

+128
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,32 @@
5252
<groupId>org.osgi</groupId>
5353
<artifactId>org.osgi.core</artifactId>
5454
</dependency>
55+
<!-- CONNECTORS -->
56+
<dependency>
57+
<groupId>org.glassfish.jersey.connectors</groupId>
58+
<artifactId>jersey-apache-connector</artifactId>
59+
<version>${project.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.glassfish.jersey.connectors</groupId>
63+
<artifactId>jersey-grizzly-connector</artifactId>
64+
<version>${project.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.glassfish.jersey.connectors</groupId>
68+
<artifactId>jersey-jdk-connector</artifactId>
69+
<version>${project.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.glassfish.jersey.connectors</groupId>
73+
<artifactId>jersey-jetty-connector</artifactId>
74+
<version>${project.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.glassfish.jersey.connectors</groupId>
78+
<artifactId>jersey-netty-connector</artifactId>
79+
<version>${project.version}</version>
80+
</dependency>
5581
<!-- CONTAINERS -->
5682
<dependency>
5783
<groupId>org.glassfish.jersey.containers</groupId>
@@ -91,6 +117,31 @@
91117
<version>${project.version}</version>
92118
</dependency>
93119
<!-- MEDIA -->
120+
<dependency>
121+
<groupId>org.glassfish.jersey.media</groupId>
122+
<artifactId>jersey-media-jaxb</artifactId>
123+
<version>${project.version}</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.glassfish.jersey.media</groupId>
127+
<artifactId>jersey-media-json-binding</artifactId>
128+
<version>${project.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.glassfish.jersey.media</groupId>
132+
<artifactId>jersey-media-json-jackson</artifactId>
133+
<version>${project.version}</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.glassfish.jersey.media</groupId>
137+
<artifactId>jersey-media-json-jettison</artifactId>
138+
<version>${project.version}</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.glassfish.jersey.media</groupId>
142+
<artifactId>jersey-media-json-processing</artifactId>
143+
<version>${project.version}</version>
144+
</dependency>
94145
<dependency>
95146
<groupId>org.glassfish.jersey.media</groupId>
96147
<artifactId>jersey-media-moxy</artifactId>
@@ -106,7 +157,84 @@
106157
<artifactId>jersey-media-sse</artifactId>
107158
<version>${project.version}</version>
108159
</dependency>
160+
<!-- kryo -->
161+
<dependency>
162+
<groupId>org.glassfish.jersey.media</groupId>
163+
<artifactId>jersey-media-kryo</artifactId>
164+
<version>${project.version}</version>
165+
</dependency>
166+
<!-- INJECT -->
167+
<dependency>
168+
<groupId>org.glassfish.jersey.inject</groupId>
169+
<artifactId>jersey-cdi2-se</artifactId>
170+
<version>${project.version}</version>
171+
</dependency>
172+
<dependency>
173+
<groupId>org.glassfish.jersey.inject</groupId>
174+
<artifactId>jersey-hk2</artifactId>
175+
<version>${project.version}</version>
176+
</dependency>
177+
<!-- EXT -->
178+
<dependency>
179+
<groupId>org.glassfish.jersey.ext.cdi</groupId>
180+
<artifactId>jersey-cdi1x</artifactId>
181+
<version>${project.version}</version>
182+
</dependency>
183+
<dependency>
184+
<groupId>org.glassfish.jersey.ext</groupId>
185+
<artifactId>jersey-declarative-linking</artifactId>
186+
<version>${project.version}</version>
187+
</dependency>
188+
<dependency>
189+
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
190+
<artifactId>jersey-mp-config</artifactId>
191+
<version>${project.version}</version>
192+
</dependency>
193+
<dependency>
194+
<groupId>org.glassfish.jersey.ext</groupId>
195+
<artifactId>jersey-wadl-doclet</artifactId>
196+
<version>${project.version}</version>
197+
</dependency>
198+
<!-- incubator -->
199+
<dependency>
200+
<groupId>org.glassfish.jersey.incubator</groupId>
201+
<artifactId>jersey-open-tracing</artifactId>
202+
<version>${project.version}</version>
203+
</dependency>
204+
<!-- security -->
205+
<dependency>
206+
<groupId>org.glassfish.jersey.security</groupId>
207+
<artifactId>oauth1-signature</artifactId>
208+
<version>${project.version}</version>
209+
</dependency>
109210
</dependencies>
211+
<profiles>
212+
<profile>
213+
<id>jetty2x</id>
214+
<activation>
215+
<activeByDefault>false</activeByDefault>
216+
</activation>
217+
<dependencies>
218+
<dependency>
219+
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
220+
<artifactId>jersey-mp-rest-client</artifactId>
221+
<version>${project.version}</version>
222+
</dependency>
223+
<!-- media -->
224+
<dependency>
225+
<groupId>org.glassfish.jersey.media</groupId>
226+
<artifactId>jersey-media-json-jackson1</artifactId>
227+
<version>${project.version}</version>
228+
</dependency>
229+
<!-- connectors -->
230+
<dependency>
231+
<groupId>org.glassfish.jersey.connectors</groupId>
232+
<artifactId>jersey-helidon-connector</artifactId>
233+
<version>${project.version}</version>
234+
</dependency>
235+
</dependencies>
236+
</profile>
237+
</profiles>
110238
<build>
111239
<plugins>
112240
<plugin>

‎bundles/examples/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<type>zip</type>
4949
</dependency>
5050
-->
51-
<dependency>
51+
<!--<dependency> TODO - jakartification
5252
<groupId>org.glassfish.jersey.examples</groupId>
5353
<artifactId>bookmark</artifactId>
5454
<version>${project.version}</version>
@@ -75,7 +75,7 @@
7575
<version>${project.version}</version>
7676
<classifier>gf-project-src</classifier>
7777
<type>zip</type>
78-
</dependency>
78+
</dependency>-->
7979
<dependency>
8080
<groupId>org.glassfish.jersey.examples</groupId>
8181
<artifactId>bookstore-webapp</artifactId>
@@ -168,7 +168,7 @@
168168
<classifier>project-src</classifier>
169169
<type>zip</type>
170170
</dependency>
171-
<dependency>
171+
<!--<dependency> //TODO jakartification
172172
<groupId>org.glassfish.jersey.examples</groupId>
173173
<artifactId>extended-wadl-webapp</artifactId>
174174
<version>${project.version}</version>
@@ -181,7 +181,7 @@
181181
<version>${project.version}</version>
182182
<classifier>gf-project-src</classifier>
183183
<type>zip</type>
184-
</dependency>
184+
</dependency>-->
185185
<dependency>
186186
<groupId>org.glassfish.jersey.examples</groupId>
187187
<artifactId>freemarker-webapp</artifactId>
@@ -231,7 +231,7 @@
231231
<classifier>project-src</classifier>
232232
<type>zip</type>
233233
</dependency>
234-
<dependency>
234+
<!--<dependency> //TODO Jakartification
235235
<groupId>org.glassfish.jersey.examples</groupId>
236236
<artifactId>helloworld-spring-annotations</artifactId>
237237
<version>${project.version}</version>
@@ -244,7 +244,7 @@
244244
<version>${project.version}</version>
245245
<classifier>project-src</classifier>
246246
<type>zip</type>
247-
</dependency>
247+
</dependency>-->
248248
<!-- There is problem to run Spring example on GF - https://java.net/jira/browse/JERSEY-2032
249249
<dependency>
250250
<groupId>org.glassfish.jersey.examples</groupId>
@@ -452,13 +452,13 @@
452452
<classifier>gf-project-src</classifier>
453453
<type>zip</type>
454454
</dependency>
455-
<dependency>
455+
<!--<dependency> // TODO Jakartification
456456
<groupId>org.glassfish.jersey.examples</groupId>
457457
<artifactId>oauth-client-twitter</artifactId>
458458
<version>${project.version}</version>
459459
<classifier>project-src</classifier>
460460
<type>zip</type>
461-
</dependency>
461+
</dependency>-->
462462
<!--
463463
<dependency>
464464
<groupId>org.glassfish.jersey.examples</groupId>
@@ -468,7 +468,7 @@
468468
<type>zip</type>
469469
</dependency>
470470
-->
471-
<dependency>
471+
<!--<dependency> //TODO Jakartification
472472
<groupId>org.glassfish.jersey.examples</groupId>
473473
<artifactId>osgi-helloworld-webapp</artifactId>
474474
<version>${project.version}</version>
@@ -488,7 +488,7 @@
488488
<version>${project.version}</version>
489489
<classifier>project-src</classifier>
490490
<type>zip</type>
491-
</dependency>
491+
</dependency>-->
492492
<dependency>
493493
<groupId>org.glassfish.jersey.examples</groupId>
494494
<artifactId>rx-client-webapp</artifactId>

‎docs/src/main/docbook/modules.xml

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -470,14 +470,6 @@
470470
</row>
471471
<row>
472472
<entry>
473-
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-servlet-portability/dependencies.html">
474-
jersey-servlet-portability
475-
</link>
476-
</entry>
477-
<entry>Library that enables writing web applications that run with both Jersey 1.x and Jersey 2.x servlet containers.</entry>
478-
</row>
479-
<row>
480-
<entry>
481473
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-spring4/dependencies.html">
482474
jersey-spring4
483475
</link>

‎ext/microprofile/mp-rest-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>project</artifactId>
2424
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
25-
<version>3.0-SNAPSHOT</version>
25+
<version>3.0.0-SNAPSHOT</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

‎tests/integration/microprofile/rest-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<dependency>
3333
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
3434
<artifactId>jersey-mp-rest-client</artifactId>
35+
<version>${project.version}</version>
3536
<scope>test</scope>
3637
</dependency>
3738
<!-- Overrides CDI from parent pom -->
@@ -43,7 +44,6 @@
4344
<dependency>
4445
<groupId>org.jboss.weld.se</groupId>
4546
<artifactId>weld-se-core</artifactId>
46-
<version>4.0.0.Alpha1</version>
4747
<scope>test</scope>
4848
</dependency>
4949
<dependency>

0 commit comments

Comments
 (0)