Skip to content

Commit 0d03137

Browse files
committed
Minor tweaks after #596 (rename com.fasterxml.jackson -> tools.jackson)
1 parent efc745e commit 0d03137

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and those with secondary constructors or static factories are also supported.
1010

1111
# Status
1212

13+
* release `2.14.0` (for Jackson `2.14.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.14)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.14)
1314
* release `2.13.4` (for Jackson `2.13.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.13)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.13)
1415
* release `2.12.7` (for Jackson `2.12.x`) [![CircleCI](https://circleci.com/gh/FasterXML/jackson-module-kotlin/tree/2.12.svg?style=svg)](https://circleci.com/gh/FasterXML/jackson-module-kotlin/tree/2.12)
1516
* release `2.11.4` (for Jackson `2.11.x`) [![CircleCI](https://circleci.com/gh/FasterXML/jackson-module-kotlin/tree/2.11.svg?style=svg)](https://circleci.com/gh/FasterXML/jackson-module-kotlin/tree/2.11)
@@ -19,15 +20,15 @@ Releases require that you have included Kotlin stdlib and reflect libraries alre
1920

2021
Gradle:
2122
```
22-
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.+"
23+
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.14.+"
2324
```
2425

2526
Maven:
2627
```xml
2728
<dependency>
2829
<groupId>tools.jackson.module</groupId>
2930
<artifactId>jackson-module-kotlin</artifactId>
30-
<version>2.13.4</version>
31+
<version>2.14.0</version>
3132
</dependency>
3233
```
3334

@@ -256,8 +257,8 @@ See the [main Jackson contribution guidlines](https://github.com/FasterXML/jacks
256257

257258
If you are going to write code, choose the appropriate base branch:
258259

259-
- `2.12` for bugfixes against the current stable version
260-
- `2.13` for additive functionality & features or [minor](https://semver.org), backwards compatible changes to existing behavior to be included in the next minor version release
260+
- `2.14` for bugfixes against the current stable version
261+
- `2.15` for additive functionality & features or [minor](https://semver.org), backwards compatible changes to existing behavior to be included in the next minor version release
261262
- `master` for significant changes to existing behavior, which will be part of Jackson 3.0
262263

263264
### Failing tests

pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<artifactId>jackson-base</artifactId>
1212
<version>3.0.0-SNAPSHOT</version>
1313
</parent>
14-
<groupId>com.fasterxml.jackson.module</groupId>
14+
<groupId>tools.jackson.module</groupId>
1515
<artifactId>jackson-module-kotlin</artifactId>
1616
<name>jackson-module-kotlin</name>
1717
<version>3.0.0-SNAPSHOT</version>
@@ -65,7 +65,8 @@
6565
<!-- Configuration properties for the OSGi maven-bundle-plugin -->
6666
<osgi.includeResource>src/main/resources/, META-INF=target/classes/META-INF</osgi.includeResource>
6767
<osgi.import>
68-
com.fasterxml.jackson.*
68+
com.fasterxml.jackson.annotation.*
69+
,tools.jackson.*
6970
,kotlin.*
7071
,kotlin.reflect.*
7172
</osgi.import>
@@ -188,7 +189,7 @@
188189
<configuration>
189190
<oldVersion>
190191
<dependency>
191-
<groupId>com.fasterxml.jackson.module</groupId>
192+
<groupId>tools.jackson.module</groupId>
192193
<artifactId>jackson-module-kotlin</artifactId>
193194
<version>3.0.0-SNAPSHOT</version>
194195
<type>jar</type>
@@ -236,4 +237,4 @@
236237
<snapshots><enabled>true</enabled></snapshots>
237238
</repository>
238239
</repositories>
239-
</project>
240+
</project>

src/main/kotlin/tools/jackson/module/kotlin/KotlinModule.kt

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package tools.jackson.module.kotlin
22

3-
import tools.jackson.core.json.PackageVersion
3+
import java.util.*
4+
5+
import kotlin.reflect.KClass
6+
47
import tools.jackson.databind.MapperFeature
58
import tools.jackson.databind.module.SimpleModule
9+
610
import tools.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault
711
import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection
812
import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyMap
913
import tools.jackson.module.kotlin.KotlinFeature.StrictNullChecks
1014
import tools.jackson.module.kotlin.SingletonSupport.CANONICALIZE
1115
import tools.jackson.module.kotlin.SingletonSupport.DISABLED
12-
import java.util.*
13-
import kotlin.reflect.KClass
1416

1517
private const val metadataFqName = "kotlin.Metadata"
1618

@@ -54,7 +56,7 @@ class KotlinModule @Deprecated(
5456
val nullIsSameAsDefault: Boolean = false,
5557
val singletonSupport: SingletonSupport = DISABLED,
5658
val strictNullChecks: Boolean = false
57-
) : SimpleModule(KotlinModule::class.java.name, PackageVersion.VERSION) {
59+
) : SimpleModule(KotlinModule::class.java.name, tools.jackson.module.kotlin.PackageVersion.VERSION) {
5860
@Deprecated(level = DeprecationLevel.HIDDEN, message = "For ABI compatibility")
5961
constructor(
6062
reflectionCacheSize: Int,

0 commit comments

Comments
 (0)