>From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17857 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: If21b84885d2b5d8e899b58eeb1955079c00e34d3
---
M asterixdb/asterix-external-data/pom.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/pom.xml
M
asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
5 files changed, 26 insertions(+), 28 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
index e457109..9a05148 100644
---
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
+++
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
@@ -65,11 +65,6 @@
IActiveEntityEventsListener[] getEventListeners();
/**
- * @return List of all the registered event listeners
- */
- Collection<IActiveEntityEventsListener> getEventListenersAsList();
-
- /**
* Lookup an event listener using the entity id
*
* @param entityId
diff --git a/asterixdb/asterix-external-data/pom.xml
b/asterixdb/asterix-external-data/pom.xml
index b236abc..476708b 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -560,7 +560,11 @@
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</dependency>
-<<<<<<< HEAD (ad2e10 [ASTERIXDB-3259][MTD] Change SQLPP parser to parse
multipart)
+ <!-- Manually overridden to avoid CVE-2023-1436, CVE-2022-45693,
CVE-2022-45685, CVE-2022-40150, CVE-2022-40149 -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-core</artifactId>
@@ -570,12 +574,6 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.1</version>
-=======
- <!-- Manually overridden to avoid CVE-2023-1436, CVE-2022-45693,
CVE-2022-45685, CVE-2022-40150, CVE-2022-40149 -->
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
->>>>>>> BRANCH (4bdcbc Merge branch 'gerrit/neo' into 'gerrit/trinity')
</dependency>
</dependencies>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 3f8b3dc..98517ef 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -544,14 +544,6 @@
<gav>com.google.api:gax-grpc:2.7.1</gav>
<url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url>
</override>
-<<<<<<< HEAD (ad2e10 [ASTERIXDB-3259][MTD] Change SQLPP parser to parse
multipart)
- <override>
- <gavs>
- <gav>org.bouncycastle:bcprov-jdk15on:1.60</gav>
- <gav>org.bouncycastle:bcpkix-jdk15on:1.60</gav>
- </gavs>
-
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
- </override>
<override>
<gavs>
<gav>org.jetbrains:annotations:17.0.0</gav>
@@ -591,8 +583,6 @@
</gavs>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</override>
-=======
->>>>>>> BRANCH (4bdcbc Merge branch 'gerrit/neo' into 'gerrit/trinity')
</overrides>
<licenses>
<license>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index bed7e57..65116d3 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -87,15 +87,9 @@
<azurite.stage>none</azurite.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (ad2e10 [ASTERIXDB-3259][MTD] Change SQLPP parser to parse
multipart)
<algebricks.version>0.3.9-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.9-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.4</hadoop.version>
-=======
- <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.6</hadoop.version>
->>>>>>> BRANCH (4bdcbc Merge branch 'gerrit/neo' into 'gerrit/trinity')
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.20.135</awsjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17857
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: If21b84885d2b5d8e899b58eeb1955079c00e34d3
Gerrit-Change-Number: 17857
Gerrit-PatchSet: 5
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: merged
