You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2024/03/21 01:00:15 UTC
(nifi) 01/02: NIFI-12926 Upgraded Jackson from 2.16.2 to 2.17.0
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 6b061452e6bbaa6b43561239072bc2b0e0247fe3
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Wed Mar 20 17:23:07 2024 -0500
NIFI-12926 Upgraded Jackson from 2.16.2 to 2.17.0
This closes #8538
Signed-off-by: David Handermann <ex...@apache.org>
---
.../nifi/web/api/config/JsonContentConversionExceptionMapperTest.java | 3 ---
pom.xml | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapperTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapperTest.java
index fb9431cab6..32ca5f92de 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapperTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapperTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.web.api.config;
-import com.fasterxml.jackson.core.JsonLocation;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
@@ -32,7 +31,6 @@ import java.util.regex.Pattern;
import static com.fasterxml.jackson.databind.JsonMappingException.wrapWithPath;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
public class JsonContentConversionExceptionMapperTest {
@@ -43,7 +41,6 @@ public class JsonContentConversionExceptionMapperTest {
@BeforeEach
public void setUp() {
- when(mockParser.getTokenLocation()).thenReturn(new JsonLocation(null, 100, 1, 1));
jsonCCEM = new JsonContentConversionExceptionMapper();
}
diff --git a/pom.xml b/pom.xml
index 67f63cf42e..2381f94a48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
<com.jayway.jsonpath.version>2.9.0</com.jayway.jsonpath.version>
<derby.version>10.17.1.0</derby.version>
<jetty.version>12.0.6</jetty.version>
- <jackson.bom.version>2.16.2</jackson.bom.version>
+ <jackson.bom.version>2.17.0</jackson.bom.version>
<avro.version>1.11.3</avro.version>
<jaxb.runtime.version>4.0.4</jaxb.runtime.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>