>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21243?usp=email )
Change subject: Merge branch 'gerrit/morpheus' into 'gerrit/lumina'
......................................................................
Merge branch 'gerrit/morpheus' into 'gerrit/lumina'
* [NO ISSUE][HYR][NET] Update Netty to 4.1.133.Final for CVEs (MB-71895)
Change-Id: Iea69deabc6ee17c02622e0ebcaaad055e0a1bc75
---
M hyracks-fullstack/pom.xml
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index c5aba78..d7e7ee5 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -76,8 +76,7 @@
<jackson.version>2.21.3</jackson.version>
<jackson-annotations.version>2.21</jackson-annotations.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (963229 [NO ISSUE][MISC] Remove maven-antrun-plugin override)
- <netty.version>4.1.132.Final</netty.version>
+ <netty.version>4.1.133.Final</netty.version>
<asm.version>9.3</asm.version>
<awsjavasdk.version>2.44.4</awsjavasdk.version>
@@ -85,9 +84,6 @@
<google-cloud-storage.version>2.68.0</google-cloud-storage.version>
<!-- @derived-from:
com.google.cloud:google-cloud-storage:${google-cloud-storage.version}#dep:google-cloud-core
-->
<google-cloud-core.version>2.70.0</google-cloud-core.version>
-=======
- <netty.version>4.1.133.Final</netty.version>
->>>>>>> BRANCH (1b5a6b Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21243?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: lumina
Gerrit-Change-Id: Iea69deabc6ee17c02622e0ebcaaad055e0a1bc75
Gerrit-Change-Number: 21243
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Jenkins <[email protected]>
