>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a
---
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
3 files changed, 22 insertions(+), 10 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/49/18149/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 43b16fe..a1da969 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -91,12 +91,8 @@
<hadoop.version>3.3.6</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.22.1</log4j.version>
-<<<<<<< HEAD (b7cce6 [ASTERIXDB-3341][COMP]: CBO choosing bad indexes (CH2
Q8))
- <awsjavasdk.version>2.20.135</awsjavasdk.version>
- <awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version>
-=======
<awsjavasdk.version>2.23.3</awsjavasdk.version>
->>>>>>> BRANCH (70885c Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ <awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version>
<parquet.version>1.12.3</parquet.version>
<hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 7e15fb9..1717ba6 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -480,13 +480,8 @@
<groupId>software.amazon.awssdk</groupId>
<artifactId>third-party-jackson-core</artifactId>
<properties>
-<<<<<<< HEAD (b7cce6 [ASTERIXDB-3341][COMP]: CBO choosing bad indexes (CH2
Q8))
-
<license.alternateNoticeFile>2.17.218:META-INF/NOTICE.txt,2.20.37:META-INF/NOTICE.txt,2.20.135:META-INF/NOTICE.txt</license.alternateNoticeFile>
-
<license.alternateLicenseFile>2.17.218:META-INF/LICENSE.txt,2.20.37:META-INF/LICENSE.txt,2.20.135:META-INF/LICENSE.txt</license.alternateLicenseFile>
-=======
<license.alternateNoticeFile>2.23.3:META-INF/NOTICE.txt</license.alternateNoticeFile>
<license.alternateLicenseFile>2.23.3:META-INF/LICENSE.txt</license.alternateLicenseFile>
->>>>>>> BRANCH (70885c Merge branch 'gerrit/neo' into 'gerrit/trinity')
</properties>
</project>
</supplement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149
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: I1d024c219be00fcc91c2d3f87973cb3e5942626a
Gerrit-Change-Number: 18149
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
