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 605b81cb372693528fc81e4a66431b6a46778be7
Merge: 619b8c5 2d5bd95
Author: Michael Blow <[email protected]>
AuthorDate: Sun Jun 14 08:40:38 2020 -0400

    Merge from branch 'gerrit/stabilization-f69489'
    
    Change-Id: I388f3af0307d5482da4cfd559a7373fa4887c425

 asterixdb/asterix-app/pom.xml |  1 -
 asterixdb/pom.xml             |  1 +
 hyracks-fullstack/pom.xml     | 10 ++++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --cc asterixdb/pom.xml
index 9daf70f,81e53c5..72a658e
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -73,15 -71,13 +73,16 @@@
      <global.itest.excludes/>
      <itest.includes>${global.itest.includes}</itest.includes>
      <itest.excludes>${global.itest.excludes}</itest.excludes>
 +    <license.stage>compile</license.stage>
 +    <resource.stage>process-classes</resource.stage>
  
      <!-- Versions under dependencymanagement or used in many projects via 
properties -->
 -    <algebricks.version>0.3.4.2-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.4.2-SNAPSHOT</hyracks.version>
 +    <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
 +    <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
      <hadoop.version>2.8.5</hadoop.version>
      <jacoco.version>0.7.6.201602180812</jacoco.version>
+     <log4j.version>2.13.3</log4j.version>
 +    <awsjavasdk.version>2.10.83</awsjavasdk.version>
  
      <implementation.title>Apache AsterixDB - 
${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>

Reply via email to