aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServer.java2
-rwxr-xr-xdatarouter-prov/pom.xml2
-rw-r--r--datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvServer.java2
-rw-r--r--datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java2
-rwxr-xr-xpom.xml6
5 files changed, 7 insertions, 7 deletions
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServer.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServer.java
index 58fe72b4..e15d211c 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServer.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServer.java
@@ -121,7 +121,7 @@ public class NodeServer {
@NotNull
private static SslContextFactory getSslContextFactory(NodeConfigManager nodeConfigManager) {
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStoreType(nodeConfigManager.getKSType());
sslContextFactory.setKeyStorePath(nodeConfigManager.getKSFile());
sslContextFactory.setKeyStorePassword(nodeConfigManager.getKSPass());
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index cba72116..04170735 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.5.0</version>
+ <version>2.7.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvServer.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvServer.java
index c0e6b8d6..e1d4568f 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvServer.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvServer.java
@@ -139,7 +139,7 @@ public class ProvServer {
@NotNull
private static SslContextFactory getSslContextFactory(Properties provProps) {
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStoreType(AafPropsUtils.KEYSTORE_TYPE_PROPERTY);
sslContextFactory.setKeyStorePath(ProvRunner.getAafPropsUtils().getKeystorePathProperty());
sslContextFactory.setKeyStorePassword(ProvRunner.getAafPropsUtils().getKeystorePassProperty());
diff --git a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java
index 6894ddcf..9184dce4 100644
--- a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java
+++ b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java
@@ -66,7 +66,7 @@ public class SubscriberMain {
httpServerConnector.setIdleTimeout(30000);
// SSL Context Factory
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory sslContextFactory = new SslContextFactory.Server();
// SSL HTTP Configuration
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
diff --git a/pom.xml b/pom.xml
index f465695d..302940bc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<!--dependency version across all modules-->
- <jetty.version>9.4.20.v20190813</jetty.version>
+ <jetty.version>9.4.41.v20210516</jetty.version>
<javax.mail-api.version>1.5.5</javax.mail-api.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<qos.logback.version>1.2.3</qos.logback.version>
@@ -79,7 +79,7 @@
<powermock.version>2.0.7</powermock.version>
<commons-lang3.version>3.0</commons-lang3.version>
<eelf-core.version>1.0.0</eelf-core.version>
- <json.version>20160810</json.version>
+ <json.version>20210307</json.version>
<sl4j-api.version>1.7.25</sl4j-api.version>
<hamcrest-lib.version>1.3</hamcrest-lib.version>
<annotations.version>12.0</annotations.version>
@@ -168,7 +168,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
+ <version>9.4.43.v20210629</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>