[asterixdb] 02/02: Merge branch 'gerrit/log4jfix-5e11053887'

[mb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 78ac695633928dc83fb52c8b46e64e52befdcc42
Merge: 5611472 18022c0
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sat Dec 11 11:42:42 2021 -0500

    Merge branch 'gerrit/log4jfix-5e11053887'
    
    Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de

 asterixdb/pom.xml         | 2 +-
 hyracks-fullstack/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc asterixdb/pom.xml
index 14a7e4d,933cfb1..64b4f0f
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -82,18 -82,14 +82,18 @@@
      <skip-npm-touch.stage>none</skip-npm-touch.stage>
  
      <!-- Versions under dependencymanagement or used in many projects via properties -->
 -    <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
 -    <hadoop.version>2.8.5</hadoop.version>
 +    <algebricks.version>0.3.7-SNAPSHOT</algebricks.version>
 +    <hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
 +    <hadoop.version>3.3.1</hadoop.version>
      <jacoco.version>0.7.6.201602180812</jacoco.version>
-     <log4j.version>2.14.1</log4j.version>
+     <log4j.version>2.15.0</log4j.version>
 -    <awsjavasdk.version>2.10.83</awsjavasdk.version>
 -    <azurejavasdk.version>12.12.0</azurejavasdk.version>
 -    <parquet.version>1.8.2</parquet.version>
 +    <awsjavasdk.version>2.17.79</awsjavasdk.version>
 +    <parquet.version>1.12.0</parquet.version>
 +    <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
 +    <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
 +    <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
 +    <gcsjavasdk.version>1.114.0</gcsjavasdk.version>
 +    <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
  
      <implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc hyracks-fullstack/pom.xml
index d0cbcb9,c35af4f..cc5f1aa
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -70,11 -70,10 +70,11 @@@
      <test.includes>${global.test.includes}</test.includes>
      <test.excludes>${global.test.excludes}</test.excludes>
      <!-- Versions under dependencymanagement or used in many projects via properties -->
 -    <hadoop.version>2.8.5</hadoop.version>
 +    <hadoop.version>3.3.1</hadoop.version>
      <jacoco.version>0.7.6.201602180812</jacoco.version>
-     <log4j.version>2.14.1</log4j.version>
+     <log4j.version>2.15.0</log4j.version>
      <snappy.version>1.1.8.4</snappy.version>
 +    <jackson.version>2.13.0</jackson.version>
  
      <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>