diff --git a/Dockerfile b/Dockerfile index 70a507a3596ae16bdfdc22b8ec5e91be70bae9a2..f8fb4c543c7c935334edaac614a5629d0a3b5470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,7 @@ ARG FROM_IMAGE=usgs/amazoncorretto:11 FROM ${BUILD_IMAGE} as builder -# TODO: Token needed until nshmp-lib is public -ARG GITLAB_TOKEN=null -ARG CI_JOB_TOKEN=null +# For GitLab CI/CD ARG CI_PROJECT_URL=null ARG CI_COMMIT_BRANCH=null diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle index 09519817c26f8f1bd4eb5bd436c8862ca8659094..27f42af58505e5d8e31738e3bfd8c0f485b94961 100644 --- a/gradle/repositories.gradle +++ b/gradle/repositories.gradle @@ -7,23 +7,7 @@ repositories { } maven { - url "https://code.usgs.gov/api/v4/groups/160/-/packages/maven" - name "GitLab" - if (System.getenv("CI_JOB_TOKEN") && System.getenv("CI_JOB_TOKEN") != "null") { - credentials(HttpHeaderCredentials) { - name = "Job-Token" - value = System.getenv("CI_JOB_TOKEN") - } - } else if (System.getenv("GITLAB_TOKEN") && System.getenv("GITLAB_TOKEN") != "null") { - credentials(HttpHeaderCredentials) { - name = "Private-Token" - value = System.getenv("GITLAB_TOKEN") - } - } else { - throw new GradleException("CI_JOB_TOKEN or GITLAB_TOKEN environmental variable must be set") - } - authentication { - header(HttpHeaderAuthentication) - } + url "https://code.usgs.gov/api/v4/groups/1352/-/packages/maven" + name "NSHMP GitLab Group" } }