Skip to content

A
atlas
Commit 24bb6b08 by Madhan Neethiraj
Options

ATLAS-4000: updated jetty version to 9.4.31.v20200723

parent 5b3da223
Showing with 233 additions and 68 deletions
addons/falcon-bridge/pom.xml
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>${skipTests}</skip> <skip>${skipTests}</skip>
<httpConnector> <httpConnector>
...@@ -225,9 +226,10 @@ ...@@ -225,9 +226,10 @@
</httpConnector> </httpConnector>
<war>../../webapp/target/atlas-webapp-${project.version}.war</war> <war>../../webapp/target/atlas-webapp-${project.version}.war</war>
<daemon>true</daemon> <daemon>true</daemon>
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
<webApp> <webApp>
<contextPath>/</contextPath> <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> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<systemProperties> <systemProperties>
...@@ -265,6 +267,10 @@ ...@@ -265,6 +267,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -272,7 +278,21 @@ ...@@ -272,7 +278,21 @@
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
<stopWait>${jetty-maven-plugin.stopWait}</stopWait> <stopWait>${jetty-maven-plugin.stopWait}</stopWait>
<supportedPackagings>jar</supportedPackagings>
</configuration> </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> <executions>
<execution> <execution>
<id>start-jetty</id> <id>start-jetty</id>
......
addons/hbase-bridge/pom.xml
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<properties> <properties>
<hadoop.version>3.0.3</hadoop.version> <hadoop.version>3.0.3</hadoop.version>
<jetty.version>9.3.14.v20161028</jetty.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -157,6 +158,10 @@ ...@@ -157,6 +158,10 @@
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId> <artifactId>servlet-api-2.5</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
...@@ -383,6 +388,7 @@ ...@@ -383,6 +388,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>${skipTests}</skip> <skip>${skipTests}</skip>
<!--only skip int tests --> <!--only skip int tests -->
...@@ -392,9 +398,10 @@ ...@@ -392,9 +398,10 @@
</httpConnector> </httpConnector>
<war>../../webapp/target/atlas-webapp-${project.version}.war</war> <war>../../webapp/target/atlas-webapp-${project.version}.war</war>
<daemon>true</daemon> <daemon>true</daemon>
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
<webApp> <webApp>
<contextPath>/</contextPath> <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> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<systemProperties> <systemProperties>
...@@ -432,6 +439,10 @@ ...@@ -432,6 +439,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -439,17 +450,19 @@ ...@@ -439,17 +450,19 @@
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
<stopWait>${jetty-maven-plugin.stopWait}</stopWait> <stopWait>${jetty-maven-plugin.stopWait}</stopWait>
<supportedPackagings>jar</supportedPackagings>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.curator</groupId>
<artifactId>log4j-core</artifactId> <artifactId>curator-client</artifactId>
<version>${apache.log4j.version}</version> <version>${curator.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>log4j-api</artifactId> <artifactId>zookeeper</artifactId>
<version>${apache.log4j.version}</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
......
addons/hbase-testing-util/pom.xml
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<properties> <properties>
<hadoop.version>3.0.3</hadoop.version> <hadoop.version>3.0.3</hadoop.version>
<jetty.version>9.3.14.v20161028</jetty.version>
</properties> </properties>
<dependencies> <dependencies>
......
addons/hive-bridge/pom.xml
...@@ -202,6 +202,13 @@ ...@@ -202,6 +202,13 @@
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>
...@@ -344,6 +351,7 @@ ...@@ -344,6 +351,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>${skipTests}</skip> <skip>${skipTests}</skip>
<!--only skip int tests --> <!--only skip int tests -->
...@@ -353,10 +361,10 @@ ...@@ -353,10 +361,10 @@
</httpConnector> </httpConnector>
<war>../../webapp/target/atlas-webapp-${project.version}.war</war> <war>../../webapp/target/atlas-webapp-${project.version}.war</war>
<daemon>true</daemon> <daemon>true</daemon>
<webAppSourceDirectory>../../webapp/src/test/webapp</webAppSourceDirectory> <webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
<webApp> <webApp>
<contextPath>/</contextPath> <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> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<systemProperties> <systemProperties>
...@@ -383,7 +391,7 @@ ...@@ -383,7 +391,7 @@
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>log4j.configuration</name> <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>
<systemProperty> <systemProperty>
<name>atlas.graphdb.backend</name> <name>atlas.graphdb.backend</name>
...@@ -394,6 +402,10 @@ ...@@ -394,6 +402,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -404,17 +416,19 @@ ...@@ -404,17 +416,19 @@
<daemon>${debug.jetty.daemon}</daemon> <daemon>${debug.jetty.daemon}</daemon>
<testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory> <testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
<useTestClasspath>true</useTestClasspath> <useTestClasspath>true</useTestClasspath>
<supportedPackagings>jar</supportedPackagings>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.curator</groupId>
<artifactId>log4j-core</artifactId> <artifactId>curator-client</artifactId>
<version>${apache.log4j.version}</version> <version>${curator.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>log4j-api</artifactId> <artifactId>zookeeper</artifactId>
<version>${apache.log4j.version}</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
......
addons/impala-bridge/pom.xml
...@@ -62,13 +62,13 @@ ...@@ -62,13 +62,13 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>${apache.log4j.version}</version> <version>${log4j2.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>${apache.log4j.version}</version> <version>${log4j2.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
...@@ -365,6 +365,7 @@ ...@@ -365,6 +365,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>${skipTests}</skip> <skip>${skipTests}</skip>
<!--only skip int tests --> <!--only skip int tests -->
...@@ -374,10 +375,10 @@ ...@@ -374,10 +375,10 @@
</httpConnector> </httpConnector>
<war>../../webapp/target/atlas-webapp-${project.version}.war</war> <war>../../webapp/target/atlas-webapp-${project.version}.war</war>
<daemon>true</daemon> <daemon>true</daemon>
<webAppSourceDirectory>../../webapp/src/test/webapp</webAppSourceDirectory> <webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
<webApp> <webApp>
<contextPath>/</contextPath> <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> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<systemProperties> <systemProperties>
...@@ -404,7 +405,7 @@ ...@@ -404,7 +405,7 @@
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>log4j.configuration</name> <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>
<systemProperty> <systemProperty>
<name>atlas.graphdb.backend</name> <name>atlas.graphdb.backend</name>
...@@ -415,6 +416,10 @@ ...@@ -415,6 +416,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -425,18 +430,20 @@ ...@@ -425,18 +430,20 @@
<daemon>${debug.jetty.daemon}</daemon> <daemon>${debug.jetty.daemon}</daemon>
<testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory> <testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
<useTestClasspath>true</useTestClasspath> <useTestClasspath>true</useTestClasspath>
<supportedPackagings>jar</supportedPackagings>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.curator</groupId>
<artifactId>log4j-core</artifactId> <artifactId>curator-client</artifactId>
<version>${apache.log4j.version}</version> <version>${curator.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId> <dependency>
<artifactId>log4j-api</artifactId> <groupId>org.apache.zookeeper</groupId>
<version>${apache.log4j.version}</version> <artifactId>zookeeper</artifactId>
</dependency> <version>${zookeeper.version}</version>
</dependency>
</dependencies> </dependencies>
<executions> <executions>
<execution> <execution>
......
addons/kafka-bridge/pom.xml
...@@ -238,6 +238,7 @@ ...@@ -238,6 +238,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
<!--only skip int tests --> <!--only skip int tests -->
...@@ -247,9 +248,10 @@ ...@@ -247,9 +248,10 @@
</httpConnector> </httpConnector>
<war>../../webapp/target/atlas-webapp-${project.version}.war</war> <war>../../webapp/target/atlas-webapp-${project.version}.war</war>
<daemon>true</daemon> <daemon>true</daemon>
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
<webApp> <webApp>
<contextPath>/</contextPath> <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> <extraClasspath>${project.basedir}/../../webapp/target/test-classes/</extraClasspath>
</webApp> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
...@@ -288,6 +290,10 @@ ...@@ -288,6 +290,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -295,7 +301,21 @@ ...@@ -295,7 +301,21 @@
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
<stopWait>${jetty-maven-plugin.stopWait}</stopWait> <stopWait>${jetty-maven-plugin.stopWait}</stopWait>
<supportedPackagings>jar</supportedPackagings>
</configuration> </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> <executions>
<execution> <execution>
<id>start-jetty</id> <id>start-jetty</id>
......
addons/sqoop-bridge/pom.xml
...@@ -289,6 +289,7 @@ ...@@ -289,6 +289,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>${skipTests}</skip> <skip>${skipTests}</skip>
<!--only skip int tests --> <!--only skip int tests -->
...@@ -338,6 +339,10 @@ ...@@ -338,6 +339,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -345,7 +350,21 @@ ...@@ -345,7 +350,21 @@
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
<stopWait>${jetty-maven-plugin.stopWait}</stopWait> <stopWait>${jetty-maven-plugin.stopWait}</stopWait>
<supportedPackagings>jar</supportedPackagings>
</configuration> </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> <executions>
<execution> <execution>
<id>start-jetty</id> <id>start-jetty</id>
......
addons/storm-bridge/pom.xml
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
<groupId>org.apache.hive</groupId> <groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId> <artifactId>hive-exec</artifactId>
<version>${hive.version}</version> <version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
...@@ -165,6 +171,13 @@ ...@@ -165,6 +171,13 @@
<type>war</type> <type>war</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>
...@@ -308,6 +321,16 @@ ...@@ -308,6 +321,16 @@
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version> <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>
<artifactItem> <artifactItem>
...@@ -392,6 +415,7 @@ ...@@ -392,6 +415,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration> <configuration>
<skip>${skipTests}</skip> <skip>${skipTests}</skip>
<!--only skip int tests --> <!--only skip int tests -->
...@@ -401,9 +425,10 @@ ...@@ -401,9 +425,10 @@
</httpConnector> </httpConnector>
<war>../../webapp/target/atlas-webapp-${project.version}.war</war> <war>../../webapp/target/atlas-webapp-${project.version}.war</war>
<daemon>true</daemon> <daemon>true</daemon>
<webAppSourceDirectory>../../webapp/src/main/webapp</webAppSourceDirectory>
<webApp> <webApp>
<contextPath>/</contextPath> <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> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<systemProperties> <systemProperties>
...@@ -441,6 +466,10 @@ ...@@ -441,6 +466,10 @@
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>solr.log.dir</name>
<value>${project.build.directory}/logs</value>
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value> <value>5000</value>
</systemProperty> </systemProperty>
...@@ -448,7 +477,21 @@ ...@@ -448,7 +477,21 @@
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
<stopWait>${jetty-maven-plugin.stopWait}</stopWait> <stopWait>${jetty-maven-plugin.stopWait}</stopWait>
<supportedPackagings>jar</supportedPackagings>
</configuration> </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> <executions>
<execution> <execution>
<id>start-jetty</id> <id>start-jetty</id>
......
graphdb/janus/pom.xml
...@@ -178,11 +178,16 @@ ...@@ -178,11 +178,16 @@
<version>${janus.version}</version> <version>${janus.version}</version>
</dependency> </dependency>
<!-- JanusGraph 0.2.0 is dependent on solr-solrj 7.0.0 -->
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId> <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> </dependency>
<!-- CVE Overrides for Lucene --> <!-- CVE Overrides for Lucene -->
<dependency> <dependency>
......
graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java
...@@ -35,6 +35,7 @@ import org.apache.solr.client.solrj.SolrRequest; ...@@ -35,6 +35,7 @@ import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.GenericSolrRequest; 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.request.V2Request;
import org.apache.solr.client.solrj.response.FacetField; import org.apache.solr.client.solrj.response.FacetField;
import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.QueryResponse;
...@@ -498,10 +499,10 @@ public class AtlasJanusGraphIndexClient implements AtlasGraphIndexClient { ...@@ -498,10 +499,10 @@ public class AtlasJanusGraphIndexClient implements AtlasGraphIndexClient {
return validateResponseForSuccess(v2request.process(solrClient)); return validateResponseForSuccess(v2request.process(solrClient));
case HTTP: 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); request.setUseV2(false);
return validateResponseForSuccess(request.process(solrClient)); return validateResponseForSuccess(request.process(solrClient));
......
notification/pom.xml
...@@ -58,13 +58,13 @@ ...@@ -58,13 +58,13 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>${apache.log4j.version}</version> <version>${log4j2.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>${apache.log4j.version}</version> <version>${log4j2.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
pom.xml
...@@ -661,20 +661,20 @@ ...@@ -661,20 +661,20 @@
<node-for-v2.version>v12.16.0</node-for-v2.version> <node-for-v2.version>v12.16.0</node-for-v2.version>
<npm-for-v2.version>6.13.7</npm-for-v2.version> <npm-for-v2.version>6.13.7</npm-for-v2.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<jetty.version>9.3.14.v20161028</jetty.version> <jetty.version>9.4.31.v20200723</jetty.version>
<jetty.jsp.version>9.2.12.v20150709</jetty.jsp.version> <jetty.jsp.version>9.2.30.v20200428</jetty.jsp.version>
<jersey.version>1.19</jersey.version> <jersey.version>1.19</jersey.version>
<jsr.version>1.1</jsr.version> <jsr.version>1.1</jsr.version>
<janus.version>0.5.1</janus.version> <janus.version>0.5.1</janus.version>
<tinkerpop.version>3.4.6</tinkerpop.version> <tinkerpop.version>3.4.6</tinkerpop.version>
<lucene-solr.version>7.3.0</lucene-solr.version> <lucene-solr.version>7.7.2</lucene-solr.version>
<solr-test-framework.version>7.0.0</solr-test-framework.version> <solr-test-framework.version>7.7.2</solr-test-framework.version>
<junit.version>4.13</junit.version> <junit.version>4.13</junit.version>
<hadoop.version>3.1.1</hadoop.version> <hadoop.version>3.1.1</hadoop.version>
<hbase.version>2.0.2</hbase.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> <hive.version>3.1.0</hive.version>
<kafka.version>2.0.0</kafka.version> <kafka.version>2.0.0</kafka.version>
<kafka.scala.binary.version>2.11</kafka.scala.binary.version> <kafka.scala.binary.version>2.11</kafka.scala.binary.version>
...@@ -687,7 +687,6 @@ ...@@ -687,7 +687,6 @@
<elasticsearch.version>5.6.4</elasticsearch.version> <elasticsearch.version>5.6.4</elasticsearch.version>
<json.version>3.2.11</json.version> <json.version>3.2.11</json.version>
<log4j.version>1.2.17</log4j.version>
<akka.version>2.3.7</akka.version> <akka.version>2.3.7</akka.version>
<spray.version>1.3.1</spray.version> <spray.version>1.3.1</spray.version>
<gson.version>2.5</gson.version> <gson.version>2.5</gson.version>
...@@ -699,12 +698,13 @@ ...@@ -699,12 +698,13 @@
<javax.servlet.version>3.1.0</javax.servlet.version> <javax.servlet.version>3.1.0</javax.servlet.version>
<guava.version>25.1-jre</guava.version> <guava.version>25.1-jre</guava.version>
<antlr4.version>4.7</antlr4.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 --> <!-- Needed for hooks -->
<aopalliance.version>1.0</aopalliance.version> <aopalliance.version>1.0</aopalliance.version>
<jackson.version>2.9.9</jackson.version> <jackson.version>2.10.5</jackson.version>
<jackson.databind.version>2.10.0</jackson.databind.version> <jackson.databind.version>2.10.5</jackson.databind.version>
<!-- Apache commons --> <!-- Apache commons -->
<commons-conf.version>1.10</commons-conf.version> <commons-conf.version>1.10</commons-conf.version>
...@@ -1056,6 +1056,12 @@ ...@@ -1056,6 +1056,12 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId> <artifactId>hadoop-minikdc</artifactId>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
...@@ -1232,56 +1238,48 @@ ...@@ -1232,56 +1238,48 @@
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId> <artifactId>jetty-util</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId> <artifactId>jetty-util-ajax</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId> <artifactId>jetty-io</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId> <artifactId>jetty-http</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId> <artifactId>jetty-security</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId> <artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId> <artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
......
webapp/pom.xml
...@@ -260,6 +260,11 @@ ...@@ -260,6 +260,11 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId> <artifactId>jetty-webapp</artifactId>
</dependency> </dependency>
...@@ -501,6 +506,24 @@ ...@@ -501,6 +506,24 @@
<artifactId>atlas-testtools</artifactId> <artifactId>atlas-testtools</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </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> </dependencies>
<build> <build>
...@@ -530,7 +553,7 @@ ...@@ -530,7 +553,7 @@
</manifest> </manifest>
</archive> </archive>
<packagingExcludes> <packagingExcludes>
WEB-INF/lib/junit*.jar,WEB-INF/lib/dom4j-*.jar,${packages.to.exclude} WEB-INF/lib/dom4j-*.jar,${packages.to.exclude}
</packagingExcludes> </packagingExcludes>
</configuration> </configuration>
</plugin> </plugin>
......
webapp/src/main/java/org/apache/atlas/web/service/EmbeddedServer.java
...@@ -41,6 +41,7 @@ import java.net.InetAddress; ...@@ -41,6 +41,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Date; import java.util.Date;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
...@@ -60,14 +61,14 @@ public class EmbeddedServer { ...@@ -60,14 +61,14 @@ public class EmbeddedServer {
private ServiceState serviceState; private ServiceState serviceState;
public EmbeddedServer(String host, int port, String path) throws IOException { public EmbeddedServer(String host, int port, String path) throws IOException {
int queueSize = AtlasConfiguration.WEBSERVER_QUEUE_SIZE.getInt(); int queueSize = AtlasConfiguration.WEBSERVER_QUEUE_SIZE.getInt();
LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>(queueSize); LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>(queueSize);
int minThreads = AtlasConfiguration.WEBSERVER_MIN_THREADS.getInt();
int minThreads = AtlasConfiguration.WEBSERVER_MIN_THREADS.getInt(); int maxThreads = AtlasConfiguration.WEBSERVER_MAX_THREADS.getInt();
int maxThreads = AtlasConfiguration.WEBSERVER_MAX_THREADS.getInt(); long keepAliveTime = AtlasConfiguration.WEBSERVER_KEEPALIVE_SECONDS.getLong();
long keepAliveTime = AtlasConfiguration.WEBSERVER_KEEPALIVE_SECONDS.getLong(); ThreadPoolExecutor executor = new ThreadPoolExecutor(maxThreads, maxThreads, keepAliveTime, TimeUnit.SECONDS, queue);
ExecutorThreadPool pool = ExecutorThreadPool pool = new ExecutorThreadPool(executor, minThreads);
new ExecutorThreadPool(minThreads, maxThreads, keepAliveTime, TimeUnit.SECONDS, queue);
server = new Server(pool); server = new Server(pool);
Connector connector = getConnector(host, port); Connector connector = getConnector(host, port);
......
webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
...@@ -102,7 +102,7 @@ public class SecureEmbeddedServer extends EmbeddedServer { ...@@ -102,7 +102,7 @@ public class SecureEmbeddedServer extends EmbeddedServer {
SSLContext.setDefault(sslContext); 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.setKeyStoreType(config.getString(KEYSTORE_TYPE , ATLAS_KEYSTORE_FILE_TYPE_DEFAULT));
sslContextFactory.setKeyStorePath(config.getString(KEYSTORE_FILE_KEY, sslContextFactory.setKeyStorePath(config.getString(KEYSTORE_FILE_KEY,
System.getProperty(KEYSTORE_FILE_KEY, DEFAULT_KEYSTORE_FILE_LOCATION))); System.getProperty(KEYSTORE_FILE_KEY, DEFAULT_KEYSTORE_FILE_LOCATION)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment