Issue 68

.github/workflows/release-drafter.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - 'master'
       - 'main'
-  workflow_dispatch:
 
 jobs:
   update_release_draft:

.github/workflows/test.yml

@@ -19,13 +19,13 @@ jobs:
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ]
         java: [ '8', '11', '17', '21' ]
-        maven: [ '3.8.8', '3.9.11' ]
+        maven: [ '3.8.8', '3.9.6' ]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4
 
       - uses: ./
         with:
@@ -41,22 +41,45 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4
 
       - uses: ./
 
-      - run: mvn -V validate -Drequire.java=17 -Drequire.maven=3.9.11
+      - 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:
+          settings-servers: |
+            [{
+              "id": "ossrh",
+              "username": "${{ vars.TEST_68_1 }}",
+              "password": "${{ vars.TEST_68_2 }}"
+            }]
+
+      - run: cat ~/.m2/settings.xml
+      - 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-default ]
+    needs: [ test, test-default, test-issue-68 ]
     if: always()
 
     steps:
       - run: 'true'
-        if: join(needs.*.result, ',') == 'success,success'
+        if: join(needs.*.result, ',') == 'success,success,success'
 
       - run: 'false'
-        if: join(needs.*.result, ',') != 'success,success'
+        if: join(needs.*.result, ',') != 'success,success,success'

README.md

@@ -21,21 +21,18 @@ For default values you only need:
 
       - run: mvn -V ...
 ```
-
+ 
 # Params mapping for sub actions
 
 ## checkout
 
 | params                       | destination         | default                  |
 |------------------------------|---------------------|--------------------------|
-| checkout-enabled             | enabled             |  true                    |
 | checkout-fetch-depth         | fetch-depth         |                          |
-| checkout-submodules          | submodules          |                          |
 | checkout-path                | path                |                          |
 | checkout-ref                 | ref                 |                          |
 | checkout-repository          | repository          | ${{ github.repository }} |
 | checkout-token               | token               | ${{ github.token }}      |
-| checkout-ssh-key             | ssh-key             |                          |
 | checkout-persist-credentials | persist-credentials | false                    |
 
 ## setup-java
@@ -43,8 +40,7 @@ For default values you only need:
 | params            | destination  | default |
 |-------------------|--------------|---------|
 | java-version      | java-version | 17      |
-| java-distribution | distribution | zulu    |
+| java-distribution | distribution | temurin |
-| java-jdkFile      | jdkFile      |         |
 
 ## cache
 
@@ -65,7 +61,7 @@ So we can use for action:
 | params         | description                                              |
 |----------------|----------------------------------------------------------|
 | cache-enabled  | enable cache. Default true                               |
-| cache-path     | default cache path for Maven with value ~/.m2/repository |
+| 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   |
 
@@ -74,21 +70,16 @@ So we can use for action:
 
 | params        | destination   | default |
 |---------------|---------------|---------|
-| maven-version | maven-version | 3.9.11  |
+| maven-version | maven-version | 3.9.6   |
 
 ## maven-settings-action
 
-| params                      | destination        |
+| params                     | destination       |
-|-----------------------------|--------------------|
+|----------------------------|-------------------|
-| settings-servers            | servers            |
+| settings-servers           | servers           |
-| settings-mirrors            | mirrors            |
+| settings-mirrors           | mirrors           |
-| settings-properties         | properties         |
+| settings-properties        | properties        |
-| settings-sonatypeSnapshots  | sonatypeSnapshots  |
+| settings-sonatypeSnapshots | sonatypeSnapshots |
-| settings-proxies            | proxies            |
-| settings-repositories       | repositories       |
-| settings-pluginRepositories | pluginRepositories |
-| settings-githubServer       | githubServer       |
-| settings-path               | path               |
 
 # Testing against different Maven versions
 
@@ -100,7 +91,7 @@ jobs:
 
     strategy:
       matrix:
-        maven: [ '3.8.8', '3.9.8' ]
+        maven: [ '3.8.8', '3.9.6' ]
 
     name: Maven ${{ matrix.maven }} sample
 

action.yml

@@ -8,19 +8,10 @@ branding:
 inputs:
 
   # checkout
-  checkout-enabled:
-    description: 'Enable checkout'
-    default: 'true'
-    required: false
-
   checkout-fetch-depth:
     description: 'Number of commits to fetch'
     required: false
 
-  checkout-submodules:
-    description: 'Whether to fetch submodules'
-    required: false
-
   checkout-path:
     description: 'Relative path under $GITHUB_WORKSPACE to place the repository'
     required: false
@@ -44,10 +35,6 @@ inputs:
     required: false
     default: ${{ github.token }}
 
-  checkout-ssh-key:
-    description: 'SSH key used to fetch the repository. It allows to run authenticated git commands'
-    required: false
-
   # java jdk params
 
   java-version:
@@ -57,11 +44,7 @@ inputs:
 
   java-distribution:
     description: 'Java distribution'
-    default: 'zulu'
+    default: 'temurin'
-    required: false
-
-  java-jdkFile:
-    description: 'Java JDK compressed file location'
     required: false
 
   # cache
@@ -86,72 +69,47 @@ inputs:
   # maven version
   maven-version:
     description: 'The Maven version to set up'
-    default: '3.9.11'
+    default: '3.9.6'
     required: false
 
   # maven settings.xml
   settings-servers:
-    description: 'servers definition in json array, e.g.: [{"id": "serverId", "username": "username", "password": "password"}]'
+    description: 'servers definition in json array, eg: [{"id": "serverId", "username": "username", "password": "password"}]'
     required: false
 
   settings-mirrors:
-    description: 'mirrors definition in json array, e.g.: [{"id": "id", "name": "name", "mirrorOf": "mirrorOf", "url": "url"}]'
+    description: 'mirrors definition in json array, eg: [{"id": "id", "name": "name", "mirrorOf": "mirrorOf", "url": "url"}]'
     required: false
 
   settings-properties:
-    description: 'json array with properties, e.g.: [{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
+    description: 'json array with properties, eg [{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
     required: false
 
   settings-sonatypeSnapshots:
     description: 'add https://oss.sonatype.org/content/repositories/snapshots to repository list - true or false'
     required: false
 
-  settings-proxies:
-    description: 'proxies definition in json array, e.g.: [{"id": "http-proxy", "active": "true", "protocol": "http", "host": "host", "port": "port", "nonProxyHosts": "host1|host2"}]'
-    required: false
-
-  settings-repositories:
-    description: 'repository settings definition in json array, e.g.: [ { "id": "repoId","name": "repoName","url": "url","snapshots": { "enabled": true } } ]'
-    required: false
-
-  settings-pluginRepositories:
-    description: 'plugin repository settings definition in json array, e.g.: [{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
-    required: false
-
-  settings-githubServer:
-    description: 'add to settings.xml servers server-id: github; username=$GITHUB_ACTOR and password=$GITHUB_TOKEN'
-    default: "true"
-    required: false
-
-  settings-path:
-    description: 'override default path to settings.xml which is $HOME/.m2/settings.xml'
-    required: false
-
 runs:
   using: 'composite'
 
   steps:
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@v4
-      if: inputs.checkout-enabled == 'true'
       with:
         fetch-depth: '${{ inputs.checkout-fetch-depth }}'
-        submodules: '${{ inputs.checkout-submodules }}'
         path: '${{ inputs.checkout-path }}'
         persist-credentials: '${{ inputs.checkout-persist-credentials }}'
         ref: '${{ inputs.checkout-ref }}'
         repository: '${{ inputs.checkout-repository }}'
         token: '${{ inputs.checkout-token }}'
-        ssh-key: '${{ inputs.checkout-ssh-key }}'
 
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
+    - uses: actions/setup-java@v4
       with:
         overwrite-settings: false
         java-version: '${{ inputs.java-version }}'
         distribution: '${{ inputs.java-distribution }}'
-        jdkFile: '${{ inputs.java-jdkFile }}'
 
-    - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+    - uses: actions/cache@v4
       if: inputs.cache-enabled == 'true'
       with:
         path: |
@@ -165,19 +123,14 @@ runs:
       shell: bash
       id: current-maven
 
-    - uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
+    - 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@894661b3ddae382f1ae8edbeab60987e08cf0788 # v4.0.0
+    - uses: s4u/maven-settings-action@v3.0.0
       with:
-        servers: '${{ inputs.settings-servers }}'
+        servers: '${{ inputs.settings-servers}}'
-        mirrors: '${{ inputs.settings-mirrors }}'
+        mirrors: '${{ inputs.settings-mirrors}}'
-        properties: '${{ inputs.settings-properties }}'
+        properties: '${{ inputs.settings-properties}}'
-        sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots }}'
+        sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots}}'
-        proxies: '${{ inputs.settings-proxies }}'
-        repositories: '${{ inputs.settings-repositories }}'
-        pluginRepositories: '${{ inputs.settings-pluginRepositories }}'
-        githubServer: '${{ inputs.settings-githubServer }}'
-        path: '${{ inputs.settings-path }}'