Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Snyk] Fix for 1 vulnerabilities #657

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Snyk] Fix for 1 vulnerabilities #657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<checkstyle.conf.dir>${basedir}/${hive.path.to.root}/checkstyle</checkstyle.conf.dir>

<!-- Test Properties -->
<test.extra.path></test.extra.path>
<test.extra.path/>
<itest.jdbc.jars>set-this-to-colon-separated-full-path-list-of-jars-to-run-integration-tests
</itest.jdbc.jars>
<!--suppress UnresolvedMavenProperty -->
Expand All @@ -95,7 +95,7 @@
<test.warehouse.scheme>pfile://</test.warehouse.scheme>

<!-- To add additional exclude patterns set this property -->
<test.excludes.additional></test.excludes.additional>
<test.excludes.additional/>
<skip.spark.files>**/TestSparkStatistics*,**/TestSparkSessionTimeout*,**/TestJdbcWithMiniHS2ErasureCoding*,**/TestLocalHiveSparkClient*</skip.spark.files>

<!-- Plugin and Plugin Dependency Versions -->
Expand Down Expand Up @@ -178,7 +178,7 @@
<log4j2.version>2.12.1</log4j2.version>
<mariadb.version>2.5.0</mariadb.version>
<opencsv.version>2.3</opencsv.version>
<orc.version>1.5.12</orc.version>
<orc.version>1.9.0</orc.version>
<mockito-core.version>3.3.3</mockito-core.version>
<powermock.version>2.0.2</powermock.version>
<mina.version>2.0.0-M5</mina.version>
Expand Down Expand Up @@ -1191,12 +1191,12 @@
</goals>
<configuration>
<target>
<delete dir="${test.tmp.dir}" />
<delete dir="${test.conf.dir}" />
<delete dir="${test.warehouse.dir}" />
<mkdir dir="${test.tmp.dir}" />
<mkdir dir="${test.warehouse.dir}" />
<mkdir dir="${test.conf.dir}" />
<delete dir="${test.tmp.dir}"/>
<delete dir="${test.conf.dir}"/>
<delete dir="${test.warehouse.dir}"/>
<mkdir dir="${test.tmp.dir}"/>
<mkdir dir="${test.warehouse.dir}"/>
<mkdir dir="${test.conf.dir}"/>
<!-- copies hive-site.xml so it can be modified -->
<copy todir="${test.conf.dir}">
<fileset dir="${basedir}/${hive.path.to.root}/data/conf/"/>
Expand Down Expand Up @@ -1398,7 +1398,7 @@
<test.local.warehouse.dir>${test.warehouse.scheme}${test.local.warehouse.dir}</test.local.warehouse.dir>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<!-- EnforceReadOnlyTables hook and QTestUtil -->
<test.src.tables></test.src.tables>
<test.src.tables/>
<java.security.krb5.conf>${test.conf.dir}/krb5.conf</java.security.krb5.conf>
<!-- Required by spark to work around SPARK-14958 -->
<antlr.version>${antlr.version}</antlr.version>
Expand Down Expand Up @@ -1495,20 +1495,19 @@
<phase>generate-sources</phase>
<configuration>
<target>
<taskdef name="for" classname="net.sf.antcontrib.logic.ForTask"
classpathref="maven.plugin.classpath" />
<taskdef name="for" classname="net.sf.antcontrib.logic.ForTask" classpathref="maven.plugin.classpath"/>
<property name="thrift.args" value="-I ${thrift.home} --gen java:beans,generated_annotations=undated --gen cpp --gen php --gen py --gen rb"/>
<property name="thrift.gen.dir" value="${basedir}/src/gen/thrift"/>
<delete dir="${thrift.gen.dir}"/>
<mkdir dir="${thrift.gen.dir}"/>
<for param="thrift.file">
<path>
<fileset dir="." includes="if/*.thrift,if/test/*.thrift,src/main/thrift/*.thrift" />
<fileset dir="." includes="if/*.thrift,if/test/*.thrift,src/main/thrift/*.thrift"/>
</path>
<sequential>
<echo message="Generating Thrift code for @{thrift.file}"/>
<exec executable="${thrift.home}/bin/thrift" failonerror="true" dir=".">
<arg line="${thrift.args} -I ${basedir}/include -I ${basedir}/.. -o ${thrift.gen.dir} @{thrift.file} " />
<exec executable="${thrift.home}/bin/thrift" failonerror="true" dir=".">
<arg line="${thrift.args} -I ${basedir}/include -I ${basedir}/.. -o ${thrift.gen.dir} @{thrift.file} "/>
</exec>
</sequential>
</for>
Expand Down