Skip to content

Commit 6b30128

Browse files
author
Jonas von Andrian
committed
Breaking: use jackson 3 to parse
1 parent 1c737b7 commit 6b30128

101 files changed

Lines changed: 293 additions & 274 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111

12-
name: Build with Java 11
12+
name: Build with Java 21
1313

1414
steps:
1515
- name: checkout
@@ -21,11 +21,11 @@ jobs:
2121
- name: Validate Gradle wrapper
2222
uses: gradle/actions/wrapper-validation@v4
2323

24-
- name: Set up JDK 11
24+
- name: Set up JDK 21
2525
uses: actions/setup-java@v4
2626
with:
2727
distribution: temurin
28-
java-version: 11
28+
java-version: 21
2929

3030
- name: gradle build
3131
run: ./gradlew build --stacktrace

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
- name: Validate Gradle wrapper
2222
uses: gradle/actions/wrapper-validation@v4
2323

24-
- name: Set up JDK 8
24+
- name: Set up JDK 21
2525
uses: actions/setup-java@v4
2626
with:
2727
distribution: temurin
28-
java-version: 11
28+
java-version: 21
2929

3030
- name: gradle publishToSonatype closeAndReleaseSonatypeStagingRepository
3131
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --stacktrace

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
kotlin {
10-
jvmToolchain(11)
10+
jvmToolchain(21)
1111
}
1212

1313
java {
@@ -21,9 +21,9 @@ group = "io.github.lancomsystems.openapi.parser"
2121
version = libraryVersion
2222

2323
dependencies {
24-
implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
25-
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1")
26-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
24+
implementation("tools.jackson.core:jackson-databind:3.0.4")
25+
implementation("tools.jackson.dataformat:jackson-dataformat-yaml:3.0.4")
26+
implementation("tools.jackson.module:jackson-module-kotlin:3.0.4")
2727
testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.3")
2828
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.3")
2929
}

‎codegen/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
}
99

1010
kotlin {
11-
jvmToolchain(11)
11+
jvmToolchain(21)
1212
}
1313

1414
val wrapper by tasks.creating

‎codegen/src/main/kotlin/de/lancom/openapi/codegen/type/SimpleType.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data class SimpleType(
1919
val jsonNode = SimpleType(
2020
type = "JsonNode",
2121
imports = setOf(
22-
"com.fasterxml.jackson.databind.JsonNode",
22+
"tools.jackson.databind.JsonNode",
2323
),
2424
)
2525

‎codegen/src/main/kotlin/de/lancom/openapi/codegen/view/OpenApiEntity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ class OpenApiEntity(
135135

136136
companion object {
137137
val staticImports = listOf(
138-
"com.fasterxml.jackson.databind.annotation.JsonDeserialize",
139-
"com.fasterxml.jackson.databind.annotation.JsonSerialize",
138+
"tools.jackson.databind.annotation.JsonDeserialize",
139+
"tools.jackson.databind.annotation.JsonSerialize",
140140
"de.lancom.openapi.common.types.*",
141141
"de.lancom.openapi.common.util.*",
142142
"de.lancom.openapi.parser.field.Field",

‎codegen/src/main/resources/templates/enum-class.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{{>banner}}
22
package de.lancom.openapi.common.types
33

4-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
5-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
4+
import tools.jackson.databind.annotation.JsonDeserialize
5+
import tools.jackson.databind.annotation.JsonSerialize
66
import de.lancom.openapi.common.jackson.JsonWrapper
77
import de.lancom.openapi.common.jackson.JsonWrapperCompanion
88

‎renovate.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"commitMessagePrefix": "Upgrade: ",
44
"packageRules": [
55
{
6-
"groupName": "com.fasterxml.jackson",
6+
"groupName": "tools.jackson",
77
"matchPackagePrefixes": [
8-
"com.fasterxml.jackson"
8+
"tools.jackson"
99
]
1010
}
1111
],

‎src/generated/kotlin/de/lancom/openapi/common/types/ComponentType.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*****************************************************************************/
77
package de.lancom.openapi.common.types
88

9-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
10-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
9+
import tools.jackson.databind.annotation.JsonDeserialize
10+
import tools.jackson.databind.annotation.JsonSerialize
1111
import de.lancom.openapi.common.jackson.JsonWrapper
1212
import de.lancom.openapi.common.jackson.JsonWrapperCompanion
1313

‎src/generated/kotlin/de/lancom/openapi/common/types/HeaderStyle.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*****************************************************************************/
77
package de.lancom.openapi.common.types
88

9-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
10-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
9+
import tools.jackson.databind.annotation.JsonDeserialize
10+
import tools.jackson.databind.annotation.JsonSerialize
1111
import de.lancom.openapi.common.jackson.JsonWrapper
1212
import de.lancom.openapi.common.jackson.JsonWrapperCompanion
1313

0 commit comments

Comments
 (0)