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

This commit is contained in:
Slawomir Jaranowski
2022-10-15 12:46:24 +02:00
7 changed files with 2107 additions and 2551 deletions

View File

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

View File

@ -31,14 +31,14 @@ See [action.yml](action.yml)
## default ```settings.xml```
```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.0
```
## ```settings.xml``` with servers section
```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.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.6.0
- uses: s4u/maven-settings-action@v2.7.0
with:
servers: |
[{
@ -96,7 +96,7 @@ result will be:
## ```settings.xml``` with mirrors section
```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.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.6.0
- uses: s4u/maven-settings-action@v2.7.0
with:
properties: '[{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
```
@ -113,7 +113,7 @@ steps:
```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.0
with:
sonatypeSnapshots: true
```
@ -122,7 +122,7 @@ steps:
```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.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.6.0
- uses: s4u/maven-settings-action@v2.7.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.6.0
- uses: s4u/maven-settings-action@v2.7.0
with:
githubServer: false
```
@ -147,7 +147,7 @@ steps:
```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.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.6.0
- uses: s4u/maven-settings-action@v2.7.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.6.0
- uses: s4u/maven-settings-action@v2.7.0
with:
servers: |
[{
@ -196,7 +196,7 @@ steps:
with:
java-version: 8
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.0
- run: mvn verify
```

View File

@ -43,6 +43,6 @@ inputs:
required: false
runs:
using: 'node12'
using: 'node16'
main: 'index.js'
post: 'cleanup.js'

View File

@ -56,5 +56,5 @@ afterAll(() => {
test('run with default values', () => {
cp.execSync(`node ${cleanupPath}`, { env: process.env }).toString();
cp.spawnSync('node', [ `${cleanupPath}` ], { env: process.env }).toString();
})

View File

@ -74,7 +74,7 @@ test('run with all feature', () => {
process.env['INPUT_SONATYPESNAPSHOTS'] = true;
process.env['INPUT_ORACLEREPO'] = true;
cp.execSync(`node ${indexPath}`, { env: process.env, stdio: 'inherit' });
cp.spawnSync('node', [ `${indexPath}` ], { env: process.env, stdio: 'inherit' });
const settingsStatus = fs.lstatSync(settingsPath);
expect(settingsStatus.isFile()).toBeTruthy();

4614
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "maven-settings-action",
"version": "2.6.0",
"version": "2.7.0",
"description": "Prepare maven settings",
"main": "index.js",
"scripts": {
@ -26,11 +26,11 @@
},
"homepage": "https://github.com/s4u/maven-settings-action#readme",
"dependencies": {
"@actions/core": "^1.6.0",
"@xmldom/xmldom": "^0.8.1"
"@actions/core": "^1.10.0",
"@xmldom/xmldom": "^0.8.3"
},
"devDependencies": {
"eslint": "^8.12.0",
"jest": "^27.5.1"
"eslint": "^8.25.0",
"jest": "^28.1.3"
}
}