From 32394e55f92962c08fdcfb96b9b603309ec3e691 Mon Sep 17 00:00:00 2001 From: Nandini Anagondi <91892829+naanagon@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:25:47 +0530 Subject: [PATCH] Upgrading org.codehaus to com.fasterxml (#17371) --- indexing-service/pom.xml | 5 ----- .../indexing/common/task/NativeCompactionRunner.java | 2 +- pom.xml | 11 ++++++++--- rewrite.yml | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 4bc044182f5..2f348e3d483 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -185,11 +185,6 @@ datasketches-memory provided - - org.codehaus.jackson - jackson-core-asl - provided - org.apache.commons commons-collections4 diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/NativeCompactionRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/NativeCompactionRunner.java index 541f24fe088..89eb331df49 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/NativeCompactionRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/NativeCompactionRunner.java @@ -20,6 +20,7 @@ package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JacksonInject; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.annotations.VisibleForTesting; @@ -43,7 +44,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.server.coordinator.CompactionConfigValidationResult; import org.apache.druid.server.coordinator.duty.CompactSegments; import org.apache.druid.utils.CollectionUtils; -import org.codehaus.jackson.annotate.JsonCreator; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/pom.xml b/pom.xml index 52cfca70287..a2d7c2aa3f0 100644 --- a/pom.xml +++ b/pom.xml @@ -1380,7 +1380,7 @@ org.openrewrite.maven rewrite-maven-plugin - 5.31.0 + 5.42.0 org.apache.druid.RewriteRules @@ -1399,12 +1399,17 @@ org.openrewrite.recipe rewrite-testing-frameworks - 2.6.0 + 2.20.0 org.openrewrite.recipe rewrite-apache - 1.2.2 + 1.8.0 + + + org.openrewrite.recipe + rewrite-jackson + 0.6.0 diff --git a/rewrite.yml b/rewrite.yml index dd375719a94..551e279c91b 100644 --- a/rewrite.yml +++ b/rewrite.yml @@ -21,6 +21,7 @@ recipeList: obsoleteRunners: - org.junit.experimental.runners.Enclosed - org.openrewrite.apache.commons.lang.UpgradeApacheCommonsLang_2_3 + - org.openrewrite.java.jackson.CodehausToFasterXML --- type: specs.openrewrite.org/v1beta/recipe name: org.apache.druid.UpgradeCalciteTestsToJunit5