>From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19133 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
Ext-ref: MB-64327
Change-Id: I00535f7e759863d6efa11923b9b99c27611edd9c
---
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
3 files changed, 16 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/33/19133/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 35899ba..374a717 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -100,11 +100,7 @@
<hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
<azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version>
-<<<<<<< HEAD (813c15 [NO ISSUE][HYR][MISC] += InvokeUtil.tryWithCleanups
variant )
- <azureidentity.version>1.13.1</azureidentity.version>
-=======
<azureidentity.version>1.13.3</azureidentity.version>
->>>>>>> BRANCH (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version>
<gcsjavasdk.version>2.40.1</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 98d7a26..8f69a80 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -770,14 +770,9 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<properties>
-<<<<<<< HEAD (813c15 [NO ISSUE][HYR][MISC] += InvokeUtil.tryWithCleanups
variant )
-
<license.ignoreMissingEmbeddedLicense>1.16.1</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.16.1</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>1.17.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.17.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.17.1</license.ignoreLicenseOverride>
->>>>>>> BRANCH (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
</properties>
</project>
</supplement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19133
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: goldfish
Gerrit-Change-Id: I00535f7e759863d6efa11923b9b99c27611edd9c
Gerrit-Change-Number: 19133
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
