Merge remote-tracking branch 'origin/master' into releases/v3

.github/workflows/test.yml

@@ -25,8 +25,8 @@ jobs:
 
     - uses: actions/setup-java@v4
       with:
-        distribution: 'adopt'
-        java-version: '8'
+        distribution: 'temurin'
+        java-version: '17'
 
 
     - run: npm version

MAINTENANCE.md

@@ -0,0 +1,25 @@
+# update dependencies
+
+    npm update
+    npm outdated
+
+If new version exist put '*' in `package.json` and run again `npm update`
+
+- new commit with dependency updates
+
+# new release
+
+ - run - npm version patch -m "prepare release %s"
+or
+ - run - npm version minor -m "prepare release %s"
+
+ - push commit
+
+ - checkout release/vX
+ - merge master and push
+ - run
+    npm update
+    npm install
+    npm prune --production
+ - commit and push "update dependency after merge from master"
+ - git tag and git push --tags

README.md

@@ -31,14 +31,14 @@ See [action.yml](action.yml)
 ## default ```settings.xml```
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
 ```
 
 ## ```settings.xml``` with servers section
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
 ```
@@ -62,7 +62,7 @@ Please refer to the [servers](http://maven.apache.org/settings.html#Servers) doc
 
 ``` yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     servers: |
       [{
@@ -80,7 +80,7 @@ steps:
 result will be:
 
 ```xml
-<server>
+<servers><server>
     <id>serverId</id>
     <configuration>
       <item1>value1</item1>
@@ -96,23 +96,24 @@ result will be:
 ## ```settings.xml``` with mirrors section
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
 ```
 
 ## ```settings.xml``` with proxies section
 ```yml
 step:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
-    proxies: '[{"id": "proxyId", "active": "isActive", "protocol": "proxyProtocol", "host": "proxyHost", "port": "proxyPort", "nonProxyHosts": "nonProxyHost"}]'
+    proxies: '[{"id": "proxyId", "active": "isActive", "protocol": "proxyProtocol", "host": "proxyHost", "port": "proxyPort", "nonProxyHosts": "nonProxyHost", "user": "proxUser", "password": "proxPassword"}]'
 ```
+Note: Authentication details are optional.
 
 ## ```settings.xml``` with properties
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
 ```
@@ -121,7 +122,7 @@ steps:
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     sonatypeSnapshots: true
 ```
@@ -130,23 +131,23 @@ steps:
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     apacheSnapshots: true
 ```
 
 ## Do not override existing ```settings.xml```, from version **2.0** file is override by default :
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     override: false
 ```
 
 ## Do not add github to server in ```settings.xml```, by default is added:
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     githubServer: false
 ```
@@ -155,35 +156,43 @@ steps:
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     oracleServers: '[{"id": "serverId", "username": "username", "password": "password"}]'
 ```
 
 ## ```settings.xml``` with [Oracle Maven Repository](https://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9017)
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     oracleRepo: true
 ```
 
 ## ```settings.xml``` with custom repositories
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     repositories: '[{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
 ```
 
+## ```settings.xml``` with custom plugin repositories
+```yml
+steps:
+- uses: s4u/maven-settings-action@v3.1.0
+  with:
+    pluginRepositories: '[{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
+```
+
 
 ## GitHub actions secrets
 
 It is also possible pass in Github Secrets e.g.
 
 ``` yml
 steps:
-- uses: s4u/maven-settings-action@v3.0.0
+- uses: s4u/maven-settings-action@v3.1.0
   with:
     servers: |
       [{
@@ -213,7 +222,7 @@ steps:
         with:
           java-version: 8
 
-      - uses: s4u/maven-settings-action@v3.0.0
+      - uses: s4u/maven-settings-action@v3.1.0
 
       - run: mvn verify
 ```

action.yml

@@ -46,6 +46,9 @@ inputs:
   repositories:
     description: 'list of custom repositories as json array, e.g: [{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
     required: false
+  pluginRepositories:
+    description: 'list of custom plugin repositories as json array, e.g: [{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
+    required: false
 
 runs:
   using: 'node20'

cleanup.test.js

@@ -49,7 +49,7 @@ afterAll(() => {
     }
 
     try {
-        fs.rmdirSync(testHomePath);
+        fs.rmSync(testHomePath, { recursive: true });
     } catch (error) {
     }
 });

eslint.config.mjs

@@ -0,0 +1,29 @@
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends("eslint:recommended"), {
+    languageOptions: {
+        globals: {
+            ...globals.commonjs,
+            ...globals.node,
+            Atomics: "readonly",
+            SharedArrayBuffer: "readonly",
+        },
+
+        ecmaVersion: 2018,
+        sourceType: "commonjs",
+    },
+
+    rules: {},
+}];

index.test.js

@@ -55,7 +55,7 @@ afterAll(() => {
     }
 
     try {
-        fs.rmdirSync(testHomePath);
+        fs.rmSync(testHomePath, { recursive: true });
     } catch (error) {
     }
 });
@@ -75,6 +75,7 @@ test('run with all feature', () => {
     process.env['INPUT_SONATYPESNAPSHOTS'] = true;
     process.env['INPUT_ORACLEREPO'] = true;
     process.env['INPUT_REPOSITORIES'] = '[{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
+    process.env['INPUT_PLUGINREPOSITORIES'] = '[{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
 
     cp.spawnSync('node', [ `${indexPath}` ], { env: process.env, stdio: 'inherit' });
     const settingsStatus = fs.lstatSync(settingsPath);
@@ -213,7 +214,12 @@ test('run with all feature', () => {
      <url>url</url>
      <snapshots><enabled>true</enabled></snapshots>
  </repository></repositories>
-    <pluginRepositories/>
+    <pluginRepositories> <pluginRepository>
+     <id>repoId</id>
+     <name>repoName</name>
+     <url>url</url>
+     <snapshots><enabled>true</enabled></snapshots>
+ </pluginRepository></pluginRepositories>
 </profile></profiles>
     <servers>
 <server>
@@ -265,4 +271,4 @@ test('run with all feature', () => {
     <nonProxyHosts>nonProxyHost</nonProxyHosts>
 </proxy></proxies>
 </settings>`);
-})
+})