From: Ben Soares Date: Wed, 1 May 2019 13:37:45 +0000 (+0100) Subject: Merge branch 'task/JAL-3243_PDB_free_text_error' into develop X-Git-Tag: Release_2_11_0~15^2~9 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=87da7ae128def3366c3762cb6fe1d174a9743542;hp=9953369343e959212ab639e4bed2df1f3ec05643;p=jalview.git Merge branch 'task/JAL-3243_PDB_free_text_error' into develop Merging in JAL-3243 replacement .jar files for jersey and javax.ws.rs. --- diff --git a/j11lib/javax.ws.rs-api-2.1.1.jar b/j11lib/javax.ws.rs-api-2.1.1.jar deleted file mode 100644 index 3eabbf0..0000000 Binary files a/j11lib/javax.ws.rs-api-2.1.1.jar and /dev/null differ diff --git a/j11lib/jersey-client-1.19.1.jar b/j11lib/jersey-client-1.19.1.jar new file mode 100644 index 0000000..455a7f2 Binary files /dev/null and b/j11lib/jersey-client-1.19.1.jar differ diff --git a/j11lib/jersey-client-1.19.jar b/j11lib/jersey-client-1.19.jar deleted file mode 100644 index c9e0f56..0000000 Binary files a/j11lib/jersey-client-1.19.jar and /dev/null differ diff --git a/j11lib/jersey-core-1.19.1.jar b/j11lib/jersey-core-1.19.1.jar new file mode 100644 index 0000000..8e5185d Binary files /dev/null and b/j11lib/jersey-core-1.19.1.jar differ diff --git a/j11lib/jersey-core-1.19.jar b/j11lib/jersey-core-1.19.jar deleted file mode 100644 index 92feb63..0000000 Binary files a/j11lib/jersey-core-1.19.jar and /dev/null differ diff --git a/j11lib/jersey-json-1.19.jar b/j11lib/jersey-json-1.19.1.jar similarity index 54% rename from j11lib/jersey-json-1.19.jar rename to j11lib/jersey-json-1.19.1.jar index b609411..2cbf79e 100644 Binary files a/j11lib/jersey-json-1.19.jar and b/j11lib/jersey-json-1.19.1.jar differ diff --git a/j11lib/jsr311-api-1.1.1.jar b/j11lib/jsr311-api-1.1.1.jar new file mode 100644 index 0000000..ec8bc81 Binary files /dev/null and b/j11lib/jsr311-api-1.1.1.jar differ