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

This commit is contained in:
Slawomir Jaranowski
2020-09-05 13:07:15 +02:00
6 changed files with 1506 additions and 1150 deletions

14
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,14 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: '09:09'
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
time: '09:09'
open-pull-requests-limit: 10

View File

@ -1,14 +1,15 @@
name: "Audit" name: Audit
on: on:
pull_request: pull_request:
push: push:
branches-ignore: branches-ignore:
- 'dependabot/*' - 'dependabot/**'
schedule: schedule:
- cron: '09 22 * * *' - cron: '09 22 * * *'
jobs: jobs:
test: audit:
name: Audit
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macOS-latest] os: [ubuntu-latest, windows-latest, macOS-latest]
@ -16,9 +17,9 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v2.3.2
- uses: actions/setup-node@v1 - uses: actions/setup-node@v2.1.1
with: with:
node-version: '12.x' node-version: '12.x'

View File

@ -1,14 +1,15 @@
name: "Test" name: Test
on: on:
pull_request: pull_request:
push: push:
branches-ignore: branches-ignore:
- 'dependabot/*' - 'dependabot/**'
schedule: schedule:
- cron: '22 22 * * 5' - cron: '22 22 * * 5'
jobs: jobs:
test: test:
name: Test
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macOS-latest] os: [ubuntu-latest, windows-latest, macOS-latest]
@ -16,9 +17,9 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v2.3.2
- uses: actions/setup-node@v1 - uses: actions/setup-node@v2.1.1
with: with:
node-version: '12.x' node-version: '12.x'

View File

@ -28,13 +28,13 @@ See [action.yml](action.yml)
Create default ```settings.xml```: Create default ```settings.xml```:
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
``` ```
Create ```settings.xml``` with servers section: Create ```settings.xml``` with servers section:
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
with: with:
servers: '[{"id": "serverId", "username": "username", "password": "password"}]' servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
``` ```
@ -42,7 +42,7 @@ steps:
Create ```settings.xml``` with mirrors section: Create ```settings.xml``` with mirrors section:
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
with: with:
mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]' mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
``` ```
@ -50,7 +50,7 @@ steps:
Create ```settings.xml``` with maven properties: Create ```settings.xml``` with maven properties:
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
with: with:
properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]' properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
``` ```
@ -58,7 +58,7 @@ steps:
Create ```settings.xml``` with https://oss.sonatype.org/content/repositories/snapshots in repository list Create ```settings.xml``` with https://oss.sonatype.org/content/repositories/snapshots in repository list
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
with: with:
sonatypeSnapshots: true sonatypeSnapshots: true
``` ```
@ -66,7 +66,7 @@ steps:
Do not override existing ```settings.xml```, from version 2.0 file is override by default : Do not override existing ```settings.xml```, from version 2.0 file is override by default :
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
with: with:
override: false override: false
``` ```
@ -74,7 +74,7 @@ steps:
Do not add github to server in ```settings.xml```, by default is added: Do not add github to server in ```settings.xml```, by default is added:
```yml ```yml
steps: steps:
- uses: s4u/maven-settings-action@v2.1.0 - uses: s4u/maven-settings-action@v2.1.1
with: with:
githubServer: false githubServer: false
``` ```

2600
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -24,12 +24,12 @@
}, },
"homepage": "https://github.com/s4u/maven-settings-action#readme", "homepage": "https://github.com/s4u/maven-settings-action#readme",
"dependencies": { "dependencies": {
"@actions/core": "^1.2.3", "@actions/core": "^1.2.5",
"xmldom": "^0.3.0", "xmldom": "^0.3.0",
"xpath": "0.0.27" "xpath": "0.0.29"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^6.8.0", "eslint": "^7.8.1",
"jest": "^25.2.7" "jest": "^26.4.2"
} }
} }