>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17885 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Ic281767d6cc45acc53b1d4f5f6881ad984797200
---
M asterixdb/pom.xml
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
3 files changed, 18 insertions(+), 7 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index fbcaa8e..e31b4ac 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -90,14 +90,9 @@
<hyracks.version>0.3.9-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.6</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (ac81f1 [ASTERIXDB-3287][SQL++] Support parsing COPY TO
statement)
- <log4j.version>2.19.0</log4j.version>
+ <log4j.version>2.21.1</log4j.version>
<awsjavasdk.version>2.20.135</awsjavasdk.version>
<awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version>
-=======
- <log4j.version>2.21.1</log4j.version>
- <awsjavasdk.version>2.17.218</awsjavasdk.version>
->>>>>>> BRANCH (4cb70d [NO ISSUE][HYR][HTTP] Enable CLF logger instance
customizati)
<parquet.version>1.12.3</parquet.version>
<hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
index bd7bf75..4711390 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
- <version>0.3.8.2-SNAPSHOT</version>
+ <version>0.3.9-SNAPSHOT</version>
</parent>
<licenses>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17885
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: Ic281767d6cc45acc53b1d4f5f6881ad984797200
Gerrit-Change-Number: 17885
Gerrit-PatchSet: 4
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
