From 10dc16b88ed77274f7a4c41dea416912978d582f Mon Sep 17 00:00:00 2001 From: Doug Palmer Date: Wed, 23 Sep 2020 08:20:39 +1000 Subject: [PATCH 1/6] Fix link to travis --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c30ec78..aeee88a 100644 --- 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`: From bd3b96a6fb9d1c4674168fe06020a0faebdbb74a Mon Sep 17 00:00:00 2001 From: Qifeng Date: Thu, 8 Oct 2020 17:25:46 +1100 Subject: [PATCH 2/6] fix resource test --- .../ala-sensitive-data-client.iml | 38 ++++++++++++++++++- .../resources/ConservationResourceTest.java | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ala-sensitive-data-client/ala-sensitive-data-client.iml b/ala-sensitive-data-client/ala-sensitive-data-client.iml index 78b2cc5..bb663fe 100644 --- a/ala-sensitive-data-client/ala-sensitive-data-client.iml +++ b/ala-sensitive-data-client/ala-sensitive-data-client.iml @@ -1,2 +1,38 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java b/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java index 8cb99bc..a466a88 100644 --- a/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java +++ b/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java @@ -95,7 +95,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", taxon.getTaxonId()); assertNotNull(taxon.getInstances()); assertEquals(1, taxon.getInstances().size()); SensitivityInstance instance = taxon.getInstances().get(0); From f27cf43a82b9eed0d6851e17a8a2cf762e6e9376 Mon Sep 17 00:00:00 2001 From: Qifeng Date: Thu, 8 Oct 2020 17:40:02 +1100 Subject: [PATCH 3/6] remove https on test --- .../au/org/ala/sds/ws/resources/ConservationResourceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java b/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java index a466a88..e0ee16a 100644 --- a/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java +++ b/ala-sensitive-data-server/src/test/java/au/org/ala/sds/ws/resources/ConservationResourceTest.java @@ -95,7 +95,7 @@ public void testProcess1() throws Exception { SensitiveTaxon taxon = vr.getTaxon(); assertNotNull(taxon); assertEquals("Eucalyptus sparsa", taxon.getScientificName()); - assertEquals("http://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); From 1e5b029345b2fbc593d0ebf1559c4811d9637e95 Mon Sep 17 00:00:00 2001 From: Peter Ansell Date: Fri, 9 Oct 2020 11:59:01 +1100 Subject: [PATCH 4/6] Use openjdk8 for travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d72024..349cdad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ -dist: trusty sudo: required language: java jdk: -- oraclejdk8 +- openjdk8 branches: only: - master From 59dfc6636d1f54d26c5f492f97424151d652c501 Mon Sep 17 00:00:00 2001 From: Peter Ansell Date: Fri, 9 Oct 2020 12:26:21 +1100 Subject: [PATCH 5/6] Use unique travis secrets for this repository --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 349cdad..5175859 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,5 +23,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=" From 0ad8c6692d778e7c9284ad417a8bba3d48bf66de Mon Sep 17 00:00:00 2001 From: pal155 Date: Mon, 30 Nov 2020 11:02:06 +1100 Subject: [PATCH 6/6] Travis deploy passwords --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d72024..026c9b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: qhW/upWDYH/QjOvSLE6rp9wfnGQwgBIt3IXLLRRREbtMJiBdn9eNpzgsTc+z9yljDd1de5gtfM7D1yCk1eaXqXF9E+HzuE45YFDfE5ifKwNOU9I+8b6KC9QMMUeI7mxK1mCRtlTY36G08tS5djFkKBx/m7PbTtd9PAyfqUt261OzxYx9eTW8qLI+W47p4w6t6d9kjxXuRarDN6ESTNAcWvW7b7SZ1qiH3yKedBIL+FMJ8ms4U9RhHKosPv8bLUUgvtcTbZLJ7nqqM8+9zeHQO1Otp4D+j26FFvxpNq0LGBPLpBc3M/kVqNxc52G7kFYUmb3Y0I6uW+aj50tvI6Qr5JU9g920NiLNJ84VbdJKVJsFdC8flz9W9G0y5OLCMnobJTCw7woFYLZ/mFyopMl/zrc+YI0Dd3MRw5ePlkPMrQgj6vDsqdHOgrayD5b3AUo6p59wtNYuVfcgmOfxy+MwZlvcO6S0OMfav6HuFW40yc5LrbVvnvNobm0eVcTY9JNAkCl2w+9CJR5gKw4s24+V4HbZZdTjpm9CyEHjb94gA4/0/SB9B4aukC5mdJqRotPS1N9ZEDzlJ6dMtyrVcIizznIayqScNvQqSKQXmfPxhcIo8l/nfUoKz0xgp9jzxlq5ywGdCyn4ihqHOra0vz0ssoYMWY6mxvtUHHpGW4HMwsM= + - secure: cWJbEG7V9D9fQ+rAq6UFpf0ItF4WDUvAwq5+BJjUNUcK7G+cUz1xa9nZCJe588NusUwngHubL4bID54CQGdyABYhdEasXu24GfCa4EHeOSEZw3nwSCkkxbKPkedgTwtas83wqj8PvKKglSXo+C3YwwcuSDJj6g7vtvJJYa0lTPJ9BqsIU07JecR33i974LYmZWW+zpiw7OZzlev8U+mIRMWu2LSjexZ41jYu50Qazo4UkNCaCx3QQ+2YJMPGg0aAXD0FZjWyXhDp5ZlOQG4Nc/oXAZrhegv+NPNIS6XkvNxgWkpcQGhb5Tvv8vg3MIiHVkTsROV6o2ZUjdadOE++dSlcB9k8mhgQOJ2yc1q5MTiuVzm4zWXe/dpcnU8UNHMhjHtbLfynzPN2g/cPreZUOSIQCXG2Vra56B6UFxgPxgM7OGPYILMIswSPgKaAS3CBNjfELksiex+d7qDyEPRzcJYfAPS3NXShRybE9shzLeHRwwNjrHU2KAgRv3b/esELTWqGOZQFqOtC7HbJwRyRXbfvJSPCYIU2GHVjQQeSEcrRuJjsZNgYYJ02b0O9PnrXQMN80amnzmffc3MxB7ICpnxJkHsfzlXJ3GoLgcjT40QMwSqK+NrSMfarSV4V/t/S0bMudE3Jgt2UEzkW30MlYsO+gxOW3wEiZMFlt+PBn6c=