diff --git a/graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionDto.java b/graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionDto.java index 108fe13c9530..c3719cd1da56 100644 --- a/graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionDto.java +++ b/graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionDto.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.auto.value.AutoValue; diff --git a/graylog2-server/src/main/java/org/graylog2/shared/bindings/providers/ObjectMapperProvider.java b/graylog2-server/src/main/java/org/graylog2/shared/bindings/providers/ObjectMapperProvider.java index 31ee4c44b26f..d244e582fb59 100644 --- a/graylog2-server/src/main/java/org/graylog2/shared/bindings/providers/ObjectMapperProvider.java +++ b/graylog2-server/src/main/java/org/graylog2/shared/bindings/providers/ObjectMapperProvider.java @@ -111,7 +111,6 @@ public ObjectMapperProvider(@GraylogClassLoader final ClassLoader classLoader, .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE) .disable(DeserializationFeature.FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY) -// .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS) .setPropertyNamingStrategy(new PropertyNamingStrategy.SnakeCaseStrategy()) .setSubtypeResolver(subtypeResolver) .setTypeFactory(typeFactory) diff --git a/graylog2-server/src/test/java/org/graylog2/migrations/V2018070614390000_EnforceUniqueGrokPatternsTest.java b/graylog2-server/src/test/java/org/graylog2/migrations/V2018070614390000_EnforceUniqueGrokPatternsTest.java index 620faf4d1f8d..8b7fe33c7d84 100644 --- a/graylog2-server/src/test/java/org/graylog2/migrations/V2018070614390000_EnforceUniqueGrokPatternsTest.java +++ b/graylog2-server/src/test/java/org/graylog2/migrations/V2018070614390000_EnforceUniqueGrokPatternsTest.java @@ -112,7 +112,7 @@ public void insertingDuplicateGrokPatternsIsNotPossibleAfterUpgrade() { assertThatThrownBy(() -> collection.insertOne(grokPattern("FOO", "[a-z]+"))) .isInstanceOf(MongoWriteException.class) - .hasMessageMatching("E11000 duplicate key error collection: graylog.grok_patterns index: idx_name_asc_unique dup key: \\{ (name)?: \"FOO\" \\}"); + .hasMessageContaining("E11000 duplicate key error collection: graylog.grok_patterns index: idx_name_asc_unique dup key"); } private Document grokPattern(String name, String pattern) { diff --git a/pom.xml b/pom.xml index 3a42e5cad180..f76a777982b6 100644 --- a/pom.xml +++ b/pom.xml @@ -136,8 +136,8 @@ 2.17.1 8.11.2 4.1.9 - 3.12.1 - 2.10.1.1 + 3.12.11 + 2.10.1.1-SNAPSHOT 0.13 4.1.60.Final 2.0.36.Final