You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by dz...@apache.org on 2022/02/02 14:06:05 UTC
[drill] branch master updated: DRILL-7994: Dependency version updates for severe vulnerabilities (#2447)
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 942e36d DRILL-7994: Dependency version updates for severe vulnerabilities (#2447)
942e36d is described below
commit 942e36d6af4b89c5048aa88dc38ce3dde7dbc145
Author: James Turton <91...@users.noreply.github.com>
AuthorDate: Wed Feb 2 16:05:18 2022 +0200
DRILL-7994: Dependency version updates for severe vulnerabilities (#2447)
* Updates deps for dependabot.
* Remove jetty version spec from storage-phoenix pom.
* Revert parallel GC setting.
---
.github/workflows/ci.yml | 3 +--
.travis.yml | 51 +++++++++++++++++++++--------------------
contrib/storage-jdbc/pom.xml | 2 +-
contrib/storage-phoenix/pom.xml | 4 ----
4 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 441c2ac..230fdb1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,8 +60,7 @@ jobs:
- name: Build and test
# The total GitHub Actions memory is 7000Mb. But GitHub CI requires some memory for the container to perform tests
run: |
- echo Selecting parallel GC to minimise peak mem usage.
- MAVEN_OPTS="-XX:+UseParallelGC"
+ MAVEN_OPTS="-XX:+UseG1GC"
mvn install --batch-mode --no-transfer-progress -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 # -X -V for debugging
checkstyle_protobuf:
diff --git a/.travis.yml b/.travis.yml
index 957accd..169cfa5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,41 +50,42 @@ before_install:
- git fetch --unshallow
# Install libraries required for protobuf generation
- |
- if [ $PHASE = "build_checkstyle_protobuf" ]; then \
- sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall && \
- pushd .. && \
- if [ -f $HOME/protobuf/protobuf_3.16.1* ]; then \
- sudo dpkg -i $HOME/protobuf/protobuf_3.16.1*; \
- else \
- wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.1/protobuf-java-3.16.1.zip && \
- unzip protobuf-java-3.16.1.zip && pushd protobuf-3.16.1 && \
- ./configure && sudo make && sudo checkinstall -y && \
- if [ ! -d $HOME/protobuf ]; then \
- mkdir -p $HOME/protobuf; \
- fi && \
- mv protobuf_3.16.1* $HOME/protobuf/ && popd; \
- fi && \
- sudo ldconfig && popd; \
+ if [ $PHASE = "build_checkstyle_protobuf" ]; then
+ sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall &&
+ pushd .. &&
+ if [ -f $HOME/protobuf/protobuf_3.16.1* ]; then
+ sudo dpkg -i $HOME/protobuf/protobuf_3.16.1*;
+ else
+ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.1/protobuf-java-3.16.1.zip &&
+ unzip protobuf-java-3.16.1.zip && pushd protobuf-3.16.1 &&
+ ./configure && sudo make && sudo checkinstall -y &&
+ if [ ! -d $HOME/protobuf ]; then
+ mkdir -p $HOME/protobuf;
+ fi &&
+ mv protobuf_3.16.1* $HOME/protobuf/ && popd;
+ fi &&
+ sudo ldconfig && popd;
fi
install:
# For tests phase runs unit tests
# For protobuf phase: builds Drill project, performs license checkstyle goal and regenerates Java and C++ Protobuf files
- |
- if [ $PHASE = "tests" ]; then \
- mvn install --batch-mode --no-transfer-progress \
- -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest"; \
- elif [ $PHASE = "build_checkstyle_protobuf" ]; then \
- MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --no-transfer-progress -Drat.skip=false -Dlicense.skip=false --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true && \
- pushd protocol && mvn process-sources -P proto-compile && popd && \
- mkdir contrib/native/client/build && pushd contrib/native/client/build && /usr/bin/cmake -G "Unix Makefiles" .. && make cpProtobufs && popd; \
+ if [ $PHASE = "tests" ]; then
+ MAVEN_OPTS="-XX:+UseG1GC"
+ mvn install --batch-mode --no-transfer-progress
+ -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest";
+ elif [ $PHASE = "build_checkstyle_protobuf" ]; then
+ MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --no-transfer-progress -Drat.skip=false -Dlicense.skip=false --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true &&
+ pushd protocol && mvn process-sources -P proto-compile && popd &&
+ mkdir contrib/native/client/build && pushd contrib/native/client/build && /usr/bin/cmake -G "Unix Makefiles" .. && make cpProtobufs && popd;
fi
script:
# Checks whether project files weren't changed after regenerating protobufs
- |
- if [ "$(git status -s | grep -c "")" -gt 0 ]; then \
+ if [ "$(git status -s | grep -c "")" -gt 0 ]; then
echo "The following changes are found in files after regenerating protobufs (output may be used as a patch to apply):" >&2 &&
- echo "$(git diff --color)" && \
- exit 1; \
+ echo "$(git diff --color)" &&
+ exit 1;
else
echo "All checks are passed!";
fi
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index c4bd765..8ce11b1 100755
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -34,7 +34,7 @@
<mysql.connector.version>8.0.25</mysql.connector.version>
<clickhouse.jdbc.version>0.3.1</clickhouse.jdbc.version>
<h2.version>2.1.210</h2.version>
- <postgresql.version>42.2.24</postgresql.version>
+ <postgresql.version>42.3.1</postgresql.version>
</properties>
<dependencies>
diff --git a/contrib/storage-phoenix/pom.xml b/contrib/storage-phoenix/pom.xml
index 277641e..6e6e67f 100644
--- a/contrib/storage-phoenix/pom.xml
+++ b/contrib/storage-phoenix/pom.xml
@@ -33,7 +33,6 @@
<phoenix.version>5.1.2</phoenix.version>
<!-- Keep the 2.4.2 to reduce dependency conflict -->
<hbase.minicluster.version>2.4.2</hbase.minicluster.version>
- <jetty.test.version>9.4.31.v20200723</jetty.test.version>
</properties>
<dependencies>
@@ -278,19 +277,16 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>${jetty.test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty.test.version}</version>
<scope>test</scope>
</dependency>
</dependencies>