Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <pierre.villard.fr@gmail.com>

This closes #4640.
This commit is contained in:
mtien 2020-11-02 10:36:46 -08:00 committed by Pierre Villard
parent 80f49eb7bd
commit 8b78277a45
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/jwt/TestKeyService.java
View File

@ -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;
}
}

4
nifi-nar-bundles/nifi-framework-bundle/pom.xml
View File

@ -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>

5
nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
View File

@ -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;