This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new 24bb6b0 ATLAS-4000: updated jetty version to 9.4.31.v20200723 24bb6b0 is described below commit 24bb6b084d6c13d7ac94277ae6d730b8e7fcd67d Author: Madhan Neethiraj <mad...@apache.org> AuthorDate: Fri Oct 23 11:19:56 2020 -0700 ATLAS-4000: updated jetty version to 9.4.31.v20200723 --- addons/falcon-bridge/pom.xml | 22 ++++++++++- addons/hbase-bridge/pom.xml | 27 +++++++++---- addons/hbase-testing-util/pom.xml | 1 + addons/hive-bridge/pom.xml | 32 ++++++++++----- addons/impala-bridge/pom.xml | 37 ++++++++++-------- addons/kafka-bridge/pom.xml | 22 ++++++++++- addons/sqoop-bridge/pom.xml | 19 +++++++++ addons/storm-bridge/pom.xml | 45 +++++++++++++++++++++- graphdb/janus/pom.xml | 9 ++++- .../graphdb/janus/AtlasJanusGraphIndexClient.java | 7 ++-- notification/pom.xml | 4 +- pom.xml | 32 ++++++++------- webapp/pom.xml | 25 +++++++++++- .../apache/atlas/web/service/EmbeddedServer.java | 17 ++++---- .../atlas/web/service/SecureEmbeddedServer.java | 2 +- 15 files changed, 233 insertions(+), 68 deletions(-) diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 7f98b4f..e0d2f3b 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -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> @@ -265,6 +267,10 @@ <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> </systemProperty> @@ -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> diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 9940813..0907f47 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -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> @@ -432,6 +439,10 @@ <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> </systemProperty> @@ -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> diff --git a/addons/hbase-testing-util/pom.xml b/addons/hbase-testing-util/pom.xml index 785084d..e2d39fd 100644 --- a/addons/hbase-testing-util/pom.xml +++ b/addons/hbase-testing-util/pom.xml @@ -33,6 +33,7 @@ <properties> <hadoop.version>3.0.3</hadoop.version> + <jetty.version>9.3.14.v20161028</jetty.version> </properties> <dependencies> diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 82412ab..ea2de4d 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -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> @@ -394,6 +402,10 @@ <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> </systemProperty> @@ -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> diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml index 60892c5..a1bd592 100644 --- a/addons/impala-bridge/pom.xml +++ b/addons/impala-bridge/pom.xml @@ -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> @@ -415,6 +416,10 @@ <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> </systemProperty> @@ -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> diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml index 7b95aa3..2b6a319 100644 --- a/addons/kafka-bridge/pom.xml +++ b/addons/kafka-bridge/pom.xml @@ -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> @@ -288,6 +290,10 @@ <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> </systemProperty> @@ -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> diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml index 3d095dc..9d5ac52 100644 --- a/addons/sqoop-bridge/pom.xml +++ b/addons/sqoop-bridge/pom.xml @@ -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 --> @@ -338,6 +339,10 @@ <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> </systemProperty> @@ -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> diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index df23605..bc6670e 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -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> @@ -441,6 +466,10 @@ <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> </systemProperty> @@ -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> diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml index 147e062..9a4619f 100644 --- a/graphdb/janus/pom.xml +++ b/graphdb/janus/pom.xml @@ -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> diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java index 8142514..ef42dbd 100644 --- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java +++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java @@ -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)); diff --git a/notification/pom.xml b/notification/pom.xml index 468cd87..971116f 100644 --- a/notification/pom.xml +++ b/notification/pom.xml @@ -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> diff --git a/pom.xml b/pom.xml index f23a0d4..67962e3 100644 --- a/pom.xml +++ b/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> diff --git a/webapp/pom.xml b/webapp/pom.xml index 259820b..5a8cfe6 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -260,6 +260,11 @@ <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> </dependency> @@ -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> diff --git a/webapp/src/main/java/org/apache/atlas/web/service/EmbeddedServer.java b/webapp/src/main/java/org/apache/atlas/web/service/EmbeddedServer.java index bdd660f..1d1e08e 100755 --- a/webapp/src/main/java/org/apache/atlas/web/service/EmbeddedServer.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/EmbeddedServer.java @@ -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 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); + 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); + server = new Server(pool); Connector connector = getConnector(host, port); diff --git a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java index b10e594..7a04574 100755 --- a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java @@ -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)));