Skip to content

Commit 15823d5

Browse files
georgeajitgeorgeajit
georgeajit
authored and
georgeajit
committed
Merge branch 'release-3.0.8' into 3.0-master
2 parents a6f54f2 + a8edbe8 commit 15823d5

39 files changed

+6430
-6728
lines changed

‎README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,29 @@ For more details, please read this [deeper dive](http://developer.marklogic.com/
4444
* Enable [MarkLogic Jena API](https://github.com/marklogic/marklogic-jena) (separate project)
4545
* Enable [MarkLogic Sesame API](https://github.com/marklogic/marklogic-sesame) (separate project)
4646

47+
### What's New in Java Client API 3.0.5 - 3.0.7
48+
49+
* Bug fixes
50+
51+
### What's New in Java Client API 3.0.8
52+
53+
* Replace Jersey with OkHttp as the underlying HTTP library
54+
55+
4756
### QuickStart
4857

4958
To use the API in your maven project, include the following in your pom.xml:
5059

5160
<dependency>
5261
<groupId>com.marklogic</groupId>
5362
<artifactId>java-client-api</artifactId>
54-
<version>3.0.7</version>
63+
<version>3.0.8</version>
5564
</dependency>
5665

5766
For gradle projects, include the following:
5867

5968
dependencies {
60-
compile group: 'com.marklogic', name: 'java-client-api', version: '3.0.7'
69+
compile group: 'com.marklogic', name: 'java-client-api', version: '3.0.8'
6170
}
6271

6372
Read [The Java API in Five Minutes](http://developer.marklogic.com/try/java/index)
@@ -82,14 +91,14 @@ https://developer.marklogic.com/free-developer
8291

8392
To obtain verified downloads signed with MarkLogic's PGP key, use maven tools or directly download
8493
the .jar and .asc files from
85-
[maven central](http://repo1.maven.org/maven2/com/marklogic/java-client-api/3.0.5/). MarkLogic's
94+
[maven central](http://repo1.maven.org/maven2/com/marklogic/java-client-api/3.0.8/). MarkLogic's
8695
pgp key ID is 48D4B86E and it is available from pgp.mit.edu by installing gnupg and running the command:
8796

8897
$ gpg --keyserver pgp.mit.edu --recv-key 48D4B86E
8998

9099
Files can be verified with the command:
91100

92-
$ gpg java-client-api-3.0.5.jar.asc
101+
$ gpg java-client-api-3.0.8.jar.asc
93102

94103

95104
### Building and Contributing

‎pom.xml

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.marklogic</groupId>
55
<artifactId>java-client-api</artifactId>
66
<packaging>jar</packaging>
7-
<version>3.0.7</version>
7+
<version>3.0.8</version>
88
<name>MarkLogic Java Client API</name>
99
<description>The official MarkLogic Java client API.</description>
1010
<url>https://github.com/marklogic/java-client-api</url>
@@ -46,6 +46,12 @@
4646
<url>file://${project.build.directory}/mvn-repo</url>
4747
</repository>
4848
</distributionManagement>
49+
<repositories>
50+
<repository>
51+
<id>jcenter</id>
52+
<url>http://jcenter.bintray.com </url>
53+
</repository>
54+
</repositories>
4955
<build>
5056
<plugins>
5157
<plugin>
@@ -217,44 +223,6 @@
217223
</plugins>
218224
</build>
219225
<dependencies>
220-
<!-- direct build / run dependencies -->
221-
<!--
222-
<dependency>
223-
<groupId>com.sun.jersey</groupId>
224-
<artifactId>jersey-client</artifactId>
225-
<version>1.17</version>
226-
</dependency>
227-
<dependency>
228-
<groupId>com.sun.jersey.contribs</groupId>
229-
<artifactId>jersey-apache-client4</artifactId>
230-
<version>1.17</version>
231-
</dependency>
232-
<dependency>
233-
<groupId>com.sun.jersey.contribs</groupId>
234-
<artifactId>jersey-multipart</artifactId>
235-
<version>1.17</version>
236-
</dependency>
237-
<dependency>
238-
<groupId>org.glassfish.jersey.media</groupId>
239-
<artifactId>jersey-media-multipart</artifactId>
240-
<version>2.12</version>
241-
</dependency>
242-
-->
243-
<dependency>
244-
<groupId>com.sun.jersey</groupId>
245-
<artifactId>jersey-client</artifactId>
246-
<version>1.17</version>
247-
</dependency>
248-
<dependency>
249-
<groupId>com.sun.jersey.contribs</groupId>
250-
<artifactId>jersey-apache-client4</artifactId>
251-
<version>1.17</version>
252-
</dependency>
253-
<dependency>
254-
<groupId>com.sun.jersey.contribs</groupId>
255-
<artifactId>jersey-multipart</artifactId>
256-
<version>1.17</version>
257-
</dependency>
258226
<dependency>
259227
<groupId>ch.qos.logback</groupId>
260228
<artifactId>logback-classic</artifactId>
@@ -270,16 +238,6 @@
270238
<artifactId>commons-codec</artifactId>
271239
<version>1.7</version>
272240
</dependency>
273-
<dependency>
274-
<groupId>com.sun.jersey</groupId>
275-
<artifactId>jersey-core</artifactId>
276-
<version>1.17</version>
277-
</dependency>
278-
<dependency>
279-
<groupId>org.jvnet.mimepull</groupId>
280-
<artifactId>mimepull</artifactId>
281-
<version>1.9.4</version>
282-
</dependency>
283241
<dependency>
284242
<groupId>org.slf4j</groupId>
285243
<artifactId>slf4j-api</artifactId>
@@ -300,19 +258,56 @@
300258
<artifactId>jackson-databind</artifactId>
301259
<version>2.8.3</version>
302260
</dependency>
261+
<dependency>
262+
<groupId>com.squareup.okhttp3</groupId>
263+
<artifactId>okhttp</artifactId>
264+
<version>3.8.1</version>
265+
</dependency>
266+
<dependency>
267+
<groupId>com.squareup.okhttp3</groupId>
268+
<artifactId>logging-interceptor</artifactId>
269+
<version>3.8.1</version>
270+
</dependency>
271+
<dependency>
272+
<groupId>com.burgstaller</groupId>
273+
<artifactId>okhttp-digest</artifactId>
274+
<version>1.14</version>
275+
</dependency>
276+
<dependency>
277+
<groupId>com.sun.mail</groupId>
278+
<artifactId>javax.mail</artifactId>
279+
<version>1.5.6</version>
280+
</dependency>
281+
<dependency>
282+
<groupId>javax.ws.rs</groupId>
283+
<artifactId>javax.ws.rs-api</artifactId>
284+
<version>2.0.1</version>
285+
</dependency>
303286
<!-- test dependencies -->
304287
<dependency>
305288
<groupId>junit</groupId>
306289
<artifactId>junit</artifactId>
307290
<version>4.11</version>
308291
<scope>test</scope>
309292
</dependency>
293+
<dependency>
294+
<groupId>org.mockito</groupId>
295+
<artifactId>mockito-all</artifactId>
296+
<version>1.10.19</version>
297+
<scope>test</scope>
298+
</dependency>
310299
<dependency>
311300
<groupId>xmlunit</groupId>
312301
<artifactId>xmlunit</artifactId>
313302
<version>1.3</version>
314303
<scope>test</scope>
315304
</dependency>
305+
<dependency>
306+
<groupId>org.apache.httpcomponents</groupId>
307+
<artifactId>httpclient</artifactId>
308+
<version>4.5.3</version>
309+
<scope>provided</scope>
310+
</dependency>
316311
<!-- example dependencies -->
317312
<dependency>
318313
<groupId>org.jdom</groupId>

0 commit comments

Comments
 (0)