>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19183 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-64482
Change-Id: I36e4b3c4dd38eeed196eec863a4cc289c8ef7623
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-external-data/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/pom.xml
6 files changed, 97 insertions(+), 146 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/83/19183/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 03ecaed..d9f235f 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -408,12 +408,8 @@
-Dfile.encoding=UTF-8
-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag}
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
-
-Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log"
-XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M
-
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
--add-opens=java.management/sun.management=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
-=======
-Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log"
-XX:+PrintGC
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
+
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
--add-opens=java.management/sun.management=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
</argLine>
</configuration>
<goals>
diff --git a/asterixdb/asterix-external-data/pom.xml
b/asterixdb/asterix-external-data/pom.xml
index d6bc647..bcccb48 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -214,9 +214,6 @@
<usedDependency>io.netty:netty-handler-proxy</usedDependency>
<usedDependency>io.netty:netty-handler-proxy</usedDependency>
</usedDependencies>
- <ignoredUnusedDeclaredDependencies>
-
<unusedDeclaredDependency>io.grpc:grpc-census:*</unusedDeclaredDependency>
- </ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
@@ -526,11 +523,6 @@
<groupId>com.google.cloud.bigdataoss</groupId>
<artifactId>gcs-connector</artifactId>
</dependency>
- <!-- explicitly include grpc-census, to ensure the correct version -->
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-census</artifactId>
- </dependency>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 13e73c4..0377012 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -83,36 +83,22 @@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.6</hadoop.version>
-=======
- <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
<hadoop.version>3.4.1</hadoop.version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<log4j.version>2.22.1</log4j.version>
- <awsjavasdk.version>2.23.3</awsjavasdk.version>
-=======
- <log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.29.27</awsjavasdk.version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
<parquet.version>1.12.3</parquet.version>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version>
-=======
<hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
<azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
<azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version>
<azureidentity.version>1.13.3</azureidentity.version>
<azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version>
<gcsjavasdk.version>2.45.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
- <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version>
+ <hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version>
+ <io.opencensus.version>0.31.1</io.opencensus.version>
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -1237,11 +1223,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>1.25.0</version>
-=======
<version>1.27.1</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -1251,11 +1233,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>1.3.0</version>
-=======
<version>1.3.4</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
@@ -1495,11 +1473,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>1.16.0</version>
-=======
<version>1.17.1</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
@@ -1880,11 +1854,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>1.10.0</version>
-=======
<version>1.12.0</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
@@ -1998,15 +1968,6 @@
<groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId>
</exclusion>
- <!-- exclude transitive grpc-api,grpc-census dependencies, as they
are bringing in older versions -->
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-census</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- Hadoop GCS end -->
@@ -2015,12 +1976,6 @@
<artifactId>jettison</artifactId>
<version>1.5.4</version>
</dependency>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-census</artifactId>
- <version>1.56.1</version>
-=======
<!-- CVE-2024-8184 -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -2031,7 +1986,56 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>9.4.56.v20240826</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ <version>1.68.1</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-contrib-http-util</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-api</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-impl</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-impl-core</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-exporter-stats-stackdriver</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-contrib-exemplar-util</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-contrib-resource-util</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-exporter-metrics-util</artifactId>
+ <version>${io.opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-contrib-grpc-metrics</artifactId>
+ <version>${io.opencensus.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index f3c5abb..eebd180 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -36,12 +36,7 @@
<artifactId>slf4j-api</artifactId>
<licenses>
<license>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <name>an MIT-style license</name>
<url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/slf4j-api/LICENSE.txt</url>
-=======
-
<url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.25/slf4j-api/LICENSE.txt</url>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</license>
</licenses>
<properties>
@@ -523,13 +518,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<properties>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
-
<license.ignoreMissingEmbeddedLicense>1.12.637</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.12.637</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>1.12.779</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.779</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</properties>
</project>
</supplement>
@@ -539,13 +529,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>jmespath-java</artifactId>
<properties>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
-
<license.ignoreMissingEmbeddedLicense>1.12.637</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.12.637</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>1.12.779</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.779</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</properties>
</project>
</supplement>
@@ -555,13 +540,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<properties>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
-
<license.ignoreMissingEmbeddedLicense>1.12.637</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.12.637</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>1.12.779</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.779</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</properties>
</project>
</supplement>
@@ -571,13 +551,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<properties>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
-
<license.ignoreMissingEmbeddedLicense>1.12.637</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.12.637</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>1.12.779</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.779</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</properties>
</project>
</supplement>
@@ -587,13 +562,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
<properties>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
-
<license.ignoreMissingEmbeddedLicense>1.12.637</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.12.637</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>1.12.779</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.779</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</properties>
</project>
</supplement>
@@ -1214,9 +1184,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-exemplar-util</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1240,9 +1210,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-exemplar-util</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1387,9 +1357,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-resource-util</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1400,9 +1370,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-metrics-util</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1413,9 +1383,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-stats-stackdriver</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1426,9 +1396,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-impl-core</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1439,9 +1409,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-impl</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1537,19 +1507,6 @@
</project>
</supplement>
- <!-- com.google.api.grpc uses ALv2 with no NOTICE file -->
- <supplement>
- <project>
- <groupId>com.google.api.grpc</groupId>
- <artifactId>proto-google-cloud-monitoring-v3</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.64.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.64.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.64.0</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- com.lmax uses ALv2 with no NOTICE file -->
<supplement>
<project>
@@ -1705,10 +1662,10 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-census</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.56.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>1.68.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.68.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.68.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.68.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1943,8 +1900,8 @@
<groupId>com.google.cloud.opentelemetry</groupId>
<artifactId>exporter-metrics</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 30425a9..66b4ebb 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -277,20 +277,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>2.15.1</version>
-=======
<version>2.18.0</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>1.11.0</version>
-=======
<version>1.12.0</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -337,11 +329,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <version>3.14.0</version>
-=======
<version>3.17.0</version>
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -352,14 +340,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
-<<<<<<< HEAD (5aa9a2 Merge branch 'gerrit/neo' into 'gerrit/trinity')
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
<version>4.4.16</version>
-=======
->>>>>>> BRANCH (960308 Merge branch 'gerrit/7.1.x' into 'gerrit/neo')
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19183
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I36e4b3c4dd38eeed196eec863a4cc289c8ef7623
Gerrit-Change-Number: 19183
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
