>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19463 )
Change subject: Merge branch 'gerrit/morpheus' into 'master'
......................................................................
Merge branch 'gerrit/morpheus' into 'master'
Ext-ref: MB-65226
Change-Id: If65ef6e3bf21d776a3954fa6dc08c44a2c623131
---
M hyracks-fullstack/hyracks/hyracks-api/pom.xml
2 files changed, 31 insertions(+), 3 deletions(-)
Approvals:
Jenkins: Verified; Verified
Michael Blow: Looks good to me, approved; Verified
diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml
b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
index d672135..52f47f9 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
@@ -106,13 +106,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
-<<<<<<< HEAD (eebf97 [ASTERIXDB-3568][COMP] Add transitive closure INNER
join pre)
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
-=======
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
->>>>>>> BRANCH (7b8a94 [NO ISSUE][*DB][MISC] Updates to accommodate Java 21)
</dependency>
</dependencies>
</project>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19463
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: If65ef6e3bf21d776a3954fa6dc08c44a2c623131
Gerrit-Change-Number: 19463
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
