Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit daffad1

Browse files
Marek PotočiarGerrit Code Review
Marek Potočiar
authored and
Gerrit Code Review
committed
Merge "JERSEY-2639: Jersey Client - Add Support for Rx"
2 parents 237d4fa + a422848 commit daffad1

File tree

110 files changed

+31224
-14
lines changed

Some content is hidden

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

110 files changed

+31224
-14
lines changed

‎bom/pom.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@
8585
<artifactId>jersey-guava</artifactId>
8686
<version>${project.version}</version>
8787
</dependency>
88+
<dependency>
89+
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
90+
<artifactId>jersey-jsr166e</artifactId>
91+
<version>${project.version}</version>
92+
</dependency>
8893
<dependency>
8994
<groupId>org.glassfish.jersey.bundles.glassfish.v4_0</groupId>
9095
<artifactId>jersey-gfv4_0-core</artifactId>
@@ -230,7 +235,6 @@
230235
<artifactId>html-json</artifactId>
231236
<version>${project.version}</version>
232237
</dependency>
233-
234238
<dependency>
235239
<groupId>org.glassfish.jersey.ext</groupId>
236240
<artifactId>jersey-wadl-doclet</artifactId>
@@ -271,6 +275,31 @@
271275
<artifactId>jersey-media-sse</artifactId>
272276
<version>${project.version}</version>
273277
</dependency>
278+
<dependency>
279+
<groupId>org.glassfish.jersey.ext.rx</groupId>
280+
<artifactId>jersey-rx-client</artifactId>
281+
<version>${project.version}</version>
282+
</dependency>
283+
<dependency>
284+
<groupId>org.glassfish.jersey.ext.rx</groupId>
285+
<artifactId>jersey-rx-client-guava</artifactId>
286+
<version>${project.version}</version>
287+
</dependency>
288+
<dependency>
289+
<groupId>org.glassfish.jersey.ext.rx</groupId>
290+
<artifactId>jersey-rx-client-java8</artifactId>
291+
<version>${project.version}</version>
292+
</dependency>
293+
<dependency>
294+
<groupId>org.glassfish.jersey.ext.rx</groupId>
295+
<artifactId>jersey-rx-client-jsr166e</artifactId>
296+
<version>${project.version}</version>
297+
</dependency>
298+
<dependency>
299+
<groupId>org.glassfish.jersey.ext.rx</groupId>
300+
<artifactId>jersey-rx-client-rxjava</artifactId>
301+
<version>${project.version}</version>
302+
</dependency>
274303
<dependency>
275304
<groupId>org.glassfish.jersey.test-framework</groupId>
276305
<artifactId>jersey-test-framework-core</artifactId>

‎bundles/repackaged/jersey-jsr166e/pom.xml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
7+
8+
The contents of this file are subject to the terms of either the GNU
9+
General Public License Version 2 only ("GPL") or the Common Development
10+
and Distribution License("CDDL") (collectively, the "License"). You
11+
may not use this file except in compliance with the License. You can
12+
obtain a copy of the License at
13+
http://glassfish.java.net/public/CDDL+GPL_1_1.html
14+
or packager/legal/LICENSE.txt. See the License for the specific
15+
language governing permissions and limitations under the License.
16+
17+
When distributing the software, include this License Header Notice in each
18+
file and include the License file at packager/legal/LICENSE.txt.
19+
20+
GPL Classpath Exception:
21+
Oracle designates this particular file as subject to the "Classpath"
22+
exception as provided by Oracle in the GPL Version 2 section of the License
23+
file that accompanied this code.
24+
25+
Modifications:
26+
If applicable, add the following below the License Header, with the fields
27+
enclosed by brackets [] replaced by your own identifying information:
28+
"Portions Copyright [year] [name of copyright owner]"
29+
30+
Contributor(s):
31+
If you wish your version of this file to be governed by only the CDDL or
32+
only the GPL Version 2, indicate your decision by adding "[Contributor]
33+
elects to include this software in this distribution under the [CDDL or GPL
34+
Version 2] license." If you don't indicate a single choice of license, a
35+
recipient has the option to distribute your version of this file under
36+
either the CDDL, the GPL Version 2 or to extend the choice of license to
37+
its licensees as provided above. However, if you add GPL Version 2 code
38+
and therefore, elected the GPL Version 2 license, then the option applies
39+
only if the new code is made subject to such option by the copyright
40+
holder.
41+
42+
-->
43+
<project xmlns="http://maven.apache.org/POM/4.0.0"
44+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
45+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
46+
<modelVersion>4.0.0</modelVersion>
47+
48+
<parent>
49+
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
50+
<artifactId>project</artifactId>
51+
<version>2.13-SNAPSHOT</version>
52+
</parent>
53+
54+
<artifactId>jersey-jsr166e</artifactId>
55+
<packaging>bundle</packaging>
56+
<name>jersey-repackaged-jsr166e</name>
57+
58+
<description>Jersey JSR-166e Repackaged. See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html</description>
59+
60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-compiler-plugin</artifactId>
65+
<inherited>false</inherited>
66+
<configuration>
67+
<source>${java.version}</source>
68+
<target>${java.version}</target>
69+
<compilerArguments>
70+
<!-- Do not warn about using sun.misc.Unsafe -->
71+
<XDignore.symbol.file />
72+
</compilerArguments>
73+
<showWarnings>false</showWarnings>
74+
<fork>false</fork>
75+
</configuration>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.apache.felix</groupId>
79+
<artifactId>maven-bundle-plugin</artifactId>
80+
<inherited>true</inherited>
81+
<extensions>true</extensions>
82+
<configuration>
83+
<instructions>
84+
<Import-Package>
85+
sun.misc.*;resolution:=optional,
86+
*
87+
</Import-Package>
88+
<Export-Package>jersey.repackaged.jsr166e.*;version=${project.version}</Export-Package>
89+
</instructions>
90+
<unpackBundle>true</unpackBundle>
91+
</configuration>
92+
</plugin>
93+
</plugins>
94+
</build>
95+
96+
<properties>
97+
<java.version>1.6</java.version>
98+
</properties>
99+
</project>

0 commit comments

Comments
 (0)