>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
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/asterix-external-data/pom.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
5 files changed, 60 insertions(+), 163 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/asterix-external-data/pom.xml
b/asterixdb/asterix-external-data/pom.xml
index a493aac..4306864 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -212,7 +212,11 @@
<usedDependency>io.netty:netty-codec-http2</usedDependency>
<usedDependency>io.netty:netty-transport-native-unix-common</usedDependency>
<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>
@@ -518,6 +522,11 @@
<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/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index a09eea8..479ef85 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -540,13 +540,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>
- <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>
</overrides>
<licenses>
<license>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 6b183a7..265aa37 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>
@@ -1945,19 +1944,28 @@
<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 -->
-
- <!-- 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>
<version>1.5.4</version>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ <version>1.56.1</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 468fb15..57c6fe6 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -1291,9 +1291,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</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>
@@ -1311,19 +1311,6 @@
</project>
</supplement>
- <!-- io.opencensus uses ALv2 with no NOTICE file -->
- <supplement>
- <project>
- <groupId>io.opencensus</groupId>
- <artifactId>opencensus-contrib-grpc-metrics</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- io.opencensus uses non-fixed ALv2 with no NOTICE file -->
<supplement>
<project>
@@ -1655,19 +1642,6 @@
</project>
</supplement>
- <!-- io.perfmark uses ALv2 license -->
- <supplement>
- <project>
- <groupId>io.perfmark</groupId>
- <artifactId>perfmark-api</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>0.23.0</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>0.23.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.23.0</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- com.google.apis:google-api-services-iamcredentials has embedded ASLv2
in pom.xml -->
<supplement>
<project>
@@ -1747,16 +1721,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>
@@ -1778,6 +1745,20 @@
<supplement>
<project>
<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>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.grpc uses ALv2 -->
+ <supplement>
+ <project>
+ <groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<properties>
<license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
@@ -1905,97 +1886,6 @@
</project>
</supplement>
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-core</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-grpclb</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf-lite</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-services</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-xds</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- com.google.protobuf has no NOTICE file -->
<supplement>
<project>
@@ -2491,28 +2381,6 @@
</project>
</supplement>
-<<<<<<< HEAD (8a18d7 [NO ISSUE][*DB][TEST] += ability for modules to add jvm
args)
- <supplement>
- <project>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <properties>
-
<license.ignoreMissingEmbeddedNotice>1.60</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreMissingEmbeddedLicense>1.60</license.ignoreMissingEmbeddedLicense>
- <license.ignoreLicenseOverride>1.60</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <properties>
-
<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>
@@ -2520,7 +2388,6 @@
<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: 4
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
