This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new c980666b BIGTOP-3698. Bump Hive to 3.1.3. (#912)
c980666b is described below
commit c980666b05c45b468ca10e8a64d263b54ffa5d87
Author: Leona Yoda <[email protected]>
AuthorDate: Fri Jun 10 11:16:12 2022 +0900
BIGTOP-3698. Bump Hive to 3.1.3. (#912)
---
.../src/common/hive/patch3-HIVE-21569.diff | 4 +-
.../src/common/hive/patch6-HIVE-21777.diff | 2 +-
.../common/hive/patch7-HIVE-22278-branch-3.1.diff | 87 ----------------------
.../common/hive/patch8-HIVE-25795-branch-3.1.diff | 38 ----------
.../src/common/hive/patch9-log4j2-2.17.1.diff | 26 -------
bigtop.bom | 2 +-
6 files changed, 4 insertions(+), 155 deletions(-)
diff --git a/bigtop-packages/src/common/hive/patch3-HIVE-21569.diff
b/bigtop-packages/src/common/hive/patch3-HIVE-21569.diff
index b893be92..feacc5e8 100644
--- a/bigtop-packages/src/common/hive/patch3-HIVE-21569.diff
+++ b/bigtop-packages/src/common/hive/patch3-HIVE-21569.diff
@@ -38,7 +38,7 @@ index 8b20ac342f..ecefff3e52 100644
+++ b/itests/qtest-druid/pom.xml
@@ -41,7 +41,7 @@
<druid.jersey.version>1.19.3</druid.jersey.version>
- <druid.jetty.version>9.3.19.v20170502</druid.jetty.version>
+ <druid.jetty.version>9.3.27.v20190418</druid.jetty.version>
<druid.derby.version>10.11.1.1</druid.derby.version>
- <druid.guava.version>16.0.1</druid.guava.version>
+ <druid.guava.version>28.1-jre</druid.guava.version>
@@ -241,7 +241,7 @@ index 884dbfdf31..bd2e51edeb 100644
+ <guava.version>28.1-jre</guava.version>
<hadoop.version>3.1.0</hadoop.version>
<hikaricp.version>2.6.1</hikaricp.version>
- <jackson.version>2.9.5</jackson.version>
+ <jackson.version>2.12.0</jackson.version>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index a40feff575..799e541332 100644
--- a/storage-api/pom.xml
diff --git a/bigtop-packages/src/common/hive/patch6-HIVE-21777.diff
b/bigtop-packages/src/common/hive/patch6-HIVE-21777.diff
index a49e4bc1..16620a6b 100644
--- a/bigtop-packages/src/common/hive/patch6-HIVE-21777.diff
+++ b/bigtop-packages/src/common/hive/patch6-HIVE-21777.diff
@@ -2,7 +2,7 @@ diff --git a/service/pom.xml b/service/pom.xml
index 6723a70098..fdbecfaf84 100644
--- a/service/pom.xml
+++ b/service/pom.xml
-@@ -299,6 +299,12 @@
+@@ -303,6 +303,12 @@
<artifactId>apacheds-server-integ</artifactId>
<version>${apache-directory-server.version}</version>
<scope>test</scope>
diff --git a/bigtop-packages/src/common/hive/patch7-HIVE-22278-branch-3.1.diff
b/bigtop-packages/src/common/hive/patch7-HIVE-22278-branch-3.1.diff
index 7ba41d8d..e6fd3a16 100644
--- a/bigtop-packages/src/common/hive/patch7-HIVE-22278-branch-3.1.diff
+++ b/bigtop-packages/src/common/hive/patch7-HIVE-22278-branch-3.1.diff
@@ -1,52 +1,3 @@
-commit 8db99c4a896b2cb5261d6e31e961835778129e9d
-Author: David Lavati <[email protected]>
-Date: Tue Oct 8 12:54:24 2019 +0000
-
- HIVE-22278: Upgrade log4j to 2.12.1 (David Lavati via Zoltan Haindrich)
-
- Signed-off-by: Zoltan Haindrich <[email protected]>
- (cherry picked from commit caf7ac0099645ac8500d824556941447e66e25e3)
-
- Conflicts:
- pom.xml
- standalone-metastore/metastore-common/pom.xml
- standalone-metastore/pom.xml
-
-diff --git
a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
-index d90d590e29..6972ddef9b 100644
----
a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
-+++
b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
-@@ -188,7 +188,7 @@ private void checkAppenderState(String msg, String
routingAppenderName, String q
- Map<String, Appender> appendersMap = loggerConfig.getAppenders();
- RoutingAppender routingAppender = (RoutingAppender)
appendersMap.get(routingAppenderName);
- Assert.assertNotNull(msg + "could not find routingAppender " +
routingAppenderName, routingAppender);
-- Field defaultsField = RoutingAppender.class.getDeclaredField("appenders");
-+ Field defaultsField =
RoutingAppender.class.getDeclaredField("createdAppenders");
- defaultsField.setAccessible(true);
- ConcurrentHashMap appenders = (ConcurrentHashMap)
defaultsField.get(routingAppender);
- AppenderControl appenderControl = (AppenderControl)
appenders.get(queryId);
-@@ -219,7 +219,7 @@ private Appender getAppender(String routingAppenderName,
String queryId)
- Map<String, Appender> appendersMap = loggerConfig.getAppenders();
- RoutingAppender routingAppender = (RoutingAppender)
appendersMap.get(routingAppenderName);
- Assert.assertNotNull("could not find routingAppender " +
routingAppenderName, routingAppender);
-- Field defaultsField = RoutingAppender.class.getDeclaredField("appenders");
-+ Field defaultsField =
RoutingAppender.class.getDeclaredField("createdAppenders");
- defaultsField.setAccessible(true);
- ConcurrentHashMap appenders = (ConcurrentHashMap)
defaultsField.get(routingAppender);
- AppenderControl appenderControl = (AppenderControl)
appenders.get(queryId);
-diff --git a/pom.xml b/pom.xml
-index 17dd2cf886..123c642c13 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -181,7 +181,7 @@
- <kryo.version>3.0.3</kryo.version>
- <libfb303.version>0.9.3</libfb303.version>
- <libthrift.version>0.9.3</libthrift.version>
-- <log4j2.version>2.10.0</log4j2.version>
-+ <log4j2.version>2.12.1</log4j2.version>
- <opencsv.version>2.3</opencsv.version>
- <orc.version>1.5.6</orc.version>
- <mockito-all.version>1.10.19</mockito-all.version>
diff --git a/ql/pom.xml b/ql/pom.xml
index 1b49ec8b5a..2a99fd52c3 100644
--- a/ql/pom.xml
@@ -63,35 +14,10 @@ index 1b49ec8b5a..2a99fd52c3 100644
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
-diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
b/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
-index 664734c7bc..67bbd8eb07 100644
----
a/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
-+++
b/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
-@@ -73,6 +73,10 @@ public String getCurrentFileName(RollingFileManager
rollingFileManager) {
- return getLogFileName(pattern);
- }
-
-+ @Override public void clearCurrentFileName() {
-+ // no rename is needed
-+ }
-+
- /**
- * @return Mangled file name formed by appending the current timestamp
- */
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index bd2e51edeb..e74a3b6ebe 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
-@@ -78,8 +78,8 @@
- <junit.version>4.11</junit.version>
- <libfb303.version>0.9.3</libfb303.version>
- <libthrift.version>0.9.3</libthrift.version>
-- <log4j2.version>2.8.2</log4j2.version>
- <mockito-all.version>1.10.19</mockito-all.version>
-+ <log4j2.version>2.12.1</log4j2.version>
- <orc.version>1.5.1</orc.version>
- <protobuf.version>2.5.0</protobuf.version>
- <sqlline.version>1.3.0</sqlline.version>
@@ -254,6 +254,11 @@
<artifactId>hive-storage-api</artifactId>
<version>${storage-api.version}</version>
@@ -104,16 +30,3 @@ index bd2e51edeb..e74a3b6ebe 100644
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
-diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
-index 10dda97248..f4ec5a57c6 100644
---- a/testutils/ptest2/pom.xml
-+++ b/testutils/ptest2/pom.xml
-@@ -26,7 +26,7 @@ limitations under the License.
- <name>hive-ptest</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- <log4j2.version>2.10.0</log4j2.version>
-+ <log4j2.version>2.12.1</log4j2.version>
- <spring.framework.version>3.2.16.RELEASE</spring.framework.version>
- <jclouds.version>2.0.0</jclouds.version>
- <checkstyle.conf.dir>${basedir}/../../checkstyle/</checkstyle.conf.dir>
diff --git a/bigtop-packages/src/common/hive/patch8-HIVE-25795-branch-3.1.diff
b/bigtop-packages/src/common/hive/patch8-HIVE-25795-branch-3.1.diff
deleted file mode 100644
index b797d478..00000000
--- a/bigtop-packages/src/common/hive/patch8-HIVE-25795-branch-3.1.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/bin/hive-config.sh b/bin/hive-config.sh
-index d52b84eb5f..8381a25a05 100644
---- a/bin/hive-config.sh
-+++ b/bin/hive-config.sh
-@@ -68,3 +68,7 @@ export HIVE_AUX_JARS_PATH=$HIVE_AUX_JARS_PATH
-
- # Default to use 256MB
- export HADOOP_HEAPSIZE=${HADOOP_HEAPSIZE:-256}
-+
-+# Disable the JNDI. This feature has critical RCE vulnerability.
-+# when 2.x <= log4j.version <= 2.14.1
-+export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS
-Dlog4j2.formatMsgNoLookups=true"
-diff --git a/pom.xml b/pom.xml
-index 123c642c13..e97c9187ab 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -181,7 +181,7 @@
- <kryo.version>3.0.3</kryo.version>
- <libfb303.version>0.9.3</libfb303.version>
- <libthrift.version>0.9.3</libthrift.version>
-- <log4j2.version>2.12.1</log4j2.version>
-+ <log4j2.version>2.15.0</log4j2.version>
- <opencsv.version>2.3</opencsv.version>
- <orc.version>1.5.6</orc.version>
- <mockito-all.version>1.10.19</mockito-all.version>
-diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
-index e74a3b6ebe..32865dd448 100644
---- a/standalone-metastore/pom.xml
-+++ b/standalone-metastore/pom.xml
-@@ -79,7 +79,7 @@
- <libfb303.version>0.9.3</libfb303.version>
- <libthrift.version>0.9.3</libthrift.version>
- <mockito-all.version>1.10.19</mockito-all.version>
-- <log4j2.version>2.12.1</log4j2.version>
-+ <log4j2.version>2.15.0</log4j2.version>
- <orc.version>1.5.1</orc.version>
- <protobuf.version>2.5.0</protobuf.version>
- <sqlline.version>1.3.0</sqlline.version>
diff --git a/bigtop-packages/src/common/hive/patch9-log4j2-2.17.1.diff
b/bigtop-packages/src/common/hive/patch9-log4j2-2.17.1.diff
deleted file mode 100644
index 942436b2..00000000
--- a/bigtop-packages/src/common/hive/patch9-log4j2-2.17.1.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index e97c9187ab..bd9c1457f5 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -181,7 +181,7 @@
- <kryo.version>3.0.3</kryo.version>
- <libfb303.version>0.9.3</libfb303.version>
- <libthrift.version>0.9.3</libthrift.version>
-- <log4j2.version>2.15.0</log4j2.version>
-+ <log4j2.version>2.17.1</log4j2.version>
- <opencsv.version>2.3</opencsv.version>
- <orc.version>1.5.6</orc.version>
- <mockito-all.version>1.10.19</mockito-all.version>
-diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
-index 32865dd448..32f66359f4 100644
---- a/standalone-metastore/pom.xml
-+++ b/standalone-metastore/pom.xml
-@@ -79,7 +79,7 @@
- <libfb303.version>0.9.3</libfb303.version>
- <libthrift.version>0.9.3</libthrift.version>
- <mockito-all.version>1.10.19</mockito-all.version>
-- <log4j2.version>2.15.0</log4j2.version>
-+ <log4j2.version>2.17.1</log4j2.version>
- <orc.version>1.5.1</orc.version>
- <protobuf.version>2.5.0</protobuf.version>
- <sqlline.version>1.3.0</sqlline.version>
diff --git a/bigtop.bom b/bigtop.bom
index 97dbaf6e..c6700e82 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -166,7 +166,7 @@ bigtop {
'hive' {
name = 'hive'
relNotes = 'Apache Hive'
- version { base = '3.1.2'; pkg = base; release = 3 }
+ version { base = '3.1.3'; pkg = base; release = 1 }
tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/$name-${version.base}/"
