diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml index c70262787d..5a34540c23 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml @@ -56,21 +56,6 @@ org.apache.nifi nifi-kerberos-credentials-service-api - - - - commons-beanutils - commons-beanutils - 1.9.4 - - - commons-logging - commons-logging - - - - org.apache.atlas atlas-client-v2 @@ -90,28 +75,9 @@ - - org.codehaus.jettison - jettison - 1.1 - - - - stax - stax-api - - - - - org.codehaus.jackson - jackson-jaxrs - 1.9.13 - - - org.codehaus.jackson - jackson-xc - 1.9.13 + com.fasterxml.jackson.core + jackson-databind diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java index 0de6e8fe41..de2df80fa2 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java @@ -16,6 +16,8 @@ */ package org.apache.nifi.atlas.emulator; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.atlas.model.discovery.AtlasSearchResult; import org.apache.atlas.model.instance.AtlasEntity; import org.apache.atlas.model.instance.AtlasEntityHeader; @@ -26,8 +28,6 @@ import org.apache.atlas.v1.model.instance.Referenceable; import org.apache.atlas.v1.model.notification.HookNotificationV1; import org.apache.nifi.atlas.AtlasUtils; import org.apache.nifi.atlas.NiFiTypes; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; @@ -243,10 +243,8 @@ public class AtlasAPIV2ServerEmulator { private static T readInputJSON(HttpServletRequest req, Class clazz) throws IOException { return new ObjectMapper() - .configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .reader() - .withType(clazz) - .readValue(req.getInputStream()); + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .readValue(req.getInputStream(), clazz); } private static final AtlasTypesDef atlasTypesDef = new AtlasTypesDef(); diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/reporting/ITReportLineageToAtlas.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/reporting/ITReportLineageToAtlas.java index 57c139417b..abd2c755d7 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/reporting/ITReportLineageToAtlas.java +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/reporting/ITReportLineageToAtlas.java @@ -43,7 +43,7 @@ import org.apache.nifi.state.MockStateManager; import org.apache.nifi.util.MockComponentLog; import org.apache.nifi.util.MockConfigurationContext; import org.apache.nifi.util.MockPropertyValue; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -522,7 +522,7 @@ public class ITReportLineageToAtlas { private Lineage getLineage() throws Exception { final URL url = new URL("http://localhost:21000/api/atlas/v2/debug/lineage/"); try (InputStream in = url.openStream()) { - Lineage lineage = new ObjectMapper().reader().withType(Lineage.class).readValue(in); + Lineage lineage = new ObjectMapper().readValue(in, Lineage.class); return lineage; } }