You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/12/11 16:46:11 UTC
Change in asterixdb[master]: Merge branch 'gerrit/log4jfix-5e11053887'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503 )
Change subject: Merge branch 'gerrit/log4jfix-5e11053887'
......................................................................
Merge branch 'gerrit/log4jfix-5e11053887'
Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
---
M asterixdb/pom.xml
2 files changed, 1 insertion(+), 8 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/03/14503/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 0968b53..64b4f0f 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,8 +86,7 @@
<hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (561147 [NO ISSUE][IDX] Disable index only plan when index includes )
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
@@ -95,12 +94,6 @@
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.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>
->>>>>>> BRANCH (18022c [NO ISSUE] Update log4j2 dependencies 2.14.1 -> 2.15.0)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
Gerrit-Change-Number: 14503
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/log4jfix-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503 )
Change subject: Merge branch 'gerrit/log4jfix-5e11053887'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
Gerrit-Change-Number: 14503
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sat, 11 Dec 2021 17:29:59 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/log4jfix-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503 )
Change subject: Merge branch 'gerrit/log4jfix-5e11053887'
......................................................................
Merge branch 'gerrit/log4jfix-5e11053887'
Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
---
M asterixdb/pom.xml
2 files changed, 1 insertion(+), 8 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/03/14503/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 0968b53..64b4f0f 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,8 +86,7 @@
<hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (561147 [NO ISSUE][IDX] Disable index only plan when index includes )
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
@@ -95,12 +94,6 @@
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.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>
->>>>>>> BRANCH (18022c [NO ISSUE] Update log4j2 dependencies 2.14.1 -> 2.15.0)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
Gerrit-Change-Number: 14503
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/log4jfix-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503 )
Change subject: Merge branch 'gerrit/log4jfix-5e11053887'
......................................................................
Merge branch 'gerrit/log4jfix-5e11053887'
Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
---
M asterixdb/pom.xml
2 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 0968b53..64b4f0f 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,8 +86,7 @@
<hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (561147 [NO ISSUE][IDX] Disable index only plan when index includes )
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
@@ -95,12 +94,6 @@
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.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>
->>>>>>> BRANCH (18022c [NO ISSUE] Update log4j2 dependencies 2.14.1 -> 2.15.0)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
Gerrit-Change-Number: 14503
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/log4jfix-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503 )
Change subject: Merge branch 'gerrit/log4jfix-5e11053887'
......................................................................
Patch Set 1: Verified+1
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14503
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de
Gerrit-Change-Number: 14503
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sat, 11 Dec 2021 17:46:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment