From 944feaeaced6b921d53ef8c3a4a24d8cc168ad94 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 22 Sep 2021 10:13:51 +1000 Subject: [PATCH 1/5] add some ghaction, dependabot and release drafter Signed-off-by: Olivier Lamy --- .github/dependabot.yml | 10 ++++++ .github/release-drafter.yml | 2 ++ .github/workflows/maven.yml | 45 +++++++++++++++++++++++++++ .github/workflows/release-drafter.yml | 12 +++++++ 4 files changed, 69 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/release-drafter.yml create mode 100644 .github/workflows/maven.yml create mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b76b895 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..8ae0341 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,2 @@ +_extends: .github +tag-template: plexus-interactivity-$NEXT_MINOR_VERSION diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..b603058 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +name: GitHub CI + +on: [push, pull_request] + +jobs: + build: + + strategy: + matrix: + os: [ubuntu-latest,windows-latest, macOS-latest] + java: [8, 11, 17] + jdk: [adopt-hotspot, zulu, adopt-openj9] + fail-fast: false + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v2.1.0 + with: + cache: 'maven' + distribution: ${{ matrix.jdk }} + java-version: ${{ matrix.java }} + + - name: Build with Maven + run: mvn install javadoc:javadoc -e -B -V diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 0000000..4e2af99 --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,12 @@ +name: Release Drafter +on: + push: + branches: + - master +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + - uses: release-drafter/release-drafter@v5.15.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f3ef29475a134fb747c37983a865afa170860bf3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 22 Sep 2021 10:15:44 +1000 Subject: [PATCH 2/5] add temurin jdk Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b603058..3f85175 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,7 +26,7 @@ jobs: matrix: os: [ubuntu-latest,windows-latest, macOS-latest] java: [8, 11, 17] - jdk: [adopt-hotspot, zulu, adopt-openj9] + jdk: [adopt-hotspot, zulu, adopt-openj9, temurin] fail-fast: false runs-on: ${{ matrix.os }} From 10ce8ad9c72d32c896d37706e62d1d0b8ea46658 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 22 Sep 2021 18:17:39 +1000 Subject: [PATCH 3/5] fix javadoc Signed-off-by: Olivier Lamy --- .../plexus/components/interactivity/InputHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java index ca0ea24..3711273 100644 --- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java +++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java @@ -30,9 +30,9 @@ /** * Manage user input from different sources. * - * @todo should this also echo any prompts before the input? - * @todo should this validate the input, reprompt if required? - * @todo readBoolean, readInt, readSingleChar - readLine's that parse the input + * TODO should this also echo any prompts before the input? + * TODO should this validate the input, reprompt if required? + * TODO readBoolean, readInt, readSingleChar - readLine's that parse the input * @author Brett Porter * @version $Id$ */ From 0aa67c695769a34d825a0f3200331319f8b4b9d4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 22 Sep 2021 18:19:25 +1000 Subject: [PATCH 4/5] fix setup-java version Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3f85175..db8ed03 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up JDK - uses: actions/setup-java@v2.1.0 + uses: actions/setup-java@v2.3.0 with: cache: 'maven' distribution: ${{ matrix.jdk }} From fa7055acfbbd1cecf9ec67ae31fc228319adefe4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 22 Sep 2021 18:23:52 +1000 Subject: [PATCH 5/5] no need of adopt-openj9 Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index db8ed03..962d81c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,7 +26,7 @@ jobs: matrix: os: [ubuntu-latest,windows-latest, macOS-latest] java: [8, 11, 17] - jdk: [adopt-hotspot, zulu, adopt-openj9, temurin] + jdk: [adopt-hotspot, zulu, temurin] fail-fast: false runs-on: ${{ matrix.os }}