Skip to content

Commit bd640cd

Browse files
committed
Documentation and example fixes related to jakartification
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent bc61cc1 commit bd640cd

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,6 @@
469469
<entry>Jersey Reactive Client - RxJava2 (Flowable) provider.</entry>
470470
</row>
471471
<row>
472-
<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>
477472
<entry>Library that enables writing web applications that run with both Jersey 1.x and Jersey 2.x servlet containers.</entry>
478473
</row>
479474
<row>

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)