From: Jim Procter Date: Fri, 29 Sep 2017 07:20:59 +0000 (+0100) Subject: Merge branch 'feature/JAL-2745ebiHttps' into develop X-Git-Tag: Release_2_10_3b1~123 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=33c393158c7ca3be0ce3f19e822aabf46b271a1f;hp=d48933e9a1634c03efdfe56d3a2ff026d37dc061;p=jalview.git Merge branch 'feature/JAL-2745ebiHttps' into develop --- diff --git a/src/jalview/util/UrlConstants.java b/src/jalview/util/UrlConstants.java index 3347cc7..d6ece8d 100644 --- a/src/jalview/util/UrlConstants.java +++ b/src/jalview/util/UrlConstants.java @@ -55,7 +55,7 @@ public class UrlConstants * Default sequence URL link string for EMBL-EBI search */ public static final String DEFAULT_STRING = DEFAULT_LABEL - + "|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"; + + "|https://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"; /* * not instantiable diff --git a/src/jalview/ws/sifts/SiftsClient.java b/src/jalview/ws/sifts/SiftsClient.java index 68af7c3..6fe8597 100644 --- a/src/jalview/ws/sifts/SiftsClient.java +++ b/src/jalview/ws/sifts/SiftsClient.java @@ -102,7 +102,7 @@ public class SiftsClient implements SiftsClientI private static final String NOT_OBSERVED = "Not_Observed"; - private static final String SIFTS_FTP_BASE_URL = "http://ftp.ebi.ac.uk/pub/databases/msd/sifts/xml/"; + private static final String SIFTS_FTP_BASE_URL = "https://ftp.ebi.ac.uk/pub/databases/msd/sifts/xml/"; private final static String NEWLINE = System.lineSeparator();