summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@ericsson.com>2018-08-27 15:04:05 +0100
committerFiachra Corcoran <fiachra.corcoran@ericsson.com>2018-08-27 15:25:06 +0100
commit1bd9bbb8e02495e85bc7bdc5aee20b714ed9ce3d (patch)
tree4705702033d09e02bdc06bb2765f1a22c1f70796
parent9e6a53e27dee9ed6a303e61e3d62603bbc6b2581 (diff)
Downgrade Jetty to 9.3.8.RC0
Issue-ID: DMAAP-557 Change-Id: I0f595d9bc092c3a7a0821a8587bcb3660f550bfe Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java2
-rw-r--r--datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java2
-rw-r--r--datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties2
-rw-r--r--datarouter-prov/src/main/resources/provserver.properties2
-rw-r--r--datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java2
-rwxr-xr-xpom.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
index 006dc88c..c6b16822 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
@@ -94,7 +94,6 @@ public class NodeMain {
Server server = new Server();
// HTTP configuration
HttpConfiguration httpConfiguration = new HttpConfiguration();
- httpConfiguration.setIdleTimeout(2000);
httpConfiguration.setRequestHeaderSize(2048);
// HTTP connector
@@ -102,6 +101,7 @@ public class NodeMain {
try (ServerConnector httpServerConnector = new ServerConnector(server,
new HttpConnectionFactory(httpConfiguration))) {
httpServerConnector.setPort(nodeConfigManager.getHttpPort());
+ httpServerConnector.setIdleTimeout(2000);
// HTTPS configuration
SslContextFactory sslContextFactory = new SslContextFactory();
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
index 3afce990..87979be6 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
@@ -127,7 +127,6 @@ public class Main {
httpConfiguration.setSecurePort(httpsPort);
httpConfiguration.setOutputBufferSize(32768);
httpConfiguration.setRequestHeaderSize(2048);
- httpConfiguration.setIdleTimeout(300000);
httpConfiguration.setSendServerVersion(true);
httpConfiguration.setSendDateHeader(false);
@@ -146,6 +145,7 @@ public class Main {
new HttpConnectionFactory(httpConfiguration))) {
httpServerConnector.setPort(httpPort);
httpServerConnector.setAcceptQueueSize(2);
+ httpServerConnector.setIdleTimeout(300000);
// HTTPS configuration
HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration);
diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
index 383bce31..7758a64d 100644
--- a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
+++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
@@ -40,7 +40,7 @@ org.onap.dmaap.datarouter.provserver.logretention = 30
#DMAAP-597 (Tech Dept) REST request source IP auth
# relaxation to accommodate OOM kubernetes deploy
-org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true
+org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
# Database access
org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver
diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index 383bce31..7758a64d 100644
--- a/datarouter-prov/src/main/resources/provserver.properties
+++ b/datarouter-prov/src/main/resources/provserver.properties
@@ -40,7 +40,7 @@ org.onap.dmaap.datarouter.provserver.logretention = 30
#DMAAP-597 (Tech Dept) REST request source IP auth
# relaxation to accommodate OOM kubernetes deploy
-org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true
+org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
# Database access
org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver
diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java
index fd00ea51..bc724079 100644
--- a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java
@@ -69,7 +69,7 @@ public class IntegrationTestInternalMisc extends IntegrationTestBase {
@Test
public void testInternalHalt() {
- String url = props.getProperty("test.host") + "/internal/halt";
+ String url = props.getProperty("test.host") + "/halt";
HttpGet httpPost = new HttpGet(url);
try {
httpPost.addHeader(FeedServlet.BEHALF_HEADER, "JUnit");
diff --git a/pom.xml b/pom.xml
index 66ac7b73..d3327ba9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
- <jetty.version>9.4.12.RC2</jetty.version>
+ <jetty.version>9.3.8.RC0</jetty.version>
<jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
<thoughtworks.version>1.4.10</thoughtworks.version>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>