Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into releases/v2
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Oct 15, 2022
2 parents 326c8f3 + 21b6739 commit 620d2d6
Show file tree
Hide file tree
Showing 7 changed files with 2,124 additions and 2,568 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"}]'
```
Expand All @@ -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: |
[{
Expand Down Expand Up @@ -96,15 +96,15 @@ 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"}]'
```

## ```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"}]'
```
Expand All @@ -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
```
Expand All @@ -122,23 +122,23 @@ steps:

```yml
steps:
- uses: s4u/maven-settings-action@v2.6.0
- uses: s4u/maven-settings-action@v2.7.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@v2.6.0
- uses: s4u/maven-settings-action@v2.7.0
with:
override: false
```

## 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
```
Expand All @@ -147,15 +147,15 @@ 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"}]'
```

## ```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
```
Expand All @@ -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: |
[{
Expand Down Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ inputs:
required: false

runs:
using: 'node12'
using: 'node16'
main: 'index.js'
post: 'cleanup.js'
2 changes: 1 addition & 1 deletion cleanup.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
})
2 changes: 1 addition & 1 deletion index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading

0 comments on commit 620d2d6

Please sign in to comment.