From: gmungoc Date: Mon, 15 Apr 2019 08:47:50 +0000 (+0100) Subject: Merge branch 'develop' into Jalview-JS/develop X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~162 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b3d9eaf8829a3aeb2bbc522315207a7940b0844e;hp=b21bf4b49df495a19483f38829e1a9c572907edf;p=jalview.git Merge branch 'develop' into Jalview-JS/develop --- diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java index b605232..bf151bf 100644 --- a/src/jalview/ext/ensembl/EnsemblRestClient.java +++ b/src/jalview/ext/ensembl/EnsemblRestClient.java @@ -69,9 +69,9 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher * @see https://github.com/Ensembl/ensembl-rest/wiki/Change-log * @see http://rest.ensembl.org/info/rest?content-type=application/json */ - private static final String LATEST_ENSEMBLGENOMES_REST_VERSION = "9.0"; + private static final String LATEST_ENSEMBLGENOMES_REST_VERSION = "10.0"; - private static final String LATEST_ENSEMBL_REST_VERSION = "9.0"; + private static final String LATEST_ENSEMBL_REST_VERSION = "10.0"; private static final String REST_CHANGE_LOG = "https://github.com/Ensembl/ensembl-rest/wiki/Change-log"; diff --git a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java index 8296985..3b71823 100644 --- a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java +++ b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java @@ -42,7 +42,8 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl // domain properties default values: protected static final String DEFAULT_ENSEMBL_BASEURL = "https://rest.ensembl.org"; - protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = "https://rest.ensemblgenomes.org"; + // ensemblgenomes REST service merged to ensembl 9th April 2019 + protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = DEFAULT_ENSEMBL_BASEURL; /* * accepts ENSG/T/E/P with 11 digits