Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into
Browse files Browse the repository at this point in the history
feature/23-Delegate_Security_Manager

Conflicts:
	README.md
	src/main/java/org/itsallcode/junit/sysextensions/ExitGuard.java
	src/main/java/org/itsallcode/junit/sysextensions/security/ExitGuardSecurityManager.java
	src/test/java/org/itsallcode/junit/sysextensions/TestSystemExit.java
  • Loading branch information
redcatbear committed Apr 22, 2021
2 parents a6f0547 + f9000dd commit d76c38e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The extensions in this project were inspired by a set of JUnit4 rules called "[S
To trap and check calls to `System.exit(int)` follow these steps:

1. Extend the test class with the class `ExitGuard`
2. Use `AssertExit.assertExit(Runnable)` or `AssertExit.assertExit(int, Runnable)` to check for exit calls
2. Use `AssertExit.assertExit(Runnable)` or `AssertExit.assertExitWithStatus(int, Runnable)` to check for exit calls

Example:

Expand Down Expand Up @@ -145,7 +145,7 @@ mvn versions:display-dependency-updates
mvn versions:display-plugin-updates
```

### Publishing to JCenter
### Publishing to MavenCentral

1. Add the following to your `~/.m2/settings.xml`:

Expand Down Expand Up @@ -183,4 +183,4 @@ mvn versions:display-plugin-updates

1. Merge `develop` to `master` branch
1. Create a [release](https://github.com/itsallcode/junit5-system-extensions/releases) of the `master` branch on GitHub.
1. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/org/itsallcode/junit5-system-extensions/).
1. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/org/itsallcode/junit5-system-extensions/).
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ private SecurityManager getPreviousSecurityManager(final ExtensionContext contex
return (SecurityManager) context.getStore(getNamespace())
.get(PREVIOUS_SECURITY_MANAGER_KEY);
}
}
}

0 comments on commit d76c38e

Please sign in to comment.