MINIFI-507 - Upgraded jetty, jackson-databind, zookeeper, h2database, spring and spring-security
MINIFI-507 - Upgrading jersey
MINIFI-507 - Updated okhttp, and in turn had to update the keystores and truststores to use a 'DNS:localhost' SAN in order for tests to pass.
This closes #169.
Signed-off-by: Aldrin Piri <aldrin@apache.org>
diff --git a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java
index 470b380..8fe9004 100644
--- a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java
+++ b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java
@@ -32,7 +32,7 @@
public static void setUp() throws Exception {
PullHttpChangeIngestorCommonTest.init();
- SslContextFactory ssl = new SslContextFactory();
+ SslContextFactory.Server ssl = new SslContextFactory.Server();
ssl.setKeyStorePath("./src/test/resources/localhost-ks.jks");
ssl.setKeyStorePassword("localtest");
diff --git a/minifi-bootstrap/src/test/resources/localhost-ks.jks b/minifi-bootstrap/src/test/resources/localhost-ks.jks
index df36197..1e3989f 100755
--- a/minifi-bootstrap/src/test/resources/localhost-ks.jks
+++ b/minifi-bootstrap/src/test/resources/localhost-ks.jks
Binary files differ
diff --git a/minifi-bootstrap/src/test/resources/localhost-ts.jks b/minifi-bootstrap/src/test/resources/localhost-ts.jks
index 7824378..04d2a6f 100755
--- a/minifi-bootstrap/src/test/resources/localhost-ts.jks
+++ b/minifi-bootstrap/src/test/resources/localhost-ts.jks
Binary files differ
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
index efa3c67..202ae29 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
@@ -40,37 +40,37 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
- <version>9.3.9.v20160517</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index a6b769e..32b9582 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,11 +100,11 @@
<org.slf4j.version>1.7.25</org.slf4j.version>
<org.apache.nifi.version>1.8.0</org.apache.nifi.version>
<logback.version>1.2.3</logback.version>
- <jetty.version>9.4.11.v20180605</jetty.version>
- <jersey.version>2.26</jersey.version>
+ <jetty.version>9.4.19.v20190610</jetty.version>
+ <jersey.version>2.29</jersey.version>
<yammer.metrics.version>2.2.0</yammer.metrics.version>
- <spring.version>4.3.10.RELEASE</spring.version>
- <spring.security.version>4.2.4.RELEASE</spring.security.version>
+ <spring.version>4.3.25.RELEASE</spring.version>
+ <spring.security.version>4.2.13.RELEASE</spring.security.version>
<system.rules.version>1.16.1</system.rules.version>
<aws.sdk.version>1.11.172</aws.sdk.version>
</properties>
@@ -636,7 +636,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- <version>3.4.1</version>
+ <version>3.12.3</version>
</dependency>
<dependency>
@@ -1074,7 +1074,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.176</version>
+ <version>1.4.199</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -1084,7 +1084,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.7</version>
+ <version>2.9.9.3</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -1094,7 +1094,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.6</version>
+ <version>3.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
