Merge pull request #5 from charvolant/develop

Travis deploy passwords
AtlasOfLivingAustralia · Nov 30, 2020 · d589cb0 · d589cb0
2 parents f52817c + 91785a8
commit d589cb0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ dist: trusty
 sudo: required
 language: java
 jdk:
-- oraclejdk8
+- openjdk8
 branches:
   only:
   - master
@@ -24,5 +24,5 @@ script:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && mvn -P travis clean install deploy || mvn -P travis clean install'
 env:
   global:
-  - secure: DHhZau8rR7tbHByl4I1A9ESVq+GjmyshEJzlfn573zlS5bTz94X/Xwn/8s7L4ZkT9HqTG/D/Hm9a7RaRJ6OqyFlTjw4q62JiKwHCDQp4GsLQ57JXhe5E2UWj8h8tObyv+mbeiWt/x0froG4xKkNaTBoPTcqbdVULF7xprbFRIwvy9E6IRlZT5zF+qNMpsxnmDJu9a+g1U6pwhXwn4+CIGi6G2dEkX6/DNPe1xKKA7ZmZ9wlR2o97PREZkXz/emuKy4V1RIMt4F28e2UHtyFbokjMnklmwQxvBF2e95vu2XGVWvjQoWg+1vVSyx09P/XiPeuYjZwJq9i4FuRAmo831p2KAK9NL+e/nR+TsqHWNE4wYbOYTxvYkcrCyyXm9sqUKEpKdqXmKTGjuL48ba4kVNADQvN4vapY5MUAh8hpAnI45fW2SqEj8xl5vBdMX1eE9jrR1JugWPZ7TGYMo/xsrztF8JpqEqV/oLUxad3F2idezZ9Ua26Huh2V0sUnhdhWyUoHpZsFYDTRfKTsQbcKjJtY49y+Ghu8yxsremJYdC94GKDKYsmPED5CQmPvHyG4C0NLOToZ8xbMKfIJXco6qZ0VzIvvlWEpUQ4kEP0RekG1clN7Ll32fOCI7rqhOYO94JvhJuzCR3nEgY8pEM16Ji4Tz/Q7+CQrIDSo7L4brzQ=
-  - secure: mHezyDR2h4MXyxj2IjYgezSrLkgIa3zgsmWlsHV28O2nVxIX1tbSWJ6jzYvNAtdonN8GHe9TCtz60SQCrTfZZ052jzAu3XrfR4VojL9iTnteLMfrzCzvSpmU/dbrlmgz6bhZmVbbZwH6CvutYaViaroXpKDHWbzWL/3eoWhnFIS+A8uXdyzShMFAZlU3zAxPVsQiC2pSxhQ99sFNdqnro22aCOoDEuaV6hUT6XXVqgPBgPVjdxIIT9/OwN1pzcOTA9UNoSFdRHCif/k+ICoKv59c9MfM3SAR1qeUydLeK/ITDS/FjE+z0+8rMSzHqTmnej6+x2/ZEYfKcmoRdxtGqn4s/TEJx1qXRnEAcnK9zfKhhJGU65/rV6BCEHad1L51I8YRxazeBWaxGm27ervA7pVkjOSh+sAyPSHeu7kqoCMwbvzN2BpCnzwfZQOm+/4DQrEzw5gqXVFDUnhRvekutlqsprZLe1oAcnALlMF20N++Gj2riq+7TIaa0v7C3sRpcr9fXPlNP30SzDO5lmV3hbWuMtOx3tSKoGfR6v9KCMZwLcIYxfS3m+/QHI56lMaV3LXI8nMd/5wHe6ZAIKIfgAe3wfIB+7C5N9ZUioqhigeAiqUElJIwx2TuRtwC9XB5gVgXGpCtBoXlKdVeu28nvylTu77R8Mjlf4TNFwSwe5s=
+  - secure: "BuIjgXY9lGlC1/WhW3Ic6+2V3ZgOU1aE1nEwcZ2FcJcroYMbOHgzhk7snsqTRekwmiRkqyBkvVVTeXp+j9Z2LuhMKN4A3S5LXCbC/7oOXZHvS/m03rV3qlkOTTPLG/wpTIBiBX35gG2EMpsv9RynJ95nRDH8qL2EdTPMhPa24UREcB3hB+47ecV9cU8jRduyjhm3rQDXUr9/t/bRQzwh3YK6ONlebSZSXecw4eCdlV0qjkOLEk9Lk6ZpPri94kscsqcfitnQ9Xr704PmarJEVhRerl5k/Lzx5feUWBGIegi9QWqmS+5i/LuxNq4kza8S3c+qEe3mfnaga9t6Y7EQClUV4VHPfA97fh6cPxyyI/tLn5mXe0RFyY7mYRzPgB4G/ZMfKjPt/flSKSsDjsywIGz1w7P+a4hsZrbg0ty+1rgYseUAI0+EhT8oQNAU6d6UHd/UHTZw624DdPbiC/C2EdTJyGuy2ibwhHWG09fWBcbI5ybaT20xypjITjBXgTUeXAQRZKwqz//qI99zFVyQOTlEU83XS6fmVW8zLek4mSKsEIzLJpflP1p6vMhRQjEtHaOBtTKfgJsHJ6aUCQ/X2LW4Rdrq9FtnZFqCCzBr3hmyNSaoIkdLwPC3lkv2kOuvYJ3o8X+NS95GZAW+yQhvUqZVFHOoaLhz6fJAZKzrl0E="
+  - secure: "OoBEvbLSyjpFTN7HZX0UlHSpK1yAkmbHwEzoYeL3W9WgnAVx3IoEY5DmKOsyCW/6Zm8TUcC0rrGH0uCbhpq6TcWg1Zo3AvcsWdr7QOgt1WEx1AFx9lhj4FT/fJ1QzHINV9cLnYIFEIxkN+Yb6saFjOytX7M1DvYwn8xrXBWPqh059tXLNMmnVdrMHmt+8wkKW5G8iXLINQK8Ylr/U0ytjfTJIZQrCZPXzsN8Xjq9dpZaRONKm9kiD9Yc4TOX9G0FiRPyOoZzuv7XNasn2DadOJZ2gLwjTsW6GxdU90/HxB75SaSLCDFofB8ZxgVEbfYtEzMsCyX1FzQSvCZvuqiJ/bjLLRlSJwRPd/HRxhT/5vwX+zAbJYMxT6sOm1q2BbAKQOfvutoe7/JWPQJ/hraSz9FEbBwef509OIUI98g67ecB5XsN0fhzVFnXko6MhFhziOKKCGc3EutLV2fxPUcG1B9AJcGLasZDE0CkltEXvP11WiO7SsJSeiy6uj3OMgvvwqwgU/0CAWT4Xs1g7oZztFdQoMYIHRT6qy7C2OHOk7BVzCxFlw+SkaG/03Vwc7YRcEXedmqbcL7Qtieilg29Pw9+3Rnm1zGxpKYBLozGa2QUZFSe2qrQZu9XZQlLeYaASRjsIGKvuWVEdfr/E0Eir8sCISwUqk2Qlb5qG0TOzUo="
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ALA Sensitive Data Service [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/ala-sensitive-data-service.svg?branch=master)](https://travis-ci.org/AtlasOfLivingAustralia/ala-namematching-service)
+# ALA Sensitive Data Service [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/ala-sensitive-data-service.svg?branch=master)](https://travis-ci.org/AtlasOfLivingAustralia/ala-sensitive-data-service)
 
 This priovides a set of web services for sensitive data evaluation, using the `sds` library.
 It consists of three components. all with maven groupId `au.org.ala.sds`:

diff --git a/...itive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java b/...itive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java
@@ -205,7 +205,7 @@ public void testProcess1() throws Exception {
         SensitiveTaxon taxon = vr.getTaxon();
         assertNotNull(taxon);
         assertEquals("Eucalyptus sparsa", taxon.getScientificName());
-        assertEquals("https://id.biodiversity.org.au/node/apni/2914499", taxon.getTaxonId());
+        assertEquals("http://id.biodiversity.org.au/node/apni/2914499".split("//")[1], taxon.getTaxonId().split("//")[1]);
         assertNotNull(taxon.getInstances());
         assertEquals(1, taxon.getInstances().size());
         SensitivityInstance instance = taxon.getInstances().get(0);