This is an automated email from the ASF dual-hosted git repository. vishalsuvagia pushed a commit to branch feature-AMBARI-26289-master in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
commit 97ad9135d53c07060c0e6ed5d4b13ccbf61ecafb Author: Vishal Suvagia <[email protected]> AuthorDate: Mon Sep 22 15:34:08 2025 +0530 AMBARI-26289 : need to update org.apache.helix : helix-core dependency. Issue : need to update org.apache.helix : helix-core dependency. --- ambari-metrics-common/pom.xml | 23 ++++++-- .../sink/timeline/AbstractTimelineMetricsSink.java | 11 ++-- .../metrics2/sink/timeline/MetricAggregate.java | 6 +-- .../sink/timeline/MetricClusterAggregate.java | 4 +- .../sink/timeline/MetricHostAggregate.java | 4 +- .../metrics2/sink/timeline/TimelineMetric.java | 1 - .../sink/timeline/TimelineMetricMetadata.java | 2 +- ambari-metrics-hadoop-sink/pom.xml | 6 +-- ambari-metrics-host-aggregator/pom.xml | 5 ++ .../host/aggregator/AggregatorWebServiceTest.java | 2 +- ambari-metrics-kafka-sink/pom.xml | 8 +-- ambari-metrics-storm-sink/pom.xml | 18 ++++--- ambari-metrics-timelineservice/pom.xml | 62 +++++++++++++++------- .../metrics/core/loadsimulator/util/Json.java | 12 ++--- .../core/timeline/PhoenixHBaseAccessor.java | 4 +- .../timeline/availability/CheckpointManager.java | 4 +- .../availability/MetricCollectorHAController.java | 2 +- .../core/timeline/sink/HttpSinkProvider.java | 11 ++-- .../metrics/timeline/GenericObjectMapper.java | 6 +-- .../TimelineMetricClusterAggregatorSecondTest.java | 2 +- pom.xml | 5 +- 21 files changed, 121 insertions(+), 77 deletions(-) diff --git a/ambari-metrics-common/pom.xml b/ambari-metrics-common/pom.xml index faedbf01..3da13c22 100644 --- a/ambari-metrics-common/pom.xml +++ b/ambari-metrics-common/pom.xml @@ -120,10 +120,15 @@ </exclusion> </exclusions> </dependency> - <dependency> + <!--<dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> <version>1.9.13</version> + </dependency>--> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -137,9 +142,19 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.databind.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java index ee036ca8..74c5655e 100644 --- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java +++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java @@ -33,10 +33,10 @@ import org.apache.hadoop.metrics2.sink.timeline.availability.MetricCollectorUnav import org.apache.hadoop.metrics2.sink.timeline.availability.MetricSinkWriteShardHostnameHashingStrategy; import org.apache.hadoop.metrics2.sink.timeline.availability.MetricSinkWriteShardStrategy; import org.apache.http.HttpStatus; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; @@ -146,8 +146,7 @@ public abstract class AbstractTimelineMetricsSink { mapper = new ObjectMapper(); AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); - mapper.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); } private final class CollectorShardSupplier implements Supplier<String> { diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricAggregate.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricAggregate.java index 84cba0ea..2e3360dd 100644 --- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricAggregate.java +++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricAggregate.java @@ -20,9 +20,9 @@ package org.apache.hadoop.metrics2.sink.timeline; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricClusterAggregate.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricClusterAggregate.java index 7ef2c1df..cab582e7 100644 --- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricClusterAggregate.java +++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricClusterAggregate.java @@ -18,8 +18,8 @@ package org.apache.hadoop.metrics2.sink.timeline; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; /** * diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricHostAggregate.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricHostAggregate.java index e1909133..fa726407 100644 --- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricHostAggregate.java +++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/MetricHostAggregate.java @@ -18,8 +18,8 @@ package org.apache.hadoop.metrics2.sink.timeline; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Represents a collection of minute based aggregation of values for diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java index a5768c34..deb288a4 100644 --- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java +++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java @@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.codehaus.jackson.map.annotate.JsonDeserialize; @XmlRootElement(name = "metric") @XmlAccessorType(XmlAccessType.NONE) diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetricMetadata.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetricMetadata.java index b1266b1a..b26b3e10 100644 --- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetricMetadata.java +++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetricMetadata.java @@ -21,7 +21,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics-hadoop-sink/pom.xml index af23ccdb..50eaa706 100644 --- a/ambari-metrics-hadoop-sink/pom.xml +++ b/ambari-metrics-hadoop-sink/pom.xml @@ -146,9 +146,9 @@ limitations under the License. <scope>compile</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.databind.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/ambari-metrics-host-aggregator/pom.xml b/ambari-metrics-host-aggregator/pom.xml index 130054ec..e39f3861 100644 --- a/ambari-metrics-host-aggregator/pom.xml +++ b/ambari-metrics-host-aggregator/pom.xml @@ -118,6 +118,11 @@ <artifactId>jetty-webapp</artifactId> <version>9.4.57.v20241219</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> </dependencies> <build> diff --git a/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java b/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java index 0f15c208..fc7f5b20 100644 --- a/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java +++ b/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java @@ -28,9 +28,9 @@ import com.sun.jersey.test.framework.spi.container.TestContainerFactory; import com.sun.jersey.test.framework.spi.container.grizzly2.GrizzlyTestContainerFactory; import junit.framework.Assert; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; import org.junit.Test; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import javax.ws.rs.core.MediaType; diff --git a/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics-kafka-sink/pom.xml index cd78b98e..52ff19a1 100644 --- a/ambari-metrics-kafka-sink/pom.xml +++ b/ambari-metrics-kafka-sink/pom.xml @@ -43,7 +43,7 @@ limitations under the License. <goal>copy-dependencies</goal> </goals> <configuration> - <includeArtifactIds>commons-codec,commons-collections,commons-lang,commons-logging,jackson-core-asl,jackson-mapper-asl,jackson-xc</includeArtifactIds> + <includeArtifactIds>commons-codec,commons-collections,commons-lang,commons-logging,jackson-core,jackson-databind,jackson-xc</includeArtifactIds> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> </execution> @@ -156,9 +156,9 @@ limitations under the License. <version>2.6</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.databind.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/ambari-metrics-storm-sink/pom.xml b/ambari-metrics-storm-sink/pom.xml index 2c3ae202..3724e9da 100644 --- a/ambari-metrics-storm-sink/pom.xml +++ b/ambari-metrics-storm-sink/pom.xml @@ -70,9 +70,9 @@ limitations under the License. <artifactSet> <includes> <include>org.apache.ambari:ambari-metrics-common</include> - <include>org.codehaus.jackson:jackson-mapper-asl</include> - <include>org.codehaus.jackson:jackson-core-asl</include> - <include>org.codehaus.jackson:jackson-xc</include> + <include>com.fasterxml.jackson.core:jackson-databind</include> + <include>com.fasterxml.jackson.core:jackson-core</include> + <include>com.fasterxml.jackson.core:jackson-annotations</include> <include>org.apache.hadoop:hadoop-annotations</include> <include>commons-logging:commons-logging</include> <include>org.apache.commons:commons-lang3</include> @@ -88,9 +88,13 @@ limitations under the License. <pattern>org.apache.hadoop.classification</pattern> <shadedPattern>org.apache.hadoop.metrics2.sink.relocated.hadoop.classification</shadedPattern> </relocation> - <relocation> + <!--<relocation> <pattern>org.codehaus.jackson</pattern> <shadedPattern>org.apache.hadoop.metrics2.sink.relocated.jackson</shadedPattern> + </relocation>--> + <relocation> + <pattern>com.fasterxml.jackson</pattern> + <shadedPattern>org.apache.ambari.metrics.sink.relocated.jackson</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.lang3</pattern> @@ -153,9 +157,9 @@ limitations under the License. <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.databind.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/ambari-metrics-timelineservice/pom.xml b/ambari-metrics-timelineservice/pom.xml index 6494d9b1..2dd5753f 100644 --- a/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics-timelineservice/pom.xml @@ -269,20 +269,15 @@ <dependency> <groupId>org.apache.helix</groupId> <artifactId>helix-core</artifactId> - <version>0.6.6</version> + <version>1.4.3</version> <exclusions> - <!-- zkclient is helix-core dependency but it need to be 0.9 in order for AMS HA to work on secure cluster--> - <exclusion> - <artifactId>zkclient</artifactId> - <groupId>com.101tec</groupId> - </exclusion> <exclusion> <artifactId>zookeeper</artifactId> <groupId>org.apache.zookeeper</groupId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> </exclusion> <exclusion> <groupId>org.yaml</groupId> @@ -290,12 +285,6 @@ </exclusion> </exclusions> </dependency> - <!-- zkclient is helix-core dependency but it need to be 0.9 in order for AMS HA to work on secure cluster--> - <dependency> - <groupId>com.101tec</groupId> - <artifactId>zkclient</artifactId> - <version>0.9</version> - </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> @@ -457,6 +446,20 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-json</artifactId> <version>1.11</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey.contribs</groupId> @@ -472,6 +475,20 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> <version>1.11</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey</groupId> @@ -676,9 +693,9 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.9</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> @@ -694,9 +711,9 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.databind.version}</version> </dependency> <dependency> @@ -878,6 +895,11 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.1.1</version> + </dependency> </dependencies> <profiles> diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/util/Json.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/util/Json.java index 3e186a17..c4f4e73f 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/util/Json.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/util/Json.java @@ -19,10 +19,10 @@ package org.apache.ambari.metrics.core.loadsimulator.util; import java.io.IOException; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonMethod; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; /** * Small wrapper that configures the ObjectMapper with some defaults. @@ -45,9 +45,9 @@ public class Json { */ public Json(boolean pretty) { myObjectMapper = new ObjectMapper(); - myObjectMapper.setVisibility(JsonMethod.FIELD, JsonAutoDetect.Visibility.ANY); + myObjectMapper.setVisibility(PropertyAccessor.FIELD,JsonAutoDetect.Visibility.ANY); if (pretty) { - myObjectMapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); + myObjectMapper.configure(SerializationFeature.INDENT_OUTPUT, true); } } diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/PhoenixHBaseAccessor.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/PhoenixHBaseAccessor.java index cf976dd6..38088fe4 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/PhoenixHBaseAccessor.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/PhoenixHBaseAccessor.java @@ -156,8 +156,8 @@ import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.phoenix.exception.PhoenixIOException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.Multimap; diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/CheckpointManager.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/CheckpointManager.java index 868fb931..595e645e 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/CheckpointManager.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/CheckpointManager.java @@ -17,12 +17,12 @@ */ package org.apache.ambari.metrics.core.timeline.availability; -import org.I0Itec.zkclient.DataUpdater; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.DataUpdater; import org.apache.zookeeper.data.Stat; public class CheckpointManager { diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/MetricCollectorHAController.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/MetricCollectorHAController.java index a5d43180..01b1c6ea 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/MetricCollectorHAController.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/availability/MetricCollectorHAController.java @@ -30,7 +30,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.I0Itec.zkclient.exception.ZkNoNodeException; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,6 +48,7 @@ import org.apache.helix.model.ExternalView; import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.LiveInstance; import org.apache.helix.model.OnlineOfflineSMD; +import org.apache.helix.zookeeper.zkclient.exception.ZkNoNodeException; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/sink/HttpSinkProvider.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/sink/HttpSinkProvider.java index cbb08341..c6f4ae88 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/sink/HttpSinkProvider.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/sink/HttpSinkProvider.java @@ -43,10 +43,10 @@ import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration; import org.apache.ambari.metrics.core.timeline.source.InternalSourceProvider; import org.apache.http.client.utils.URIBuilder; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; public class HttpSinkProvider implements ExternalSinkProvider { private static final Log LOG = LogFactory.getLog(HttpSinkProvider.class); @@ -60,8 +60,7 @@ public class HttpSinkProvider implements ExternalSinkProvider { mapper = new ObjectMapper(); AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); - mapper.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); } public HttpSinkProvider() { diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/timeline/GenericObjectMapper.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/timeline/GenericObjectMapper.java index b802a887..c562f44a 100644 --- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/timeline/GenericObjectMapper.java +++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/timeline/GenericObjectMapper.java @@ -21,9 +21,9 @@ import java.io.IOException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.ObjectWriter; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; /** * A utility class providing methods for serializing and deserializing diff --git a/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecondTest.java b/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecondTest.java index e44845b9..f3c01d26 100644 --- a/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecondTest.java +++ b/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecondTest.java @@ -40,7 +40,7 @@ import org.apache.hadoop.metrics2.sink.timeline.MetricClusterAggregate; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.ambari.metrics.core.timeline.discovery.TimelineMetricMetadataKey; import org.apache.ambari.metrics.core.timeline.discovery.TimelineMetricMetadataManager; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import junit.framework.Assert; diff --git a/pom.xml b/pom.xml index 35ca644c..ad86e5c6 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,9 @@ <distMgmtStagingId>apache.staging.https</distMgmtStagingId> <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName> <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl> - <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version> - <skipPythonTests>false</skipPythonTests> + <fasterxml.jackson.version>2.17.3</fasterxml.jackson.version> + <fasterxml.jackson.databind.version>2.17.3</fasterxml.jackson.databind.version> + <skipPythonTests>false</skipPythonTests> <release.version>1</release.version> </properties> <distributionManagement> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
