Skip to content

Commit

Permalink
Bump version.dropwizard from 2.0.29 to 2.1.0
Browse files Browse the repository at this point in the history
Bumps `version.dropwizard` from 2.0.29 to 2.1.0.

Updates `dropwizard-core` from 2.0.29 to 2.1.0

Updates `dropwizard-configuration` from 2.0.29 to 2.1.0

Updates `dropwizard-auth` from 2.0.29 to 2.1.0

Updates `dropwizard-metrics` from 2.0.29 to 2.1.0

Updates `dropwizard-jersey` from 2.0.29 to 2.1.0

Updates `dropwizard-jackson` from 2.0.29 to 2.1.0
 * Avoid registering blackbird module due to race condition bug:
   FasterXML/jackson-modules-base#169

Updates `dropwizard-jetty` from 2.0.29 to 2.1.0

Updates `dropwizard-logging` from 2.0.29 to 2.1.0

Updates `dropwizard-request-logging` from 2.0.29 to 2.1.0

Updates `dropwizard-servlets` from 2.0.29 to 2.1.0

Updates `dropwizard-testing` from 2.0.29 to 2.1.0

Updates `dropwizard-validation` from 2.0.29 to 2.1.0

---
updated-dependencies:
- dependency-name: io.dropwizard:dropwizard-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-configuration
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-auth
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-metrics
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-jersey
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-jackson
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-jetty
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-logging
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-request-logging
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-servlets
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-testing
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: io.dropwizard:dropwizard-validation
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and josephlbarnett committed May 3, 2022
1 parent b39111f commit 3bb122f
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 3 deletions.
16 changes: 16 additions & 0 deletions json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
Expand All @@ -64,6 +76,10 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-guice</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
</dependency>

<dependency>
<groupId>org.threeten</groupId>
Expand Down
24 changes: 22 additions & 2 deletions json/src/main/kotlin/com/trib3/json/ObjectMapperProvider.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@ import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializationFeature
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
import com.fasterxml.jackson.datatype.joda.JodaModule
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
import com.fasterxml.jackson.module.guice.GuiceAnnotationIntrospector
import com.fasterxml.jackson.module.guice.GuiceInjectableValues
import com.fasterxml.jackson.module.kotlin.KotlinModule
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule
import com.google.inject.Injector
import com.trib3.json.ObjectMapperProvider.Companion.OBJECT_MAPPER_MIXINS
import com.trib3.json.jackson.ThreeTenExtraModule
import io.dropwizard.jackson.AnnotationSensitivePropertyNamingStrategy
import io.dropwizard.jackson.CaffeineModule
import io.dropwizard.jackson.FuzzyEnumModule
import io.dropwizard.jackson.GuavaExtrasModule
import io.dropwizard.jackson.Jackson
import java.util.concurrent.TimeUnit
import javax.inject.Inject
Expand Down Expand Up @@ -45,8 +53,20 @@ class ObjectMapperProvider @Inject constructor(
}

override fun get(): ObjectMapper {
val mapper = Jackson.newObjectMapper()
mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
// Start with a minimal mapper, then register everything from Jackson.newObjectMapper()
// EXCEPT blackbird due to a race condition issue:
// https://github.com/FasterXML/jackson-modules-base/issues/169
val mapper = Jackson.newMinimalObjectMapper()
mapper.registerModule(GuavaExtrasModule())
mapper.registerModule(CaffeineModule())
mapper.registerModule(JodaModule())
mapper.registerModule(FuzzyEnumModule())
mapper.registerModule(ParameterNamesModule())
mapper.registerModule(Jdk8Module())
mapper.registerModule(JavaTimeModule())
mapper.propertyNamingStrategy = AnnotationSensitivePropertyNamingStrategy()

// additional leakycauldron configuration:
mapper.disable(DeserializationFeature.FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY)
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
mapper.registerModule(KotlinModule.Builder().build())
Expand Down
16 changes: 15 additions & 1 deletion parent-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<version.config4k>0.4.2</version.config4k>
<version.detekt>1.20.0</version.detekt>
<version.dokka>1.6.10</version.dokka>
<version.dropwizard>2.0.29</version.dropwizard>
<version.dropwizard>2.1.0</version.dropwizard>
<version.dropwizard.hocon>0.5.1</version.dropwizard.hocon>
<version.dropwizard.metrics>4.2.9</version.dropwizard.metrics>
<version.dropwizard.metrics.cloudwatch>2.0.8</version.dropwizard.metrics.cloudwatch>
Expand Down Expand Up @@ -290,6 +290,10 @@
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
Expand All @@ -310,6 +314,10 @@
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -330,6 +338,10 @@
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down Expand Up @@ -1307,6 +1319,8 @@
<exclude>org.apache.logging.log4j:log4j-core</exclude>
<exclude>com.google.inject.extensions:guice-multibindings</exclude>
<exclude>com.authzee.kotlinguice4:*</exclude>
<!-- still use javax.inject until guice migrates -->
<exclude>jakarta.inject:jakarta.inject-api</exclude>
<!-- use jakarta apis instead of javax apis for the following: -->
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
Expand Down

0 comments on commit 3bb122f

Please sign in to comment.