>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19185 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
Ext-ref: MB-64482
Change-Id: I8f33eb81468d6fc578ac49101a44f73e5c597511
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
R
asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt
6 files changed, 27 insertions(+), 41 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 656eee7..1b6ec5e 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -531,8 +531,7 @@
-Dfile.encoding=UTF-8
-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag}
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
-
-Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log"
-XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M
+
-Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log"
-XX:+PrintGC -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
@@ -540,10 +539,6 @@
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
-=======
-
-Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log"
-XX:+PrintGC
-
--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
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
</argLine>
</configuration>
<goals>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 09ba045..83ee04d 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -600,6 +600,10 @@
</gavs>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</override>
+ <override>
+ <gav>org.bouncycastle:bcprov-jdk18on:1.78.1</gav>
+
<url>https://raw.githubusercontent.com/bcgit/bc-java/refs/tags/r1rv78v1/LICENSE.html</url>
+ </override>
</overrides>
<licenses>
<license>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 02e71a9..c0f9792 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -89,44 +89,24 @@
<gcs.stage>none</gcs.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
<algebricks.version>0.3.10-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.10-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.6</hadoop.version>
-=======
- <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version>
<hadoop.version>3.4.1</hadoop.version>
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.22.1</log4j.version>
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
- <awsjavasdk.version>2.24.9</awsjavasdk.version>
+ <awsjavasdk.version>2.29.27</awsjavasdk.version>
<awsjavasdk.crt.version>0.29.10</awsjavasdk.crt.version>
<parquet.version>1.14.1</parquet.version>
- <hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version>
-=======
- <awsjavasdk.version>2.29.27</awsjavasdk.version>
- <parquet.version>1.12.3</parquet.version>
<hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version>
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<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>
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
- <gcsjavasdk.version>2.40.1</gcsjavasdk.version>
-=======
<gcsjavasdk.version>2.45.0</gcsjavasdk.version>
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
- <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version>
- <protobuf-java.version>3.23.2</protobuf-java.version>
-=======
<hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version>
<io.opencensus.version>0.31.1</io.opencensus.version>
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ <protobuf-java.version>3.23.2</protobuf-java.version>
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -1295,11 +1275,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
- <version>1.26.2</version>
-=======
<version>1.27.1</version>
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -1682,7 +1658,6 @@
<artifactId>s3-transfer-manager</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
@@ -1693,8 +1668,6 @@
<artifactId>aws-crt</artifactId>
<version>${awsjavasdk.crt.version}</version>
</dependency>
-=======
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<!-- Mock for AWS S3 -->
<dependency>
<groupId>io.findify</groupId>
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_r1rv60_LICENSE.html.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt
similarity index 91%
rename from
asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_r1rv60_LICENSE.html.txt
rename to
asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt
index b8f46c5..24506f0 100644
---
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_r1rv60_LICENSE.html.txt
+++
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc.
(http://www.bouncycastle.org)
+Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software
and associated documentation files (the "Software"), to deal in the Software
without restriction,
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index c7e93b5..ec78f7b 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -75,12 +75,8 @@
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (641424 [ASTERIXDB-3353][EXT] Fix handling of arrays in Avro
union t)
- <netty.version>4.1.101.Final</netty.version>
- <asm.version>9.3</asm.version>
-=======
<netty.version>4.1.115.Final</netty.version>
->>>>>>> BRANCH (3f64c5 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ <asm.version>9.3</asm.version>
<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/+/19185
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: goldfish
Gerrit-Change-Id: I8f33eb81468d6fc578ac49101a44f73e5c597511
Gerrit-Change-Number: 19185
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
