From 962be3596c45fff42337bd37d4629bae2dc24936 Mon Sep 17 00:00:00 2001 From: TheSnoozer Date: Thu, 11 May 2023 21:11:11 +0200 Subject: [PATCH 1/6] https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/615: declare these Maven artifacts in provided scope --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 4e664cca..7d1beb72 100644 --- a/pom.xml +++ b/pom.xml @@ -239,11 +239,13 @@ org.apache.maven maven-plugin-api ${maven-plugin-api.version} + provided org.apache.maven maven-core ${maven-plugin-api.version} + provided From 32d507d44a92ca84c7d166067bb09677ea66db3a Mon Sep 17 00:00:00 2001 From: TheSnoozer Date: Tue, 23 May 2023 23:28:08 +0200 Subject: [PATCH 2/6] update tests --- .github/workflows/default-tests.yml | 40 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml index d2d53b8e..aa3caaea 100644 --- a/.github/workflows/default-tests.yml +++ b/.github/workflows/default-tests.yml @@ -7,15 +7,15 @@ jobs: name: Run checkstyle runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 java-package: jdk - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -34,19 +34,25 @@ jobs: include: - java_version: '16' java_allow_illegal_access: true - - java_version: '17-ea' + - java_version: '17' + java_allow_illegal_access: true + - java_version: '18' + java_allow_illegal_access: true + - java_version: '19' + java_allow_illegal_access: true + - java_version: '20' java_allow_illegal_access: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java_version }} java-package: jdk - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -65,12 +71,12 @@ jobs: strategy: matrix: java_version: ['11'] - maven_version: ['3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.1'] + maven_version: ['3.1.0-alpha-1', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-5'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java_version }} @@ -93,7 +99,7 @@ jobs: - name: Setup System Path to use the custom Maven run: echo "${M2_HOME}/bin" >> $GITHUB_PATH - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 # Include Maven version in key to not use cache from other Maven versions @@ -117,16 +123,16 @@ jobs: if: ${{ github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master') }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: git checkout "${GITHUB_REF:11}" - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 java-package: jdk - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -141,15 +147,15 @@ jobs: if: ${{ github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/') && github.ref == 'refs/heads/master' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 java-package: jdk - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 1799f28931f4d66ea00a22cffcad078f428cbbeb Mon Sep 17 00:00:00 2001 From: TheSnoozer Date: Tue, 23 May 2023 23:32:36 +0200 Subject: [PATCH 3/6] update mockito.version from 3.11-0 to 5.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d1beb72..43365750 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 3.6.0 4.13.2 - 3.11.0 + 5.1.1 3.19.0 From 5c61029462a6cc7364f8ca0399f2662ece853b30 Mon Sep 17 00:00:00 2001 From: TheSnoozer Date: Wed, 24 May 2023 19:10:02 +0200 Subject: [PATCH 4/6] [maven-release-plugin] prepare release v5.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 43365750..b728bee1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.github.git-commit-id git-commit-id-maven-plugin maven-plugin - 5.0.1-SNAPSHOT + 5.0.1 Git Commit Id Maven Plugin https://github.com/git-commit-id/git-commit-id-maven-plugin @@ -35,7 +35,7 @@ git@github.com:git-commit-id/git-commit-id-maven-plugin.git scm:git@github.com:git-commit-id/git-commit-id-maven-plugin scm:git:git@github.com:git-commit-id/git-commit-id-maven-plugin.git - HEAD + v5.0.1 From 5785a81b85675a2c0b76983fbc9cd08bac940d16 Mon Sep 17 00:00:00 2001 From: TheSnoozer Date: Wed, 24 May 2023 19:10:07 +0200 Subject: [PATCH 5/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b728bee1..ac9ccea5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.github.git-commit-id git-commit-id-maven-plugin maven-plugin - 5.0.1 + 5.0.2-SNAPSHOT Git Commit Id Maven Plugin https://github.com/git-commit-id/git-commit-id-maven-plugin @@ -35,7 +35,7 @@ git@github.com:git-commit-id/git-commit-id-maven-plugin.git scm:git@github.com:git-commit-id/git-commit-id-maven-plugin scm:git:git@github.com:git-commit-id/git-commit-id-maven-plugin.git - v5.0.1 + HEAD From 56757c14ea63bb2567db2f1a67b788dd276d36a7 Mon Sep 17 00:00:00 2001 From: TheSnoozer <6849390+TheSnoozer@users.noreply.github.com> Date: Sun, 2 Jul 2023 09:10:55 +0200 Subject: [PATCH 6/6] Run tests with mvn 4.0.0-alpha-7 --- .github/workflows/default-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml index aa3caaea..6beb2ec5 100644 --- a/.github/workflows/default-tests.yml +++ b/.github/workflows/default-tests.yml @@ -71,7 +71,7 @@ jobs: strategy: matrix: java_version: ['11'] - maven_version: ['3.1.0-alpha-1', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-5'] + maven_version: ['3.1.0-alpha-1', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-7'] steps: - uses: actions/checkout@v3