From af91915dd9c0848065f58987ac4ec1924a174e6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:22:53 +0100
Subject: [PATCH] Bump com.fasterxml.jackson:jackson-bom from 2.17.2 to 2.18.2
 (#21063)

* Bump com.fasterxml.jackson:jackson-bom from 2.17.2 to 2.18.2

Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.2 to 2.18.2.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.17.2...jackson-bom-2.18.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson:jackson-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove redundant @JsonCreator annotations

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bernd Ahlers <bernd@users.noreply.github.com>
Co-authored-by: Othello Maurer <othello@graylog.com>
---
 .../retention/strategies/ClosingRetentionStrategyConfig.java  | 4 +---
 .../retention/strategies/DeletionRetentionStrategyConfig.java | 4 +---
 .../retention/strategies/NoopRetentionStrategyConfig.java     | 4 +---
 .../strategies/MessageCountRotationStrategyConfig.java        | 4 +---
 .../rotation/strategies/SizeBasedRotationStrategyConfig.java  | 4 +---
 pom.xml                                                       | 2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/ClosingRetentionStrategyConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/ClosingRetentionStrategyConfig.java
index 538bfeebb489..183e5e66a190 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/ClosingRetentionStrategyConfig.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/ClosingRetentionStrategyConfig.java
@@ -20,13 +20,12 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
+import jakarta.validation.constraints.Min;
 import org.graylog.autovalue.WithBeanGetter;
 import org.graylog2.configuration.ElasticsearchConfiguration;
 import org.graylog2.plugin.indexer.retention.RetentionStrategyConfig;
 import org.graylog2.plugin.rest.ValidationResult;
 
-import jakarta.validation.constraints.Min;
-
 import java.util.Set;
 
 @JsonAutoDetect
@@ -45,7 +44,6 @@ public static ClosingRetentionStrategyConfig create(@JsonProperty(TYPE_FIELD) St
         return new AutoValue_ClosingRetentionStrategyConfig(type, maxNumberOfIndices);
     }
 
-    @JsonCreator
     public static ClosingRetentionStrategyConfig create(@JsonProperty("max_number_of_indices") @Min(1) int maxNumberOfIndices) {
         return new AutoValue_ClosingRetentionStrategyConfig(ClosingRetentionStrategyConfig.class.getCanonicalName(), maxNumberOfIndices);
     }
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/DeletionRetentionStrategyConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/DeletionRetentionStrategyConfig.java
index df07bfdae976..e24094484466 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/DeletionRetentionStrategyConfig.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/DeletionRetentionStrategyConfig.java
@@ -20,13 +20,12 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
+import jakarta.validation.constraints.Min;
 import org.graylog.autovalue.WithBeanGetter;
 import org.graylog2.configuration.ElasticsearchConfiguration;
 import org.graylog2.plugin.indexer.retention.RetentionStrategyConfig;
 import org.graylog2.plugin.rest.ValidationResult;
 
-import jakarta.validation.constraints.Min;
-
 import java.util.Set;
 
 @JsonAutoDetect
@@ -45,7 +44,6 @@ public static DeletionRetentionStrategyConfig create(@JsonProperty(TYPE_FIELD) S
         return new AutoValue_DeletionRetentionStrategyConfig(type, maxNumberOfIndices);
     }
 
-    @JsonCreator
     public static DeletionRetentionStrategyConfig create(@JsonProperty("max_number_of_indices") @Min(1) int maxNumberOfIndices) {
         return new AutoValue_DeletionRetentionStrategyConfig(DeletionRetentionStrategyConfig.class.getCanonicalName(), maxNumberOfIndices);
     }
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/NoopRetentionStrategyConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/NoopRetentionStrategyConfig.java
index b1574b79dcbc..2745308f15c1 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/NoopRetentionStrategyConfig.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/retention/strategies/NoopRetentionStrategyConfig.java
@@ -20,13 +20,12 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
+import jakarta.validation.constraints.Min;
 import org.graylog.autovalue.WithBeanGetter;
 import org.graylog2.configuration.ElasticsearchConfiguration;
 import org.graylog2.plugin.indexer.retention.RetentionStrategyConfig;
 import org.graylog2.plugin.rest.ValidationResult;
 
-import jakarta.validation.constraints.Min;
-
 import java.util.Set;
 
 @JsonAutoDetect
@@ -45,7 +44,6 @@ public static NoopRetentionStrategyConfig create(@JsonProperty(TYPE_FIELD) Strin
         return new AutoValue_NoopRetentionStrategyConfig(type, maxNumberOfIndices);
     }
 
-    @JsonCreator
     public static NoopRetentionStrategyConfig create(@JsonProperty("max_number_of_indices") @Min(1) int maxNumberOfIndices) {
         return new AutoValue_NoopRetentionStrategyConfig(NoopRetentionStrategyConfig.class.getCanonicalName(), maxNumberOfIndices);
     }
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyConfig.java
index 58eb9a82d3e8..01fcc34e3bcd 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyConfig.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyConfig.java
@@ -20,11 +20,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
+import jakarta.validation.constraints.Min;
 import org.graylog.autovalue.WithBeanGetter;
 import org.graylog2.plugin.indexer.rotation.RotationStrategyConfig;
 
-import jakarta.validation.constraints.Min;
-
 @JsonAutoDetect
 @AutoValue
 @WithBeanGetter
@@ -40,7 +39,6 @@ public static MessageCountRotationStrategyConfig create(@JsonProperty(TYPE_FIELD
         return new AutoValue_MessageCountRotationStrategyConfig(type, maxDocsPerIndex);
     }
 
-    @JsonCreator
     public static MessageCountRotationStrategyConfig create(@JsonProperty("max_docs_per_index") @Min(1) int maxDocsPerIndex) {
         return create(MessageCountRotationStrategyConfig.class.getCanonicalName(), maxDocsPerIndex);
     }
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyConfig.java
index 06e6a441b3b6..f01bce4b41aa 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyConfig.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyConfig.java
@@ -21,11 +21,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.joschi.jadconfig.util.Size;
 import com.google.auto.value.AutoValue;
+import jakarta.validation.constraints.Min;
 import org.graylog.autovalue.WithBeanGetter;
 import org.graylog2.plugin.indexer.rotation.RotationStrategyConfig;
 
-import jakarta.validation.constraints.Min;
-
 @JsonAutoDetect
 @AutoValue
 @WithBeanGetter
@@ -41,7 +40,6 @@ public static SizeBasedRotationStrategyConfig create(@JsonProperty(TYPE_FIELD) S
         return new AutoValue_SizeBasedRotationStrategyConfig(type, maxSize);
     }
 
-    @JsonCreator
     public static SizeBasedRotationStrategyConfig create(@JsonProperty("max_size") @Min(1) long maxSize) {
         return create(SizeBasedRotationStrategyConfig.class.getCanonicalName(), maxSize);
     }
diff --git a/pom.xml b/pom.xml
index 89982b8fa7ef..ae01696af81d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
         <hamcrest.version>3.0</hamcrest.version>
         <hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
         <hk2.version>3.1.1</hk2.version> <!-- The HK2 version should match the version being used by Jersey -->
-        <jackson.version>2.17.2</jackson.version>
+        <jackson.version>2.18.2</jackson.version>
         <jadconfig.version>0.15.0</jadconfig.version>
         <java-semver.version>0.10.2</java-semver.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>