From d02198036da30b63c8187fb25de4324c30c7db43 Mon Sep 17 00:00:00 2001 From: "Kevin S. Clarke" Date: Tue, 9 Feb 2021 16:36:04 -0500 Subject: [PATCH] [IIIF-1098] Update JDK version, README (#105) * Update JDK version, README * Remove PR auto-approve action --- .github/workflows/pr-auto-approve.yml | 21 --------------------- README.md | 2 +- pom.xml | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/pr-auto-approve.yml diff --git a/.github/workflows/pr-auto-approve.yml b/.github/workflows/pr-auto-approve.yml deleted file mode 100644 index 32f0283..0000000 --- a/.github/workflows/pr-auto-approve.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: PR Auto-Approver - -# Auto-approve on projects that have a "secret" variable saying this is okay. This lets us set up a restricted PR -# process on projects with just a single active developer. It prevents the developer from pushing directly to the -# main branch (so enforces a particular workflow that our other GitHub Actions expect). -on: - pull_request: - branches: - - main - -jobs: - approve-pr: - name: PR Auto-Approver - runs-on: ubuntu-latest - env: - AUTO_PR_APPROVAL: ${{ secrets.AUTO_PR_APPROVAL }} - steps: - - uses: hmarr/auto-approve-action@7782c7e2bdf62b4d79bdcded8332808fd2f179cd # v2.0.0 - if: env.AUTO_PR_APPROVAL == 'true' - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/README.md b/README.md index 46c2575..b217e5c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## A Docker image for the Cantaloupe IIIF image server -[![Maven Build](https://github.com/ksclarke/freelib-build-tools/workflows/Maven%20Build/badge.svg)](https://github.com/UCLALibrary/docker-cantaloupe/actions) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/74e25a3c2515495aafb6b077fdde9a13)](https://www.codacy.com/gh/UCLALibrary/docker-cantaloupe?utm_source=github.com&utm_medium=referral&utm_content=UCLALibrary/docker-cantaloupe&utm_campaign=Badge_Grade) [![Known Vulnerabilities](https://snyk.io/test/github/uclalibrary/docker-cantaloupe/badge.svg)](https://snyk.io/test/github/uclalibrary/docker-cantaloupe) +[![Maven Build](https://github.com/uclalibrary/docker-cantaloupe/workflows/Maven%20Build/badge.svg)](https://github.com/UCLALibrary/docker-cantaloupe/actions) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/74e25a3c2515495aafb6b077fdde9a13)](https://www.codacy.com/gh/UCLALibrary/docker-cantaloupe?utm_source=github.com&utm_medium=referral&utm_content=UCLALibrary/docker-cantaloupe&utm_campaign=Badge_Grade) [![Known Vulnerabilities](https://snyk.io/test/github/uclalibrary/docker-cantaloupe/badge.svg)](https://snyk.io/test/github/uclalibrary/docker-cantaloupe) This project builds a Docker image for the [Cantaloupe IIIF image server](https://cantaloupe-project.github.io/cantaloupe). If you're interested in using a prebuilt image, you can find one on [UCLA Library's DockerHub account](https://hub.docker.com/repository/docker/uclalibrary/cantaloupe). diff --git a/pom.xml b/pom.xml index 4d9d3c5..2913e81 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 20.04 - 11.0.9.1+1-0ubuntu1~20.04 + 11.0.10+9-0ubuntu1~20.04 4:9.3.0-1ubuntu2 4.2.1-1.2 4.1.0+git191117-2build1