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

.github/workflows/audit.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-node@v2.5.1
+    - uses: actions/setup-node@v3
       with:
         node-version: '12.x'
 

.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

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

.github/workflows/test.yml

@@ -17,13 +17,13 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-node@v2.5.1
+    - uses: actions/setup-node@v3
       with:
         node-version: '12.x'
 
-    - uses: actions/setup-java@v2.5.0
+    - uses: actions/setup-java@v3
       with:
         distribution: 'adopt'
         java-version: '8'

README.md

@@ -31,14 +31,14 @@ See [action.yml](action.yml)
 ## default ```settings.xml```
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
 ```
 
 ## ```settings.xml``` with servers section
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.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@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     servers: |
       [{
@@ -96,7 +96,7 @@ result will be:
 ## ```settings.xml``` with mirrors section
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
 ```
@@ -104,7 +104,7 @@ steps:
 ## ```settings.xml``` with properties
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
 ```
@@ -113,7 +113,7 @@ steps:
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     sonatypeSnapshots: true
 ```
@@ -122,7 +122,7 @@ steps:
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     apacheSnapshots: true
 ```
@@ -130,7 +130,7 @@ steps:
 ## Do not override existing ```settings.xml```, from version **2.0** file is override by default :
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     override: false
 ```
@@ -138,7 +138,7 @@ steps:
 ## Do not add github to server in ```settings.xml```, by default is added:
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     githubServer: false
 ```
@@ -147,7 +147,7 @@ steps:
 
 ```yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     oracleServers: '[{"id": "serverId", "username": "username", "password": "password"}]'
 ```
@@ -155,7 +155,7 @@ steps:
 ## ```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@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     oracleRepo: true
 ```
@@ -166,7 +166,7 @@ It is also possible pass in Github Secrets e.g.
 
 ``` yml
 steps:
-- uses: s4u/maven-settings-action@v2.5.0
+- uses: s4u/maven-settings-action@v2.6.0
   with:
     servers: |
       [{
@@ -196,7 +196,7 @@ steps:
         with:
           java-version: 8
 
-      - uses: s4u/maven-settings-action@v2.5.0
+      - uses: s4u/maven-settings-action@v2.6.0
 
       - run: mvn verify
 ```

index.test.js

@@ -137,6 +137,16 @@ test('run with all feature', () => {
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
@@ -149,6 +159,16 @@ test('run with all feature', () => {
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
     </pluginRepositories>
 </profile>
 <profile>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maven-settings-action",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Prepare maven settings",
   "main": "index.js",
   "scripts": {
@@ -27,10 +27,10 @@
   "homepage": "https://github.com/s4u/maven-settings-action#readme",
   "dependencies": {
     "@actions/core": "^1.6.0",
-    "@xmldom/xmldom": "^0.8.0"
+    "@xmldom/xmldom": "^0.8.1"
   },
   "devDependencies": {
-    "eslint": "^8.8.0",
+    "eslint": "^8.12.0",
-    "jest": "^27.4.7"
+    "jest": "^27.5.1"
   }
 }

settings.test.js

@@ -504,6 +504,16 @@ test('addSonatypeSnapshots', () => {
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
@@ -516,6 +526,16 @@ test('addSonatypeSnapshots', () => {
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
     </pluginRepositories>
 </profile></profiles>`);
 });

templates/sonatype-snapshot.xml

@@ -15,6 +15,16 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
@@ -27,5 +37,15 @@
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
     </pluginRepositories>
 </profile>