>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20933?usp=email )
Change subject: Merge branch 'gerrit/morpheus' into 'master'
......................................................................
Merge branch 'gerrit/morpheus' into 'master'
* [ASTERIXDB-3677][COMP] Fix nested star operators failure (MB-70076)
* [NO ISSUE][HYR][NET] Upgrade gRPC to address Netty CVE (MB-70641)
* [NO ISSUE][MISC] Update Log4j to 2.25.3 for CVE (MB-70643)
* [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for CVE (MB-70644)
Change-Id: Ic7feef98087205543e831d44edd1d9acea5045cb
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
M asterixdb/pom.xml
3 files changed, 11 insertions(+), 17 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
Jenkins: Verified
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
index 476ef27..bdcbe3c 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
@@ -44,7 +44,7 @@
import org.apache.asterix.optimizer.base.AnalysisUtil;
import
org.apache.asterix.optimizer.rules.am.array.AbstractOperatorFromSubplanRewrite;
import org.apache.asterix.translator.ConstantHelper;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 014aadd..aecb8b5 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -89,26 +89,16 @@
<gcs.stage>none</gcs.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (bee318 Null merge branch 'gerrit/morpheus' into 'master')
<algebricks.version>0.3.10-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.10-SNAPSHOT</hyracks.version>
- <hadoop.version>3.4.1</hadoop.version>
-=======
- <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version>
<hadoop.version>3.4.2</hadoop.version>
->>>>>>> BRANCH (a2e1e1 Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (bee318 Null merge branch 'gerrit/morpheus' into 'master')
- <log4j.version>2.22.1</log4j.version>
+ <log4j.version>2.25.3</log4j.version>
<!-- IMPORTANT: please keep the aws-crt version in sync with that defined
in the AWS SDK BOM -->
<!-- you can get this by inspecting the aws-sdk-java-pom for the SDK
version. e.g.
$ curl -s
https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java-pom/2.31.57/aws-sdk-java-pom-2.31.57.pom
| grep awscrt.version
<awscrt.version>0.38.1</awscrt.version>
-->
-=======
- <log4j.version>2.25.3</log4j.version>
->>>>>>> BRANCH (a2e1e1 Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
<awsjavasdk.version>2.29.27</awsjavasdk.version>
<awsjavasdk.crt.version>0.33.3</awsjavasdk.crt.version>
@@ -1893,11 +1883,6 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty-shaded</artifactId>
- <version>1.78.0</version>
- </dependency>
- <dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-http-util</artifactId>
<version>${io.opencensus.version}</version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20933?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: master
Gerrit-Change-Id: Ic7feef98087205543e831d44edd1d9acea5045cb
Gerrit-Change-Number: 20933
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
