From ccdad96eb9981991276cede94bb09d2b1f07f623 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 4 Dec 2021 15:07:01 +1000 Subject: [PATCH 1/4] add dependabot and update some github actions Signed-off-by: Olivier Lamy --- .github/dependabot.yml | 41 +++++++++++++++++++++++++ .github/workflows/maven-windows-it1.yml | 4 ++- .github/workflows/maven-windows-it2.yml | 4 ++- .github/workflows/maven.yml | 7 +++-- 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..f7ebebbc2a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,41 @@ +# +# 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. +# +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + time: '04:00' + ignore: + # ignore Java 8+ dependencies + - dependency-name: org.mockito:mockito-core + versions: + - ">= 3.0" + - dependency-name: org.apache.commons:commons-lang3 + versions: + - ">= 3.9" + - dependency-name: commons-io:commons-io + versions: + - ">= 2.7" + # Ignore Maven 3.2.1+ + - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-tools + versions: + - ">=3.2.0" \ No newline at end of file diff --git a/.github/workflows/maven-windows-it1.yml b/.github/workflows/maven-windows-it1.yml index 1fac3d0f36..f156254de5 100644 --- a/.github/workflows/maven-windows-it1.yml +++ b/.github/workflows/maven-windows-it1.yml @@ -39,9 +39,11 @@ jobs: uses: actions/checkout@v1 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2.4.0 with: + distribution: 'temurin' java-version: 1.8 + cache: 'maven' - name: Build with Maven run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its "-Dit.test=**/jiras/*IT*.java,TestMethodPatternIT,TestMultipleMethodPatternsIT,TestMultipleMethodPatternsTestNGIT" diff --git a/.github/workflows/maven-windows-it2.yml b/.github/workflows/maven-windows-it2.yml index 7faa862703..d6c4c2aa61 100644 --- a/.github/workflows/maven-windows-it2.yml +++ b/.github/workflows/maven-windows-it2.yml @@ -39,9 +39,11 @@ jobs: uses: actions/checkout@v1 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2.4.0 with: + distribution: 'temurin' java-version: 1.8 + cache: 'maven' - name: Build with Maven with Install run: mvn clean install -e -B -V -nsu --no-transfer-progress -DskipTests diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cc385131cd..19419ecadf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,7 +31,8 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - java: [8, 11, 15] + java: [8, 11, 17] + jdk: [temurin, zulu] fail-fast: false runs-on: ${{ matrix.os }} @@ -42,9 +43,11 @@ jobs: uses: actions/checkout@v1 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2.4.0 with: + distribution: ${{ matrix.jdk }} java-version: ${{ matrix.java }} + cache: 'maven' - name: Build with Maven run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its -Dfailsafe-integration-test-port=8083 From 7279d4bbcc49a2a31d034633c93dc4b749389c77 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 4 Dec 2021 15:10:08 +1000 Subject: [PATCH 2/4] remove dependabot branches Signed-off-by: Olivier Lamy --- .github/workflows/maven-windows-it1.yml | 7 +++---- .github/workflows/maven-windows-it2.yml | 6 ++---- .github/workflows/maven.yml | 7 +++---- .github/workflows/smoketest.yml | 10 +++++----- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/maven-windows-it1.yml b/.github/workflows/maven-windows-it1.yml index f156254de5..4d2877adff 100644 --- a/.github/workflows/maven-windows-it1.yml +++ b/.github/workflows/maven-windows-it1.yml @@ -19,11 +19,10 @@ name: GitHub CI for Windows 1 on: push: - branches: - - '**' + branches-ignore: + - dependabot/** pull_request: - branches: - - '**' + jobs: build: diff --git a/.github/workflows/maven-windows-it2.yml b/.github/workflows/maven-windows-it2.yml index d6c4c2aa61..f52a09d1f0 100644 --- a/.github/workflows/maven-windows-it2.yml +++ b/.github/workflows/maven-windows-it2.yml @@ -19,11 +19,9 @@ name: GitHub CI for Windows 2 on: push: - branches: - - '**' + branches-ignore: + - dependabot/** pull_request: - branches: - - '**' jobs: build: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 19419ecadf..f31d5382fb 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,11 +19,10 @@ name: GitHub CI for *Nix on: push: - branches: - - '**' + branches-ignore: + - dependabot/** pull_request: - branches: - - '**' + jobs: build: diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml index e8a40b7cbf..07b52b33e9 100644 --- a/.github/workflows/smoketest.yml +++ b/.github/workflows/smoketest.yml @@ -19,11 +19,9 @@ name: Unit Tests on: push: - branches: - - '**' + branches-ignore: + - dependabot/** pull_request: - branches: - - '**' jobs: build: @@ -38,7 +36,9 @@ jobs: - name: Set up JDK 16 uses: actions/setup-java@v1 with: - java-version: 16 + distribution: 'temurin' + java-version: 17 + cache: 'maven' - name: Build with Maven run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its -DskipITs From 53448a6617dc427d1add137d9c1917ccb37524e4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 4 Dec 2021 15:11:17 +1000 Subject: [PATCH 3/4] fix java version Signed-off-by: Olivier Lamy --- .github/workflows/maven-windows-it1.yml | 2 +- .github/workflows/maven-windows-it2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-windows-it1.yml b/.github/workflows/maven-windows-it1.yml index 4d2877adff..d801ea21d9 100644 --- a/.github/workflows/maven-windows-it1.yml +++ b/.github/workflows/maven-windows-it1.yml @@ -41,7 +41,7 @@ jobs: uses: actions/setup-java@v2.4.0 with: distribution: 'temurin' - java-version: 1.8 + java-version: 8 cache: 'maven' - name: Build with Maven diff --git a/.github/workflows/maven-windows-it2.yml b/.github/workflows/maven-windows-it2.yml index f52a09d1f0..3056c9abda 100644 --- a/.github/workflows/maven-windows-it2.yml +++ b/.github/workflows/maven-windows-it2.yml @@ -40,7 +40,7 @@ jobs: uses: actions/setup-java@v2.4.0 with: distribution: 'temurin' - java-version: 1.8 + java-version: 8 cache: 'maven' - name: Build with Maven with Install From a25ba1b294f1ce8dad29d275dc6fc5c75b41f7d2 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 4 Dec 2021 15:26:25 +1000 Subject: [PATCH 4/4] fix version Signed-off-by: Olivier Lamy --- .github/workflows/smoketest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml index 07b52b33e9..faae99f410 100644 --- a/.github/workflows/smoketest.yml +++ b/.github/workflows/smoketest.yml @@ -33,8 +33,8 @@ jobs: - name: Checkout uses: actions/checkout@v1 - - name: Set up JDK 16 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v2.4.0 with: distribution: 'temurin' java-version: 17