Skip to content

Commit 338354f

Browse files
authored
Merge pull request #1035 from k163377/fix-readme-3.x
Fix README
2 parents 995be6e + 6d989e9 commit 338354f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Thanks for submitting a pull request! Please ensure that you have based your cod
22

33
- The current stable release branch for bugfixes of limited scope
44
- The upcoming [minor](https://semver.org) release branch for backwards compatible changes to existing functionality or addition of new functionality
5-
- `master` for significant changes to existing behavior
5+
- `3.x` for significant changes to existing behavior
66

77
If you're unsure which branch to use, open an [issue](https://github.com/FasterXML/jackson-module-kotlin/issues) and ask, we're happy to talk over proposed changes.
88

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ when(root){
190190
# Configuration
191191

192192
The Kotlin module may be given a few configuration parameters at construction time;
193-
see the [inline documentation](https://github.com/FasterXML/jackson-module-kotlin/blob/master/src/main/kotlin/tools/jackson/module/kotlin/KotlinModule.kt)
193+
see the [inline documentation](https://github.com/FasterXML/jackson-module-kotlin/blob/3.x/src/main/kotlin/tools/jackson/module/kotlin/KotlinModule.kt)
194194
for details on what options are available and what they do.
195195

196196
```kotlin
@@ -247,7 +247,7 @@ across all Jackson components & modules. See the [jackson-databind README](https
247247

248248
We welcome any contributions—reports of issues, ideas for enhancements, and pull requests related to either of those.
249249

250-
See the [main Jackson contribution guidelines](https://github.com/FasterXML/jackson/blob/master/CONTRIBUTING.md) for more details.
250+
See the [main Jackson contribution guidelines](https://github.com/FasterXML/jackson/blob/3.x/CONTRIBUTING.md) for more details.
251251

252252
### Branches
253253

@@ -259,11 +259,11 @@ If you are going to write code, choose the appropriate base branch:
259259

260260
### Failing tests
261261

262-
There are a number of tests for functionality that is broken, mostly in the [failing](https://github.com/FasterXML/jackson-module-kotlin/tree/master/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing)
262+
There are a number of tests for functionality that is broken, mostly in the [failing](https://github.com/FasterXML/jackson-module-kotlin/tree/3.x/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing)
263263
package but a few as part of other test suites. Instead of ignoring these tests (with JUnit's `@Ignore` annotation)
264264
or excluding them from being run as part of automated testing, the tests are written to demonstrate the failure
265265
(either making a call that throws an exception or with an assertion that fails) but not fail the build, except if the
266266
underlying issue is fixed. This allows us to know when the tested functionality has been incidentally fixed by
267267
unrelated code changes.
268268

269-
See the [tests readme](https://github.com/FasterXML/jackson-module-kotlin/tree/master/src/test/kotlin/com/fasterxml/jackson/module/kotlin/README.md) for more information.
269+
See the [tests readme](https://github.com/FasterXML/jackson-module-kotlin/tree/3.x/src/test/kotlin/com/fasterxml/jackson/module/kotlin/README.md) for more information.

0 commit comments

Comments
 (0)