>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17852 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I568a2df4594bdde19932ba72362c9661096a9183
---
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
3 files changed, 31 insertions(+), 23 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/52/17852/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 6b183a7..c946151 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1934,7 +1934,6 @@
<version>${hadoop.version}</version>
</dependency>
<!-- Hadoop Azure end -->
-<<<<<<< HEAD (8a18d7 [NO ISSUE][*DB][TEST] += ability for modules to add jvm
args)
<!-- Hadoop GCS start -->
<dependency>
<groupId>com.google.cloud.bigdataoss</groupId>
@@ -1948,11 +1947,6 @@
</exclusions>
</dependency>
<!-- Hadoop GCS end -->
-
- <!-- TODO(htowaileb): removed from hadoop transitively and added
separately to avoid CVEs, can
- be removed once upgraded to hadoop 3.3.4 as it addresses the CVEs
-->
-=======
->>>>>>> BRANCH (1a93ce [NO ISSUE][OTH]: Add methods to collect requests/jobs
stats)
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 468fb15..e99052d 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -1747,16 +1747,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<properties>
-<<<<<<< HEAD (8a18d7 [NO ISSUE][*DB][TEST] += ability for modules to add jvm
args)
-
<license.ignoreMissingEmbeddedLicense>1.43.2,1.52.1</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2,1.52.1</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreLicenseOverride>1.43.2,1.52.1</license.ignoreLicenseOverride>
-
<license.ignoreNoticeOverride>1.43.2,1.52.1</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
->>>>>>> BRANCH (1a93ce [NO ISSUE][OTH]: Add methods to collect requests/jobs
stats)
</properties>
</project>
</supplement>
@@ -2491,7 +2484,17 @@
</project>
</supplement>
-<<<<<<< HEAD (8a18d7 [NO ISSUE][*DB][TEST] += ability for modules to add jvm
args)
+ <!-- Contains embedded LICENSE but missing NOTICE -->
+ <supplement>
+ <project>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <properties>
+
<license.ignoreMissingEmbeddedNotice>1.5.4</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
<supplement>
<project>
<groupId>org.bouncycastle</groupId>
@@ -2512,15 +2515,6 @@
<license.ignoreMissingEmbeddedNotice>1.60</license.ignoreMissingEmbeddedNotice>
<license.ignoreMissingEmbeddedLicense>1.60</license.ignoreMissingEmbeddedLicense>
<license.ignoreLicenseOverride>1.60</license.ignoreLicenseOverride>
-=======
- <!-- Contains embedded LICENSE but missing NOTICE -->
- <supplement>
- <project>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedNotice>1.5.4</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (1a93ce [NO ISSUE][OTH]: Add methods to collect requests/jobs
stats)
</properties>
</project>
</supplement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17852
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: I568a2df4594bdde19932ba72362c9661096a9183
Gerrit-Change-Number: 17852
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
