Merge pull request #40 from s4u/mvn-3.8.6

Maven 3.8.6 as default

.github/workflows/auto-approve.yml

@@ -5,30 +5,6 @@ on:
 
 jobs:
   auto-approve:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Dependabot metadata
-        if: github.actor == 'dependabot[bot]'
-        id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.1.1
-        with:
-          github-token: "${{ secrets.TECH_TOKEN }}"
-
-      - name: Enable auto-merge for Dependabot PRs
-        if: >
-          github.actor == 'dependabot[bot]'
-          && steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major'
-        run: gh pr merge --auto --rebase "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{ secrets.TECH_TOKEN }}
-
-      - name: Approve a PR
-        if: >
-          github.actor == 'dependabot[bot]'
-          || github.actor == 'slawekjaranowski'
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{ secrets.TECH_TOKEN }}
+    uses: s4u/.github/.github/workflows/auto-approve.yml@master
+    secrets:
+      TECH_TOKEN: ${{ secrets.TECH_TOKEN }}

.github/workflows/release-drafter.yml

@@ -17,6 +17,6 @@ jobs:
       && !startsWith(github.event.head_commit.message , '[maven-release-plugin]')
 
     steps:
-      - uses: release-drafter/release-drafter@v5.15.0
+      - uses: release-drafter/release-drafter@v5.20.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -11,10 +11,6 @@ on:
   schedule:
     - cron: '22 23 * * 5'
 
-concurrency:
-  group: test-action
-  cancel-in-progress: true
-
 jobs:
   test:
     name: Test
@@ -22,14 +18,14 @@ jobs:
     strategy:
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ]
-        java: [ '8', '11', '16' ]
-        maven: [ '3.5.4', '3.6.3', '3.8.2' ]
+        java: [ '8', '11', '17' ]
+        maven: [ '3.5.4', '3.6.3', '3.8.6' ]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
 
       - uses: ./
         with:
@@ -40,3 +36,31 @@ jobs:
       - run: mvn -V validate -Drequire.java=${{ matrix.java }} -Drequire.maven=${{ matrix.maven }}
         shell: bash
 
+  test-deault:
+    name: Test with defaults
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ./
+        with:
+          java-version: 8
+
+      - run: mvn -V validate -Drequire.java=8 -Drequire.maven=3.8.6
+        shell: bash
+
+  test-ok:
+    name: Test OK
+    runs-on: ubuntu-latest
+    needs: [ test, test-deault ]
+    if: always()
+
+    steps:
+      - run: echo "needs.test.result=${{ needs.test.result }} needs.test-deault.result=${{ needs.test-deault.result }}"
+
+      - run: 'true'
+        if: needs.test.result == 'success' && needs.test-deault.result == 'success'
+
+      - run: 'false'
+        if: needs.test.result != 'success' || needs.test-deault.result != 'success'

README.md

@@ -1,31 +1,44 @@
-# Setup Maven with settings.xml
+# Setup Maven Action
 [![Test](https://github.com/s4u/setup-maven-action/actions/workflows/test.yml/badge.svg)](https://github.com/s4u/setup-maven-action/actions/workflows/test.yml)
 
 This is composite action which help to prepare GitHub Actions environment for Maven build by calling:
 
+- [actions/checkout](https://github.com/marketplace/actions/checkout)
 - [actions/setup-java](https://github.com/marketplace/actions/setup-java-jdk)
 - [actions/cache](https://github.com/marketplace/actions/cache)
 - [stCarolas/setup-maven](https://github.com/marketplace/actions/setup-maven)
 - [s4u/maven-settings-action](https://github.com/marketplace/actions/maven-settings-action)
 
 # Contributions
+
 - Contributions are welcome!
 - Give :star: - if you want to encourage me to work on a project
 - Don't hesitate to create issues for new features you dream of or if you suspect some bug
 
 # Project versioning
+
 This project uses [Semantic Versioning](https://semver.org/).
-We recommended to use the latest and specific release version.
+We recommended using the latest and specific release version.
 
 In order to keep your project dependencies up to date you can watch this repository *(Releases only)*
 or use automatic tools like [Dependabot](https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates).
 
 # Params mapping for sub actions
 
+**Notice** when used this action you should not used mentioned below actions again.
+
+## checkout
+
+| params                       | destination         | default |
+|------------------------------|---------------------|---------|
+| checkout-fetch-depth         | fetch-depth         |         |
+| checkout-path                | path                |         |
+| checkout-persist-credentials | persist-credentials | false   |
+
 ## setup-java
 
 | params            | destination  | default |
-| ----------------- |------------- |-------- |
+|-------------------|--------------|---------|
 | java-version      | java-version |         |
 | java-distribution | distribution | temurin |
 
@@ -45,23 +58,23 @@ A cache action is configured as:
 
 So we can use for action:
 
-| params            | description                                              |
-| ----------------- |--------------------------------------------------------- |
-| cache-path        | default cache path for Maven with value ~/.m2/repository | 
-| cache-path-add    | additional value for cache path                          |
-| cache-prefix      | prefix value for `key` and `restore-keys` cache params   |
+| params         | description                                              |
+|----------------|----------------------------------------------------------|
+| cache-path     | default cache path for Maven with value ~/.m2/repository | 
+| cache-path-add | additional value for cache path                          |
+| cache-prefix   | prefix value for `key` and `restore-keys` cache params   |
 
 
 ## setup-maven
 
 | params        | destination   | default |
-| ------------- |-------------- |-------- |
-| maven-version | maven-version | 3.8.1   |
+|---------------|---------------|---------|
+| maven-version | maven-version | 3.8.6   |
 
 ## maven-settings-action
 
 | params                     | destination       |
-| -------------------------- |------------------ |
+|----------------------------|-------------------|
 | settings-servers           | servers           |
 | settings-mirrors           | mirrors           |
 | settings-properties        | properties        |
@@ -77,18 +90,18 @@ jobs:
 
     strategy:
       matrix:
-        maven: [ '3.5.4', '3.6.3', '3.8.2' ]
+        maven: [ '3.5.4', '3.6.3', '3.8.6' ]
 
     name: Maven ${{ matrix.maven }} sample
 
     steps:
-      - uses: actions/checkout@v2
 
-      - name: Setup Maven with settings.xml
-        uses: s4u/setup-maven-action@v1.0.0
+      - name: Setup Maven Action
+        uses: s4u/setup-maven-action@< version >
         with:
           java-version: 8
           maven-version: ${{ matrix.maven }}
+
       - run: mvn -V ...
 ```
 

action.yml

@@ -1,5 +1,5 @@
-name: 'Setup Maven with settings.xml'
-description: 'Setup environment for Maven build'
+name: 'Setup Maven Action'
+description: 'Complete environment configuration for Maven builds'
 
 branding:
   icon: 'settings'
@@ -7,6 +7,21 @@ branding:
 
 inputs:
 
+  # checkout
+  checkout-fetch-depth:
+    description: 'Number of commits to fetch'
+    required: false
+
+  checkout-path:
+    description: 'Relative path under $GITHUB_WORKSPACE to place the repository'
+    required: false
+
+  checkout-persist-credentials:
+    description: 'Whether to configure the token or SSH key with the local git config'
+    default: 'false'
+    required: false
+
+
   # java jdk params
 
   java-version:
@@ -35,7 +50,7 @@ inputs:
   # maven version
   maven-version:
     description: 'The Maven version to set up'
-    default: '3.8.1'
+    default: '3.8.6'
     required: false
 
   # maven settings.xml
@@ -60,43 +75,39 @@ runs:
 
   steps:
 
-    - run: echo "::group::Setup Java"
-      shell: bash
-    - uses: actions/setup-java@v2.3.0
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: '${{ inputs.checkout-fetch-depth }}'
+        path: '${{ inputs.checkout-path }}'
+        persist-credentials: '${{ inputs.checkout-persist-credentials }}'
+
+    - uses: actions/setup-java@v3
       with:
         overwrite-settings: false
         java-version: '${{ inputs.java-version }}'
         distribution: '${{ inputs.java-distribution }}'
-    - run: echo "::endgroup::"
-      shell: bash
 
-    - run: echo "::group::Setup Cache"
-      shell: bash
-    - uses: actions/cache@v2.1.6
+    - uses: actions/cache@v3
       with:
         path: |
           ${{ inputs.cache-path }}
           ${{ inputs.cache-path-add }}
         key: ${{ inputs.cache-prefix }}${{ runner.os }}-jdk${{ inputs.java-version }}-${{ inputs.java-distribution }}-maven${{ inputs.maven-version }}-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ inputs.cache-prefix }}${{ runner.os }}-jdk${{ inputs.java-version }}-${{ inputs.java-distribution }}-maven${{ inputs.maven-version }}-
-    - run: echo "::endgroup::"
-      shell: bash
 
-    - run: echo "::group::Setup Maven Version"
+    - name: Installed Maven version
+      run:  echo "::set-output name=version::$(mvn -q -v)"
       shell: bash
-    - uses: stCarolas/setup-maven@v4.1
+      id: current-maven
+
+    - uses: stCarolas/setup-maven@v4.4
+      if: inputs.maven-version != steps.current-maven.outputs.version
       with:
         maven-version: '${{ inputs.maven-version }}'
-    - run: echo "::endgroup::"
-      shell: bash
 
-    - run: echo "::group::Prepare Maven settings.xml"
-      shell: bash
-    - uses: s4u/maven-settings-action@v2.4.1
+    - uses: s4u/maven-settings-action@v2.6.0
       with:
         servers: '${{ inputs.settings-servers}}'
         mirrors: '${{ inputs.settings-mirrors}}'
         properties: '${{ inputs.settings-properties}}'
         sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots}}'
-    - run: echo "::endgroup::"
-      shell: bash