You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2020/11/03 10:46:38 UTC
[nifi] branch main updated: NIFI-7914 Bumped H2 dependency to
1.4.199. Bumped icu4j dependency to 60.2. Replaced jackson-mapper-asl
dependency with jackson-databind. Fixed an error comparing key identities
in TestKeyService. Replaced jackson-mapper-asl ObjectMapper with
jackson-databind ObjectMapper in LivySessionController.
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8b78277 NIFI-7914 Bumped H2 dependency to 1.4.199. Bumped icu4j dependency to 60.2. Replaced jackson-mapper-asl dependency with jackson-databind. Fixed an error comparing key identities in TestKeyService. Replaced jackson-mapper-asl ObjectMapper with jackson-databind ObjectMapper in LivySessionController.
8b78277 is described below
commit 8b78277a4500ad35d76e87faf6eea3a0d502df4d
Author: mtien <mt...@gmail.com>
AuthorDate: Mon Nov 2 10:36:46 2020 -0800
NIFI-7914 Bumped H2 dependency to 1.4.199.
Bumped icu4j dependency to 60.2.
Replaced jackson-mapper-asl dependency with jackson-databind.
Fixed an error comparing key identities in TestKeyService.
Replaced jackson-mapper-asl ObjectMapper with jackson-databind ObjectMapper in LivySessionController.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #4640.
---
.../org/apache/nifi/web/security/jwt/TestKeyService.java | 12 +++++-------
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 4 ++--
.../nifi-spark-bundle/nifi-livy-controller-service/pom.xml | 5 +++--
.../apache/nifi/controller/livy/LivySessionController.java | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/jwt/TestKeyService.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/jwt/TestKeyService.java
index 4d2f415..495279e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/jwt/TestKeyService.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/jwt/TestKeyService.java
@@ -16,12 +16,10 @@
*/
package org.apache.nifi.web.security.jwt;
-import org.apache.nifi.admin.service.KeyService;
-import org.apache.nifi.key.Key;
-import org.h2.util.StringUtils;
-
import java.util.ArrayList;
import java.util.UUID;
+import org.apache.nifi.admin.service.KeyService;
+import org.apache.nifi.key.Key;
public class TestKeyService implements KeyService {
@@ -44,9 +42,9 @@ public class TestKeyService implements KeyService {
@Override
public Key getOrCreateKey(String identity) {
- for(Key k : signingKeys) {
- if(StringUtils.equals(k.getIdentity(), identity)) {
- return k;
+ for(Key key : signingKeys) {
+ if(key.getIdentity().equals(identity)) {
+ return key;
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 5c40dcf..d6b9fb8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -204,7 +204,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>54.1.1</version>
+ <version>60.2</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.176</version>
+ <version>1.4.199</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml
index b92843d..de9e030 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml
@@ -47,8 +47,9 @@
<artifactId>jackson-core-asl</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
index c546ef8..390cb62 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.controller.livy;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.IOException;
@@ -78,7 +79,6 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.security.util.ClientAuth;
import org.apache.nifi.ssl.SSLContextService;
-import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;