You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2022/01/14 03:02:44 UTC

[asterixdb] 04/05: Merge branch 'gerrit/mad-hatter'

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 2c5c72900d4e6ee77f3e75d9209d3f30faff506b
Merge: 6c8bd52 77f6105
Author: Michael Blow <mb...@apache.org>
AuthorDate: Wed Jan 12 08:42:37 2022 -0500

    Merge branch 'gerrit/mad-hatter'
    
    Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06

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

diff --cc asterixdb/pom.xml
index 5114d53,45382df..4a75087
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -76,24 -76,14 +76,24 @@@
      <itest.excludes>${global.itest.excludes}</itest.excludes>
      <license.stage>compile</license.stage>
      <resource.stage>process-classes</resource.stage>
 +    <prepare-env.stage>none</prepare-env.stage>
 +    <shim.stage>none</shim.stage>
 +    <pytestlib.stage>none</pytestlib.stage>
 +    <skip-npm-touch.stage>none</skip-npm-touch.stage>
  
      <!-- Versions under dependencymanagement or used in many projects via properties -->
 -    <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.5-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.17.0</log4j.version>
+     <log4j.version>2.17.1</log4j.version>
 -    <awsjavasdk.version>2.10.83</awsjavasdk.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 6042997,efa88aa..87124f6
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -70,11 -70,9 +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.17.0</log4j.version>
+     <log4j.version>2.17.1</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>