revert unneeded; update unit test

Graylog2 · Jul 20, 2022 · c73551d · c73551d
1 parent 3fceda7
commit c73551d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
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
@@ -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/...og2-server/src/main/java/org/graylog2/shared/bindings/providers/ObjectMapperProvider.java b/...og2-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/...rc/test/java/org/graylog2/migrations/V2018070614390000_EnforceUniqueGrokPatternsTest.java b/...rc/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
@@ -136,8 +136,8 @@
         <log4j.version>2.17.1</log4j.version>
         <lucene.version>8.11.2</lucene.version>
         <metrics.version>4.1.9</metrics.version>
-        <mongodb-driver.version>3.12.1</mongodb-driver.version>
-        <mongojack.version>2.10.1.1</mongojack.version>
+        <mongodb-driver.version>3.12.11</mongodb-driver.version>
+        <mongojack.version>2.10.1.1-SNAPSHOT</mongojack.version>
         <natty.version>0.13</natty.version>
         <netty.version>4.1.60.Final</netty.version>
         <netty-tcnative-boringssl-static.version>2.0.36.Final</netty-tcnative-boringssl-static.version>