Skip to content

Commit

Permalink
Merge branch '2.16' into 2.15
Browse files Browse the repository at this point in the history
  • Loading branch information
k163377 committed May 19, 2023
2 parents 3a906e3 + b48acb4 commit e193ea7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Expand Up @@ -4,15 +4,15 @@ on:
branches:
- master
- "3.0"
- "2.15"
- "2.16"
paths-ignore:
- "README.md"
- "release-notes/*"
pull_request:
branches:
- master
- "3.0"
- "2.15"
- "2.16"
paths-ignore:
- "README.md"
- "release-notes/*"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -227,7 +227,7 @@ ObjectMapper objectMapper = JsonMapper.builder()

Following developers have committer access to this project.

* Author: Jayson Minard (@apatrida) wrote this module; still helps issues from time to time
* Author: Jayson Minard (@apatrida) wrote this module originally (no longer active)
* Active Maintainers:
* Dmitry Spikhalskiy (@Spikhalskiy) -- since 2.14
* Drew Stephens (@dinomite)
Expand All @@ -236,14 +236,14 @@ Following developers have committer access to this project.
* Co-maintainers:
* Tatu Saloranta (@cowtowncoder)

You may at-reference them as necessary but please keep in mind that all
You may at-reference maintainers as necessary but please keep in mind that all
maintenance work is strictly voluntary (no one gets paid to work on this
or any other Jackson components) so there is no guarantee for timeliness of
responses.

All Pull Requests should be reviewed by at least one of active maintainers;
bigger architectural/design questions should be agreed upon by majority of
active maintainers (at this point meaning both Drew and Vyacheslav :) ).
active maintainers.

## Releases & Branches

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Expand Up @@ -8,12 +8,12 @@
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-base</artifactId>
<version>2.15.2-SNAPSHOT</version>
<version>2.16.0-SNAPSHOT</version>
</parent>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<name>jackson-module-kotlin</name>
<version>2.15.2-SNAPSHOT</version>
<version>2.16.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Add-on module for Jackson (https://github.com/FasterXML/jackson/) to support
Kotlin language, specifically introspection of method/constructor parameter names,
Expand Down Expand Up @@ -53,7 +53,7 @@
<connection>scm:git:git@github.com:FasterXML/jackson-module-kotlin.git</connection>
<developerConnection>scm:git:git@github.com:FasterXML/jackson-module-kotlin.git</developerConnection>
<url>https://github.com/FasterXML/jackson-module-kotlin</url>
<tag>jackson-module-kotlin-2.15.1</tag>
<tag>HEAD</tag>
</scm>

<properties>
Expand Down
6 changes: 6 additions & 0 deletions release-notes/VERSION-2.x
Expand Up @@ -16,6 +16,12 @@ Co-maintainers:
=== Releases ===
------------------------------------------------------------------------

2.16.0 (not yet relesed)

No changes since 2.15

2.15.2 (not yet relesed)

#675: Modified to use Converter in Sequence serialization
This change allows serialization-related annotations, such as `JsonSerialize(contentUsing = ...)`, to work on `Sequence`.
Also fixes #674.
Expand Down

0 comments on commit e193ea7

Please sign in to comment.