Issue 68

Fix misspell in test action

.github/workflows/auto-approve.yml

@@ -5,30 +5,6 @@ on:
 
 jobs:
   auto-approve:
-    runs-on: ubuntu-latest
+    uses: s4u/.github/.github/workflows/auto-approve.yml@master
-    steps:
+    secrets:
-
+      TECH_TOKEN: ${{ secrets.TECH_TOKEN }}
-      - 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 }}

.github/workflows/release-drafter.yml

@@ -9,14 +9,4 @@ on:
 jobs:
   update_release_draft:
     name: Update Release Draft
-    runs-on: ubuntu-latest
+    uses: s4u/.github/.github/workflows/release-drafter.yml@master
-    concurrency: release-drafter
-
-    if: >
-      github.repository_owner == 's4u'
-      && !startsWith(github.event.head_commit.message , '[maven-release-plugin]')
-
-    steps:
-      - uses: release-drafter/release-drafter@v5.15.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-${{ github.ref }}
-  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', '17' ]
+        java: [ '8', '11', '17', '21' ]
-        maven: [ '3.5.4', '3.6.3', '3.8.3' ]
+        maven: [ '3.8.8', '3.9.6' ]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
 
       - uses: ./
         with:
@@ -40,23 +36,50 @@ jobs:
       - run: mvn -V validate -Drequire.java=${{ matrix.java }} -Drequire.maven=${{ matrix.maven }}
         shell: bash
 
-  test-deault:
+  test-default:
     name: Test with defaults
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
+
+      - uses: ./
+
+      - run: mvn -V validate -Drequire.java=17 -Drequire.maven=3.9.6
+        shell: bash
+
+  # regressions tests
+  test-issue-68:
+    name: Test for issue 68
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
 
       - uses: ./
         with:
-          java-version: 8
+          settings-servers: |
+            [{
+              "id": "ossrh",
+              "username": "${{ vars.TEST_68_1 }}",
+              "password": "${{ vars.TEST_68_2 }}"
+            }]
 
-      - run: mvn -V validate -Drequire.java=8 -Drequire.maven=3.8.3
+      - run: cat ~/.m2/settings.xml
-        shell: bash
+      - run: |
+          grep "<id>ossrh</id>" ~/.m2/settings.xml
+          grep "<username>username-68</username>" ~/.m2/settings.xml
+          grep "<password>password-68</password>" ~/.m2/settings.xml
 
   test-ok:
     name: Test OK
     runs-on: ubuntu-latest
-    needs: [ test, test-deault ]
+    needs: [ test, test-default, test-issue-68 ]
+    if: always()
+
     steps:
-      - run: echo OK
+      - run: 'true'
+        if: join(needs.*.result, ',') == 'success,success,success'
+
+      - run: 'false'
+        if: join(needs.*.result, ',') != 'success,success,success'

README.md

@@ -9,34 +9,37 @@ This is composite action which help to prepare GitHub Actions environment for Ma
 - [stCarolas/setup-maven](https://github.com/marketplace/actions/setup-maven)
 - [s4u/maven-settings-action](https://github.com/marketplace/actions/maven-settings-action)
 
-# Contributions
+:exclamation: You **should not** include above actions in your configuration - in other case  those will be **called twice**. :exclamation:
 
-- Contributions are welcome!
+For default values you only need:
-- 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
+```yml
+    steps:
 
-This project uses [Semantic Versioning](https://semver.org/).
+      - name: Setup Maven Action
-We recommended to use the latest and specific release version.
+        uses: s4u/setup-maven-action@< 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).
 
+      - run: mvn -V ...
+```
+ 
 # Params mapping for sub actions
 
 ## checkout
 
-| params                     | destination       |
+| params                       | destination         | default                  |
-| -------------------------- |------------------ |
+|------------------------------|---------------------|--------------------------|
-| checkout-fetch-depth       | fetch-depth           |
+| checkout-fetch-depth         | fetch-depth         |                          |
-
+| checkout-path                | path                |                          |
+| checkout-ref                 | ref                 |                          |
+| checkout-repository          | repository          | ${{ github.repository }} |
+| checkout-token               | token               | ${{ github.token }}      |
+| checkout-persist-credentials | persist-credentials | false                    |
 
 ## setup-java
 
 | params            | destination  | default |
-| ----------------- |------------- |-------- |
+|-------------------|--------------|---------|
-| java-version      | java-version |         |
+| java-version      | java-version | 17      |
 | java-distribution | distribution | temurin |
 
 ## cache
@@ -55,23 +58,24 @@ A cache action is configured as:
 
 So we can use for action:
 
-| params            | description                                              |
+| params         | description                                              |
-| ----------------- |--------------------------------------------------------- |
+|----------------|----------------------------------------------------------|
-| cache-path        | default cache path for Maven with value ~/.m2/repository | 
+| cache-enabled  | enable cache. Default true                               |
-| cache-path-add    | additional value for cache path                          |
+| cache-path     | default cache path for Maven with value ~/.m2/repository | 
-| cache-prefix      | prefix value for `key` and `restore-keys` cache params   |
+| 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.3   |
+| maven-version | maven-version | 3.9.6   |
 
 ## maven-settings-action
 
 | params                     | destination       |
-| -------------------------- |------------------ |
+|----------------------------|-------------------|
 | settings-servers           | servers           |
 | settings-mirrors           | mirrors           |
 | settings-properties        | properties        |
@@ -87,7 +91,7 @@ jobs:
 
     strategy:
       matrix:
-        maven: [ '3.5.4', '3.6.3', '3.8.2' ]
+        maven: [ '3.8.8', '3.9.6' ]
 
     name: Maven ${{ matrix.maven }} sample
 
@@ -102,6 +106,20 @@ jobs:
       - run: mvn -V ...
 ```
 
+# 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 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).
+
 # License
 
 The scripts and documentation in this project are released under the [MIT License](LICENSE)

action.yml

@@ -12,10 +12,34 @@ inputs:
     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
+
+  checkout-ref:
+    description: 'The branch, tag, or SHA of the repository to clone'
+    required: false
+
+  checkout-repository:
+    description: 'The repository to checkout if not the repository that triggered the action. For use when building GitHub Apps'
+    required: false
+    default: ${{ github.repository }}
+
+  checkout-token:
+    description: 'Token to use for checkout if checking out a repository out of scope for GITHUB_TOKEN'
+    required: false
+    default: ${{ github.token }}
+
   # java jdk params
 
   java-version:
     description: 'The Java version to set up'
+    default: '17'
     required: true
 
   java-distribution:
@@ -24,6 +48,11 @@ inputs:
     required: false
 
   # cache
+  cache-enabled:
+    description: 'Enable cache'
+    default: 'true'
+    required: false
+
   cache-prefix:
     description: 'Cache key prefix'
     required: false
@@ -40,7 +69,7 @@ inputs:
   # maven version
   maven-version:
     description: 'The Maven version to set up'
-    default: '3.8.3'
+    default: '3.9.6'
     required: false
 
   # maven settings.xml
@@ -65,17 +94,23 @@ runs:
 
   steps:
 
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v4
       with:
         fetch-depth: '${{ inputs.checkout-fetch-depth }}'
+        path: '${{ inputs.checkout-path }}'
+        persist-credentials: '${{ inputs.checkout-persist-credentials }}'
+        ref: '${{ inputs.checkout-ref }}'
+        repository: '${{ inputs.checkout-repository }}'
+        token: '${{ inputs.checkout-token }}'
 
-    - uses: actions/setup-java@v2.3.1
+    - uses: actions/setup-java@v4
       with:
         overwrite-settings: false
         java-version: '${{ inputs.java-version }}'
         distribution: '${{ inputs.java-distribution }}'
 
-    - uses: actions/cache@v2.1.6
+    - uses: actions/cache@v4
+      if: inputs.cache-enabled == 'true'
       with:
         path: |
           ${{ inputs.cache-path }}
@@ -83,11 +118,17 @@ runs:
         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 }}-
 
-    - uses: stCarolas/setup-maven@v4.2
+    - name: Installed Maven version
+      run:  echo "version=$(mvn -q -v)" >> $GITHUB_OUTPUT
+      shell: bash
+      id: current-maven
+
+    - uses: stCarolas/setup-maven@v5
+      if: inputs.maven-version != steps.current-maven.outputs.version
       with:
         maven-version: '${{ inputs.maven-version }}'
 
-    - uses: s4u/maven-settings-action@v2.4.1
+    - uses: s4u/maven-settings-action@v3.0.0
       with:
         servers: '${{ inputs.settings-servers}}'
         mirrors: '${{ inputs.settings-mirrors}}'

pom.xml

@@ -36,7 +36,6 @@
     <properties>
         <require.maven/>
         <require.java/>
-        <_require.java/>
     </properties>
 
     <build>
@@ -44,11 +43,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M3</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>display-info</goal>
                             <goal>enforce</goal>
                         </goals>
                         <phase>validate</phase>
@@ -57,7 +55,7 @@
                 <configuration>
                     <rules>
                         <requireJavaVersion>
-                            <version>${_require.java}</version>
+                            <version>${require.java}</version>
                         </requireJavaVersion>
                         <requireMavenVersion>
                             <version>[${require.maven}]</version>
@@ -67,32 +65,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>java8-version-label</id>
-            <activation>
-                <property>
-                    <name>require.java</name>
-                    <value>8</value>
-                </property>
-            </activation>
-            <properties>
-                <_require.java>1.8</_require.java>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>non-java8-version-label</id>
-            <activation>
-                <property>
-                    <name>require.java</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <_require.java>${require.java}</_require.java>
-            </properties>
-        </profile>
-    </profiles>
 </project>