ATLAS-4000: updated jetty version to 9.4.31.v20200723
This commit is contained in:
Madhan Neethiraj
parent
5b3da223ff
commit
24bb6b084d
|
|
@ -217,6 +217,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>${skipTests}</skip>
|
||||
<httpConnector>
|
||||
|
|
@ -225,9 +226,10 @@
|
|||
</httpConnector>
|
||||
<war>../../webapp/target/atlas-webapp-${project.version}.war</war>
|
||||
<daemon>true</daemon>
|
||||
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
|
||||
<webApp>
|
||||
<contextPath>/</contextPath>
|
||||
<descriptor>${project.basedir}/../../webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
|
||||
<descriptor>${project.basedir}/../../webapp/src/main/webapp/WEB-INF/web.xml</descriptor>
|
||||
</webApp>
|
||||
<useTestScope>true</useTestScope>
|
||||
<systemProperties>
|
||||
|
|
@ -264,6 +266,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -272,7 +278,21 @@
|
|||
<stopKey>atlas-stop</stopKey>
|
||||
<stopPort>31001</stopPort>
|
||||
<stopWait>${jetty-maven-plugin.stopWait}</stopWait>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-jetty</id>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
<properties>
|
||||
<hadoop.version>3.0.3</hadoop.version>
|
||||
<jetty.version>9.3.14.v20161028</jetty.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -157,6 +158,10 @@
|
|||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>servlet-api-2.5</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-server</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -383,6 +388,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>${skipTests}</skip>
|
||||
<!--only skip int tests -->
|
||||
|
|
@ -392,9 +398,10 @@
|
|||
</httpConnector>
|
||||
<war>../../webapp/target/atlas-webapp-${project.version}.war</war>
|
||||
<daemon>true</daemon>
|
||||
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
|
||||
<webApp>
|
||||
<contextPath>/</contextPath>
|
||||
<descriptor>${project.basedir}/../../webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
|
||||
<descriptor>${project.basedir}/../../webapp/src/main/webapp/WEB-INF/web.xml</descriptor>
|
||||
</webApp>
|
||||
<useTestScope>true</useTestScope>
|
||||
<systemProperties>
|
||||
|
|
@ -431,6 +438,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -439,17 +450,19 @@
|
|||
<stopKey>atlas-stop</stopKey>
|
||||
<stopPort>31001</stopPort>
|
||||
<stopWait>${jetty-maven-plugin.stopWait}</stopWait>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
<properties>
|
||||
<hadoop.version>3.0.3</hadoop.version>
|
||||
<jetty.version>9.3.14.v20161028</jetty.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -202,6 +202,13 @@
|
|||
<classifier>tests</classifier>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
|
|
@ -344,6 +351,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>${skipTests}</skip>
|
||||
<!--only skip int tests -->
|
||||
|
|
@ -353,10 +361,10 @@
|
|||
</httpConnector>
|
||||
<war>../../webapp/target/atlas-webapp-${project.version}.war</war>
|
||||
<daemon>true</daemon>
|
||||
<webAppSourceDirectory>../../webapp/src/test/webapp</webAppSourceDirectory>
|
||||
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
|
||||
<webApp>
|
||||
<contextPath>/</contextPath>
|
||||
<descriptor>${project.basedir}/../../webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
|
||||
<descriptor>${project.basedir}/../../webapp/src/main/webapp/WEB-INF/web.xml</descriptor>
|
||||
</webApp>
|
||||
<useTestScope>true</useTestScope>
|
||||
<systemProperties>
|
||||
|
|
@ -383,7 +391,7 @@
|
|||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>log4j.configuration</name>
|
||||
<value>file:///${project.build.directory}/../../../distro/src/conf/atlas-log4j.xml</value>
|
||||
<value>file:///${project.build.directory}/test-classes/atlas-log4j.xml</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>atlas.graphdb.backend</name>
|
||||
|
|
@ -393,6 +401,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -404,17 +416,19 @@
|
|||
<daemon>${debug.jetty.daemon}</daemon>
|
||||
<testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
|
||||
<useTestClasspath>true</useTestClasspath>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
|
|
|
|||
|
|
@ -62,13 +62,13 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<version>${log4j2.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<version>${log4j2.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -365,6 +365,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>${skipTests}</skip>
|
||||
<!--only skip int tests -->
|
||||
|
|
@ -374,10 +375,10 @@
|
|||
</httpConnector>
|
||||
<war>../../webapp/target/atlas-webapp-${project.version}.war</war>
|
||||
<daemon>true</daemon>
|
||||
<webAppSourceDirectory>../../webapp/src/test/webapp</webAppSourceDirectory>
|
||||
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
|
||||
<webApp>
|
||||
<contextPath>/</contextPath>
|
||||
<descriptor>${project.basedir}/../../webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
|
||||
<descriptor>${project.basedir}/../../webapp/src/main/webapp/WEB-INF/web.xml</descriptor>
|
||||
</webApp>
|
||||
<useTestScope>true</useTestScope>
|
||||
<systemProperties>
|
||||
|
|
@ -404,7 +405,7 @@
|
|||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>log4j.configuration</name>
|
||||
<value>file:///${project.build.directory}/../../../distro/src/conf/atlas-log4j.xml</value>
|
||||
<value>file:///${project.build.directory}/test-classes/atlas-log4j.xml</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>atlas.graphdb.backend</name>
|
||||
|
|
@ -414,6 +415,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -425,18 +430,20 @@
|
|||
<daemon>${debug.jetty.daemon}</daemon>
|
||||
<testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
|
||||
<useTestClasspath>true</useTestClasspath>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
<!--only skip int tests -->
|
||||
|
|
@ -247,9 +248,10 @@
|
|||
</httpConnector>
|
||||
<war>../../webapp/target/atlas-webapp-${project.version}.war</war>
|
||||
<daemon>true</daemon>
|
||||
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
|
||||
<webApp>
|
||||
<contextPath>/</contextPath>
|
||||
<descriptor>${project.basedir}/../../webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
|
||||
<descriptor>${project.basedir}/../../webapp/src/main/webapp/WEB-INF/web.xml</descriptor>
|
||||
<extraClasspath>${project.basedir}/../../webapp/target/test-classes/</extraClasspath>
|
||||
</webApp>
|
||||
<useTestScope>true</useTestScope>
|
||||
|
|
@ -287,6 +289,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -295,7 +301,21 @@
|
|||
<stopKey>atlas-stop</stopKey>
|
||||
<stopPort>31001</stopPort>
|
||||
<stopWait>${jetty-maven-plugin.stopWait}</stopWait>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-jetty</id>
|
||||
|
|
|
|||
|
|
@ -289,6 +289,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>${skipTests}</skip>
|
||||
<!--only skip int tests -->
|
||||
|
|
@ -337,6 +338,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -345,7 +350,21 @@
|
|||
<stopKey>atlas-stop</stopKey>
|
||||
<stopPort>31001</stopPort>
|
||||
<stopWait>${jetty-maven-plugin.stopWait}</stopWait>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-jetty</id>
|
||||
|
|
|
|||
|
|
@ -55,6 +55,12 @@
|
|||
<groupId>org.apache.hive</groupId>
|
||||
<artifactId>hive-exec</artifactId>
|
||||
<version>${hive.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>*</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -165,6 +171,13 @@
|
|||
<type>war</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
|
|
@ -308,6 +321,16 @@
|
|||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${jackson.databind.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</artifactItem>
|
||||
|
||||
<artifactItem>
|
||||
|
|
@ -392,6 +415,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<configuration>
|
||||
<skip>${skipTests}</skip>
|
||||
<!--only skip int tests -->
|
||||
|
|
@ -401,9 +425,10 @@
|
|||
</httpConnector>
|
||||
<war>../../webapp/target/atlas-webapp-${project.version}.war</war>
|
||||
<daemon>true</daemon>
|
||||
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
|
||||
<webApp>
|
||||
<contextPath>/</contextPath>
|
||||
<descriptor>${project.basedir}/../../webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
|
||||
<descriptor>${project.basedir}/../../webapp/src/main/webapp/WEB-INF/web.xml</descriptor>
|
||||
</webApp>
|
||||
<useTestScope>true</useTestScope>
|
||||
<systemProperties>
|
||||
|
|
@ -440,6 +465,10 @@
|
|||
<key>embedded.solr.directory</key>
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>solr.log.dir</name>
|
||||
<value>${project.build.directory}/logs</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>org.eclipse.jetty.annotations.maxWait</name>
|
||||
<value>5000</value>
|
||||
|
|
@ -448,7 +477,21 @@
|
|||
<stopKey>atlas-stop</stopKey>
|
||||
<stopPort>31001</stopPort>
|
||||
<stopWait>${jetty-maven-plugin.stopWait}</stopWait>
|
||||
<supportedPackagings>jar</supportedPackagings>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-client</artifactId>
|
||||
<version>${curator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-jetty</id>
|
||||
|
|
|
|||
|
|
@ -178,11 +178,16 @@
|
|||
<version>${janus.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JanusGraph 0.2.0 is dependent on solr-solrj 7.0.0 -->
|
||||
<dependency>
|
||||
<groupId>org.apache.solr</groupId>
|
||||
<artifactId>solr-solrj</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<version>${solr.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>woodstox-core-asl</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- CVE Overrides for Lucene -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import org.apache.solr.client.solrj.SolrRequest;
|
|||
import org.apache.solr.client.solrj.SolrResponse;
|
||||
import org.apache.solr.client.solrj.SolrServerException;
|
||||
import org.apache.solr.client.solrj.request.GenericSolrRequest;
|
||||
import org.apache.solr.client.solrj.request.RequestWriter;
|
||||
import org.apache.solr.client.solrj.request.V2Request;
|
||||
import org.apache.solr.client.solrj.response.FacetField;
|
||||
import org.apache.solr.client.solrj.response.QueryResponse;
|
||||
|
|
@ -498,10 +499,10 @@ public class AtlasJanusGraphIndexClient implements AtlasGraphIndexClient {
|
|||
return validateResponseForSuccess(v2request.process(solrClient));
|
||||
|
||||
case HTTP:
|
||||
Collection<ContentStream> contentStreams = ClientUtils.toContentStreams(actionPayLoad, "application/json; charset=UTF-8");
|
||||
GenericSolrRequest request = new GenericSolrRequest(SolrRequest.METHOD.POST, String.format("/%s/config", collectionName), null);
|
||||
GenericSolrRequest request = new GenericSolrRequest(SolrRequest.METHOD.POST, String.format("/%s/config", collectionName), null);
|
||||
RequestWriter.ContentWriter contentWriter = new RequestWriter.StringPayloadContentWriter(actionPayLoad, "application/json; charset=UTF-8");
|
||||
|
||||
request.setContentStreams(contentStreams);
|
||||
request.setContentWriter(contentWriter);
|
||||
request.setUseV2(false);
|
||||
|
||||
return validateResponseForSuccess(request.process(solrClient));
|
||||
|
|
|
|||
|
|
@ -58,13 +58,13 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${apache.log4j.version}</version>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
|||
32
pom.xml
32
pom.xml
|
|
@ -661,20 +661,20 @@
|
|||
<node-for-v2.version>v12.16.0</node-for-v2.version>
|
||||
<npm-for-v2.version>6.13.7</npm-for-v2.version>
|
||||
<slf4j.version>1.7.21</slf4j.version>
|
||||
<jetty.version>9.3.14.v20161028</jetty.version>
|
||||
<jetty.jsp.version>9.2.12.v20150709</jetty.jsp.version>
|
||||
<jetty.version>9.4.31.v20200723</jetty.version>
|
||||
<jetty.jsp.version>9.2.30.v20200428</jetty.jsp.version>
|
||||
<jersey.version>1.19</jersey.version>
|
||||
<jsr.version>1.1</jsr.version>
|
||||
|
||||
<janus.version>0.5.1</janus.version>
|
||||
<tinkerpop.version>3.4.6</tinkerpop.version>
|
||||
<lucene-solr.version>7.3.0</lucene-solr.version>
|
||||
<solr-test-framework.version>7.0.0</solr-test-framework.version>
|
||||
<lucene-solr.version>7.7.2</lucene-solr.version>
|
||||
<solr-test-framework.version>7.7.2</solr-test-framework.version>
|
||||
<junit.version>4.13</junit.version>
|
||||
|
||||
<hadoop.version>3.1.1</hadoop.version>
|
||||
<hbase.version>2.0.2</hbase.version>
|
||||
<solr.version>7.5.0</solr.version>
|
||||
<solr.version>7.7.2</solr.version>
|
||||
<hive.version>3.1.0</hive.version>
|
||||
<kafka.version>2.0.0</kafka.version>
|
||||
<kafka.scala.binary.version>2.11</kafka.scala.binary.version>
|
||||
|
|
@ -687,7 +687,6 @@
|
|||
<elasticsearch.version>5.6.4</elasticsearch.version>
|
||||
|
||||
<json.version>3.2.11</json.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<akka.version>2.3.7</akka.version>
|
||||
<spray.version>1.3.1</spray.version>
|
||||
<gson.version>2.5</gson.version>
|
||||
|
|
@ -699,12 +698,13 @@
|
|||
<javax.servlet.version>3.1.0</javax.servlet.version>
|
||||
<guava.version>25.1-jre</guava.version>
|
||||
<antlr4.version>4.7</antlr4.version>
|
||||
<apache.log4j.version>2.8</apache.log4j.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<log4j2.version>2.11.0</log4j2.version>
|
||||
|
||||
<!-- Needed for hooks -->
|
||||
<aopalliance.version>1.0</aopalliance.version>
|
||||
<jackson.version>2.9.9</jackson.version>
|
||||
<jackson.databind.version>2.10.0</jackson.databind.version>
|
||||
<jackson.version>2.10.5</jackson.version>
|
||||
<jackson.databind.version>2.10.5</jackson.databind.version>
|
||||
|
||||
<!-- Apache commons -->
|
||||
<commons-conf.version>1.10</commons-conf.version>
|
||||
|
|
@ -1056,6 +1056,12 @@
|
|||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-minikdc</artifactId>
|
||||
<version>${hadoop.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -1232,56 +1238,48 @@
|
|||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-server</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-util-ajax</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-io</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-http</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-security</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-webapp</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-servlet</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -258,6 +258,11 @@
|
|||
<artifactId>jetty-server</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-servlet</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-webapp</artifactId>
|
||||
|
|
@ -501,6 +506,24 @@
|
|||
<artifactId>atlas-testtools</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-web</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
@ -530,7 +553,7 @@
|
|||
</manifest>
|
||||
</archive>
|
||||
<packagingExcludes>
|
||||
WEB-INF/lib/junit*.jar,WEB-INF/lib/dom4j-*.jar,${packages.to.exclude}
|
||||
WEB-INF/lib/dom4j-*.jar,${packages.to.exclude}
|
||||
</packagingExcludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import java.net.InetAddress;
|
|||
import java.net.UnknownHostException;
|
||||
import java.util.Date;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
|
|
@ -60,14 +61,14 @@ public class EmbeddedServer {
|
|||
private ServiceState serviceState;
|
||||
|
||||
public EmbeddedServer(String host, int port, String path) throws IOException {
|
||||
int queueSize = AtlasConfiguration.WEBSERVER_QUEUE_SIZE.getInt();
|
||||
LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>(queueSize);
|
||||
int queueSize = AtlasConfiguration.WEBSERVER_QUEUE_SIZE.getInt();
|
||||
LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>(queueSize);
|
||||
int minThreads = AtlasConfiguration.WEBSERVER_MIN_THREADS.getInt();
|
||||
int maxThreads = AtlasConfiguration.WEBSERVER_MAX_THREADS.getInt();
|
||||
long keepAliveTime = AtlasConfiguration.WEBSERVER_KEEPALIVE_SECONDS.getLong();
|
||||
ThreadPoolExecutor executor = new ThreadPoolExecutor(maxThreads, maxThreads, keepAliveTime, TimeUnit.SECONDS, queue);
|
||||
ExecutorThreadPool pool = new ExecutorThreadPool(executor, minThreads);
|
||||
|
||||
int minThreads = AtlasConfiguration.WEBSERVER_MIN_THREADS.getInt();
|
||||
int maxThreads = AtlasConfiguration.WEBSERVER_MAX_THREADS.getInt();
|
||||
long keepAliveTime = AtlasConfiguration.WEBSERVER_KEEPALIVE_SECONDS.getLong();
|
||||
ExecutorThreadPool pool =
|
||||
new ExecutorThreadPool(minThreads, maxThreads, keepAliveTime, TimeUnit.SECONDS, queue);
|
||||
server = new Server(pool);
|
||||
|
||||
Connector connector = getConnector(host, port);
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ public class SecureEmbeddedServer extends EmbeddedServer {
|
|||
SSLContext.setDefault(sslContext);
|
||||
}
|
||||
|
||||
SslContextFactory sslContextFactory = new SslContextFactory();
|
||||
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
|
||||
sslContextFactory.setKeyStoreType(config.getString(KEYSTORE_TYPE , ATLAS_KEYSTORE_FILE_TYPE_DEFAULT));
|
||||
sslContextFactory.setKeyStorePath(config.getString(KEYSTORE_FILE_KEY,
|
||||
System.getProperty(KEYSTORE_FILE_KEY, DEFAULT_KEYSTORE_FILE_LOCATION)));
|
||||
|
|
|
|||
Loading…
Reference in New Issue