Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates unirest and removes org.json dependency #5511

Merged
merged 35 commits into from
Oct 28, 2019
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cd8a19d
Changed performSearch to default implementation
Oct 22, 2019
bbe2618
Added new ADS fetcher
Oct 22, 2019
167a617
Added new ADS fetcher
Oct 23, 2019
7279e1b
Added new ADS fetcher
Oct 23, 2019
329d1dd
added cleanup
Oct 23, 2019
605519d
support doi and ads bibcodes
Oct 23, 2019
cba7829
fixes wrong search syntax
Oct 23, 2019
bd6d845
fixed test cases to API response
Oct 23, 2019
27243ed
fixed bug where equals doesnt work with unknown field
Oct 23, 2019
8910676
changed array method parameters to Collections
Oct 24, 2019
b811c0b
removes json module dependency
Oct 24, 2019
638dd94
replace old fetcher with the new one
Oct 24, 2019
c9f46df
replace old fetcher with the new one
Oct 24, 2019
9319bb1
added Javadoc
Oct 24, 2019
6e81ed0
Add token
tobiasdiez Oct 24, 2019
c26612f
updated unirest version and removes org.json dependency
Oct 24, 2019
d5764fb
updated unirest version and removes org.json dependency
Oct 25, 2019
f4b164d
updated unirest version and removes org.json dependency
Oct 25, 2019
5405c53
Changed performSearch to default implementation
Oct 22, 2019
9d5b0b7
Added new ADS fetcher
Oct 22, 2019
0db18f9
Added new ADS fetcher
Oct 23, 2019
c82c4ff
Added new ADS fetcher
Oct 23, 2019
8435c6c
added cleanup
Oct 23, 2019
339df67
support doi and ads bibcodes
Oct 23, 2019
b6a8fea
fixes wrong search syntax
Oct 23, 2019
d2edeed
fixed test cases to API response
Oct 23, 2019
bbcac7b
fixed bug where equals doesnt work with unknown field
Oct 23, 2019
3871673
changed array method parameters to Collections
Oct 24, 2019
1298d0f
removes json module dependency
Oct 24, 2019
50be88b
replace old fetcher with the new one
Oct 24, 2019
972b025
replace old fetcher with the new one
Oct 24, 2019
6a94854
updated unirest version and removes org.json dependency
Oct 24, 2019
eecbb0e
updated unirest version and removes org.json dependency
Oct 25, 2019
0d9fa0a
updated unirest version and removes org.json dependency
Oct 25, 2019
ae9680c
Merge remote-tracking branch 'origin/fixjson' into fixjson
Oct 28, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- We added an option to show the preview as an extra tab in the entry editor (instead of in a split view). [#5244](https://github.com/JabRef/jabref/issues/5244)
- A custom Open/LibreOffice jstyle file now requires a layout line for the entry type `default` [#5452](https://github.com/JabRef/jabref/issues/5452)
- The entry editor is now open by default when JabRef starts up. [#5460](https://github.com/JabRef/jabref/issues/5460)
- We add a new ADS fetcher to use the new ADS API [#4949](https://github.com/JabRef/jabref/issues/4949)

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ dependencies {
compile 'org.controlsfx:controlsfx:11.0.0'

compile 'org.jsoup:jsoup:1.12.1'
compile 'com.mashape.unirest:unirest-java:1.4.9'
compile ('com.konghq:unirest-java:3.1.03')
JoHaHu marked this conversation as resolved.
Show resolved Hide resolved

compile 'org.slf4j:slf4j-api:2.0.0-alpha1'
compile group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT'
Expand Down
4 changes: 2 additions & 2 deletions external-libraries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Project: pgjdbc-ng
URL: http://impossibl.github.io/pgjdbc-ng
License: BSD-3-Clause

Id: com.mashape.unirest
Id: com.konghq.unirest
Project: Unirest for Java
URL: https://github.com/Mashape/unirest-java
URL: https://github.com/Kong/unirest-java
License: MIT

Id: com.microsoft.azure:applicationinsights-core
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
requires org.apache.pdfbox;
requires reactfx;
requires commons.cli;
requires httpclient;
requires com.github.tomtung.latex2unicode;
requires jbibtex;
requires citeproc.java;
Expand All @@ -65,4 +64,6 @@
requires de.saxsys.mvvmfx.validation;
requires richtextfx;
requires unirest.java;
requires org.apache.httpcomponents.httpclient;
requires org.jsoup;
}
7 changes: 2 additions & 5 deletions src/main/java/org/jabref/Globals.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.jabref;

import java.awt.GraphicsEnvironment;
import java.io.IOException;
import java.util.Optional;
import java.util.UUID;

Expand All @@ -26,11 +25,11 @@
import org.jabref.preferences.JabRefPreferences;

import com.google.common.base.StandardSystemProperty;
import com.mashape.unirest.http.Unirest;
import com.microsoft.applicationinsights.TelemetryClient;
import com.microsoft.applicationinsights.TelemetryConfiguration;
import com.microsoft.applicationinsights.internal.shutdown.SDKShutdownActivity;
import com.microsoft.applicationinsights.telemetry.SessionState;
import kong.unirest.Unirest;

public class Globals {

Expand Down Expand Up @@ -129,9 +128,7 @@ public static void shutdownThreadPools() {

public static void stopBackgroundTasks() {
stopTelemetryClient();
try {
Unirest.shutdown();
} catch (IOException ignore) { }
Unirest.shutDown();
}

public static Optional<TelemetryClient> getTelemetryClient() {
Expand Down
Loading