diff --git a/plugin/pom.xml b/plugin/pom.xml index 9f612612..f5b5fe06 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -111,8 +111,8 @@ workflow-step-api - org.jenkins-ci.plugins - jackson2-api + io.jenkins.plugins + jackson3-api io.jenkins.plugins diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java index 03f55c5b..77cb43ee 100644 --- a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java +++ b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java @@ -4,9 +4,8 @@ import org.apache.commons.lang3.Strings; import org.apache.commons.lang3.exception.ExceptionUtils; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; import edu.hm.hafner.coverage.Coverage; import edu.hm.hafner.coverage.FileNode; @@ -35,6 +34,7 @@ import org.kohsuke.stapler.StaplerRequest2; import org.kohsuke.stapler.StaplerResponse2; import org.kohsuke.stapler.bind.JavaScriptMethod; +import tools.jackson.core.JacksonException; import hudson.model.Api; import hudson.model.ModelObject; import hudson.model.Run; @@ -240,7 +240,7 @@ private ColorProvider createColorProvider(final String json) { Map colorMapping = mapper.readValue(json, new ColorMappingType()); return ColorProviderFactory.createColorProvider(colorMapping); } - catch (JsonProcessingException e) { + catch (JacksonException e) { return ColorProviderFactory.createDefaultColorProvider(); } } diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java index 3796bb22..9ad1bf03 100644 --- a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java +++ b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java @@ -1,8 +1,8 @@ package io.jenkins.plugins.coverage.metrics.steps; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ObjectNode; +import tools.jackson.core.JacksonException; import edu.hm.hafner.coverage.Metric; import edu.hm.hafner.coverage.Value; @@ -80,7 +80,7 @@ Set getVisibleMetrics(final String configuration) { .collect(Collectors.toSet()); } } - catch (JsonProcessingException | ClassCastException | IllegalArgumentException ignored) { + catch (JacksonException | ClassCastException | IllegalArgumentException ignored) { // ignore and return default values }