Merge pull request #84 from s4u/mvn-3.9.8

Maven 3.9.8 as default

.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.6' ]
+        maven: [ '3.8.8', '3.9.8' ]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - uses: ./
         with:
@@ -41,11 +41,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - uses: ./
 
-      - run: mvn -V validate -Drequire.java=17 -Drequire.maven=3.9.6
+      - run: mvn -V validate -Drequire.java=17 -Drequire.maven=3.9.8
         shell: bash
 
   test-ok:

README.md

@@ -40,7 +40,7 @@ For default values you only need:
 | params            | destination  | default |
 |-------------------|--------------|---------|
 | java-version      | java-version | 17      |
-| java-distribution | distribution | temurin |
+| java-distribution | distribution | zulu    |
 
 ## cache
 
@@ -70,7 +70,7 @@ So we can use for action:
 
 | params        | destination   | default |
 |---------------|---------------|---------|
-| maven-version | maven-version | 3.9.6   |
+| maven-version | maven-version | 3.9.8   |
 
 ## maven-settings-action
 
@@ -80,6 +80,8 @@ So we can use for action:
 | settings-mirrors           | mirrors           |
 | settings-properties        | properties        |
 | settings-sonatypeSnapshots | sonatypeSnapshots |
+| settings-proxies           | proxies           |
+| settings-repositories      | repositories      |
 
 # Testing against different Maven versions
 
@@ -91,7 +93,7 @@ jobs:
 
     strategy:
       matrix:
-        maven: [ '3.8.8', '3.9.6' ]
+        maven: [ '3.8.8', '3.9.8' ]
 
     name: Maven ${{ matrix.maven }} sample
 

action.yml

@@ -44,7 +44,7 @@ inputs:
 
   java-distribution:
     description: 'Java distribution'
-    default: 'temurin'
+    default: 'zulu'
     required: false
 
   # cache
@@ -69,32 +69,40 @@ inputs:
   # maven version
   maven-version:
     description: 'The Maven version to set up'
-    default: '3.9.6'
+    default: '3.9.8'
     required: false
 
   # maven settings.xml
   settings-servers:
-    description: 'servers definition in json array, eg: [{"id": "serverId", "username": "username", "password": "password"}]'
+    description: 'servers definition in json array, e.g.: [{"id": "serverId", "username": "username", "password": "password"}]'
     required: false
 
   settings-mirrors:
-    description: 'mirrors definition in json array, eg: [{"id": "id", "name": "name", "mirrorOf": "mirrorOf", "url": "url"}]'
+    description: 'mirrors definition in json array, e.g.: [{"id": "id", "name": "name", "mirrorOf": "mirrorOf", "url": "url"}]'
     required: false
 
   settings-properties:
-    description: 'json array with properties, eg [{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
+    description: 'json array with properties, e.g.: [{"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
+
 runs:
   using: 'composite'
 
   steps:
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         fetch-depth: '${{ inputs.checkout-fetch-depth }}'
         path: '${{ inputs.checkout-path }}'
@@ -109,7 +117,7 @@ runs:
         java-version: '${{ inputs.java-version }}'
         distribution: '${{ inputs.java-distribution }}'
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       if: inputs.cache-enabled == 'true'
       with:
         path: |
@@ -123,14 +131,16 @@ runs:
       shell: bash
       id: current-maven
 
-    - uses: stCarolas/setup-maven@v5
+    - uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       if: inputs.maven-version != steps.current-maven.outputs.version
       with:
         maven-version: '${{ inputs.maven-version }}'
 
-    - uses: s4u/maven-settings-action@v3.0.0
+    - uses: s4u/maven-settings-action@7802f6aec16c9098b4798ad1f1d8ac75198194bd # v3.0.0
       with:
-        servers: '${{ inputs.settings-servers}}'
-        mirrors: '${{ inputs.settings-mirrors}}'
-        properties: '${{ inputs.settings-properties}}'
-        sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots}}'
+        servers: '${{ inputs.settings-servers }}'
+        mirrors: '${{ inputs.settings-mirrors }}'
+        properties: '${{ inputs.settings-properties }}'
+        sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots }}'
+        proxies: '${{ inputs.settings-proxies }}'
+        repositories: '${{ inputs.settings-repositories }}'