Skip to content

Commit

Permalink
Documentation and example fixes related to jakartification (#4633)
Browse files Browse the repository at this point in the history
* Documentation and example fixes related to jakartification

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
  • Loading branch information
senivam authored Jan 8, 2021
1 parent e9707c8 commit 4e81a50
Showing 5 changed files with 141 additions and 21 deletions.
128 changes: 128 additions & 0 deletions bundles/apidocs/pom.xml
Original file line number Diff line number Diff line change
@@ -52,6 +52,32 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<!-- CONNECTORS -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-grizzly-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jdk-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jetty-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-netty-connector</artifactId>
<version>${project.version}</version>
</dependency>
<!-- CONTAINERS -->
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -91,6 +117,31 @@
<version>${project.version}</version>
</dependency>
<!-- MEDIA -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jettison</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
@@ -106,7 +157,84 @@
<artifactId>jersey-media-sse</artifactId>
<version>${project.version}</version>
</dependency>
<!-- kryo -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-kryo</artifactId>
<version>${project.version}</version>
</dependency>
<!-- INJECT -->
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-cdi2-se</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${project.version}</version>
</dependency>
<!-- EXT -->
<dependency>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>jersey-cdi1x</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-declarative-linking</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
<artifactId>jersey-mp-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-wadl-doclet</artifactId>
<version>${project.version}</version>
</dependency>
<!-- incubator -->
<dependency>
<groupId>org.glassfish.jersey.incubator</groupId>
<artifactId>jersey-open-tracing</artifactId>
<version>${project.version}</version>
</dependency>
<!-- security -->
<dependency>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-signature</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>jetty2x</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
<artifactId>jersey-mp-rest-client</artifactId>
<version>${project.version}</version>
</dependency>
<!-- media -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson1</artifactId>
<version>${project.version}</version>
</dependency>
<!-- connectors -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-helidon-connector</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
<build>
<plugins>
<plugin>
20 changes: 10 additions & 10 deletions bundles/examples/pom.xml
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@
<type>zip</type>
</dependency>
-->
<dependency>
<!--<dependency> TODO - jakartification
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>bookmark</artifactId>
<version>${project.version}</version>
@@ -75,7 +75,7 @@
<version>${project.version}</version>
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
</dependency>-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>bookstore-webapp</artifactId>
@@ -168,7 +168,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
<dependency>
<!--<dependency> //TODO jakartification
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>extended-wadl-webapp</artifactId>
<version>${project.version}</version>
@@ -181,7 +181,7 @@
<version>${project.version}</version>
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
</dependency>-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>freemarker-webapp</artifactId>
@@ -231,7 +231,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
<dependency>
<!--<dependency> //TODO Jakartification
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>helloworld-spring-annotations</artifactId>
<version>${project.version}</version>
@@ -244,7 +244,7 @@
<version>${project.version}</version>
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
</dependency>-->
<!-- There is problem to run Spring example on GF - https://java.net/jira/browse/JERSEY-2032
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
@@ -452,13 +452,13 @@
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
<dependency>
<!--<dependency> // TODO Jakartification
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>oauth-client-twitter</artifactId>
<version>${project.version}</version>
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
</dependency>-->
<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
@@ -468,7 +468,7 @@
<type>zip</type>
</dependency>
-->
<dependency>
<!--<dependency> //TODO Jakartification
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
<version>${project.version}</version>
@@ -488,7 +488,7 @@
<version>${project.version}</version>
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
</dependency>-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>rx-client-webapp</artifactId>
10 changes: 1 addition & 9 deletions docs/src/main/docbook/modules.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -470,14 +470,6 @@
</row>
<row>
<entry>
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-servlet-portability/dependencies.html">
jersey-servlet-portability
</link>
</entry>
<entry>Library that enables writing web applications that run with both Jersey 1.x and Jersey 2.x servlet containers.</entry>
</row>
<row>
<entry>
<link xlink:href="https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project/jersey-spring4/dependencies.html">
jersey-spring4
</link>
2 changes: 1 addition & 1 deletion ext/microprofile/mp-rest-client/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion tests/integration/microprofile/rest-client/pom.xml
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@
<dependency>
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
<artifactId>jersey-mp-rest-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<!-- Overrides CDI from parent pom -->
@@ -43,7 +44,6 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>4.0.0.Alpha1</version>
<scope>test</scope>
</dependency>
<dependency>

0 comments on commit 4e81a50

Please sign in to comment.