Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !4176

Update to jackson-datatype-threetenbp 2.9.10

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/joschi/jackson-datatype-threetenbp-2.9.10 into master 5 years ago
  • Overview 0
  • Commits 4
  • Pipelines 0
  • Changes 104

Created by: joschi

Update the Jackson datatype support for ThreeTen to the latest version working with Jackson 2.9.10.

This way, there should be only minimal differences between the generated code when when using ThreeTen backport vs. not using ThreeTen backport.

swagger-api/swagger-codegen-generators#489 swagger-api/swagger-codegen#9748

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before .
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
Compare
  • master (base)

and
  • latest version
    ff8ee050
    4 commits, 2 years ago

104 files
+ 140
- 212

    Preferences

    File browser
    Compare changes
modules/open‎api-generator‎
src/main/‎resources‎
Ja‎va‎
libr‎aries‎
fe‎ign‎
build.grad‎le.mustache‎ +2 -2
build.sbt‎.mustache‎ +2 -2
pom.mu‎stache‎ +1 -1
google-a‎pi-client‎
build.grad‎le.mustache‎ +1 -1
build.sbt‎.mustache‎ +4 -4
pom.mu‎stache‎ +1 -1
jer‎sey2‎
build.grad‎le.mustache‎ +1 -1
build.sbt‎.mustache‎ +3 -3
pom.mu‎stache‎ +1 -1
okhtt‎p-gson‎
build.grad‎le.mustache‎ +1 -1
build.sbt‎.mustache‎ +1 -1
pom.mu‎stache‎ +1 -1
rest-a‎ssured‎
build.grad‎le.mustache‎ +3 -3
build.sbt‎.mustache‎ +1 -1
pom.mu‎stache‎ +4 -4
rest‎easy‎
build.grad‎le.mustache‎ +1 -1
build.sbt‎.mustache‎ +3 -3
pom.mu‎stache‎ +1 -1
restte‎mplate‎
build.grad‎le.mustache‎ +1 -1
pom.mu‎stache‎ +3 -3
retr‎ofit‎
build.grad‎le.mustache‎ +1 -1
build.sbt‎.mustache‎ +1 -1
pom.mu‎stache‎ +1 -1
retr‎ofit2‎
build.grad‎le.mustache‎ +1 -1
build.sbt‎.mustache‎ +1 -1
pom.mu‎stache‎ +1 -1
ve‎rtx‎
build.grad‎le.mustache‎ +2 -2
pom.mu‎stache‎ +2 -2
CustomInstantDese‎rializer.mustache‎ +2 -2
build.grad‎le.mustache‎ +2 -2
JavaSpring/libra‎ries/spring-cloud‎
pom.mu‎stache‎ +1 -1
java-‎pkmst‎
pom.mu‎stache‎ +1 -1
kotlin‎-client‎
build.grad‎le.mustache‎ +1 -1
pom‎.xml‎ +2 -2
sam‎ples‎
client/‎petstore‎
ja‎va‎
fe‎ign‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +2 -2
buil‎d.sbt‎ +2 -2
pom‎.xml‎ +1 -1
feig‎n10x‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +2 -2
buil‎d.sbt‎ +2 -2
pom‎.xml‎ +1 -1
google-a‎pi-client‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
jer‎sey1‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +2 -2
jer‎sey2‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
jersey‎2-java6‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
jersey‎2-java8‎
buil‎d.sbt‎ +1 -1
okhtt‎p-gson‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
okhttp-gson-p‎arcelableModel‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
rest-a‎ssured‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
rest‎easy‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +2 -2
pom‎.xml‎ +1 -1
restte‎mplate‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +1 -1
pom‎.xml‎ +3 -3
resttempla‎te-withXml‎
src/main/java/org/‎openapitools/client‎
CustomInstantDe‎serializer.java‎ +2 -2
build.‎gradle‎ +1 -1
pom‎.xml‎ +3 -3
retr‎ofit2‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
retrofit‎2-play25‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
retrofit‎2-play26‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
retro‎fit2rx‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
retrof‎it2rx2‎
build.‎gradle‎ +1 -1
buil‎d.sbt‎ +1 -1
pom‎.xml‎ +1 -1
kotlin-t‎hreetenbp‎
build.‎gradle‎ +1 -1
openapi3/client‎/petstore/kotlin‎
.openapi-‎generator‎
VER‎SION‎ +1 -1
do‎cs‎
HasOnlyRe‎adOnly.md‎ +2 -2
Nam‎e.md‎ +2 -2
ReadOnly‎First.md‎ +1 -1
src/main/kotlin/org‎/openapitools/client‎
infrast‎ructure‎
ApiCli‎ent.kt‎ +1 -1
ResponseEx‎tensions.kt‎ +1 -1
mod‎els‎
EnumAr‎rays.kt‎ +0 -12
EnumT‎est.kt‎ +0 -24
InlineOb‎ject2.kt‎ +0 -13
MapTe‎st.kt‎ +0 -7
Orde‎r.kt‎ +0 -8
Pet‎.kt‎ +0 -8
build.‎gradle‎ +1 -1
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
+ 2
- 2
  • View file @ ff8ee050

  • Edit in single-file editor

  • Open in Web IDE


@@ -124,7 +124,7 @@ ext {
@@ -124,7 +124,7 @@ ext {
jackson_databind_version = "2.9.10"
jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0"
jackson_databind_nullable_version = "0.2.0"
{{#threetenbp}}
{{#threetenbp}}
threepane_version = "2.6.4"
jackson_threetenbp_version = "2.9.10"
{{/threetenbp}}
{{/threetenbp}}
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
feign_form_version = "2.1.0"
feign_form_version = "2.1.0"
@@ -150,7 +150,7 @@ dependencies {
@@ -150,7 +150,7 @@ dependencies {
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}}
{{/java8}}
{{#threetenbp}}
{{#threetenbp}}
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
{{/threetenbp}}
{{/threetenbp}}
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2"
compile "com.brsanthu:migbase64:2.2"
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
+ 2
- 2
  • View file @ ff8ee050

  • Edit in single-file editor

  • Open in Web IDE


@@ -17,8 +17,8 @@ lazy val root = (project in file(".")).
@@ -17,8 +17,8 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.12" % "test",
modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
+ 1
- 1
  • View file @ ff8ee050

  • Edit in single-file editor

  • Open in Web IDE


@@ -318,7 +318,7 @@
@@ -318,7 +318,7 @@
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-version>2.9.10</jackson-databind-version>
{{#threetenbp}}
{{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}}
{{/threetenbp}}
<junit-version>4.12</junit-version>
<junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
+ 1
- 1
  • View file @ ff8ee050

  • Edit in single-file editor

  • Open in Web IDE


@@ -128,7 +128,7 @@ ext {
@@ -128,7 +128,7 @@ ext {
jodatime_version = "2.9.9"
jodatime_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.12"
{{#threetenbp}}
{{#threetenbp}}
jackson_threeten_version = "2.6.4"
jackson_threeten_version = "2.9.10"
{{/threetenbp}}
{{/threetenbp}}
}
}
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
+ 4
- 4
  • View file @ ff8ee050

  • Edit in single-file editor

  • Open in Web IDE


@@ -16,16 +16,16 @@ lazy val root = (project in file(".")).
@@ -16,16 +16,16 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
{{#withXml}}
{{#withXml}}
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.9" % "compile",
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.10" % "compile",
{{/withXml}}
{{/withXml}}
{{#joda}}
{{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
{{/joda}}
{{/joda}}
{{#java8}}
{{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
{{/java8}}
{{/java8}}
{{#threetenbp}}
{{#threetenbp}}
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
{{/threetenbp}}
{{/threetenbp}}
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
"com.novocode" % "junit-interface" % "0.10" % "test"
0 Assignees
None
Assign to
0 Reviewers
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
Lock merge request
Unlocked
1
1 participant
Administrator
Reference:
Source branch: github/fork/joschi/jackson-datatype-threetenbp-2.9.10

Menu

Explore Projects Groups Snippets