>From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20276 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/ionic'
* [NO ISSUE][MISC] Update nimbus-jose-jwt to 10.0.2 to address CVE
Ext-ref: MB-68239
Change-Id: I1354b0dd1e86c77d6054448e8970074d904f0424
---
M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
M hyracks-fullstack/pom.xml
3 files changed, 22 insertions(+), 17 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/76/20276/1
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index 97feda6..a746c86 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -104,17 +104,6 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
-<<<<<<< HEAD (bfe4b3 [NO ISSUE][EXT] Upgrage Delta Kernel API to v4.0.0)
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </exclusion>
- <exclusion>
-=======
->>>>>>> BRANCH (4565c0 Merge branch 'gerrit/neo' into 'gerrit/trinity')
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index f33f151..23d392e 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -649,7 +649,11 @@
<version>2.4.11</version>
</dependency>
<dependency>
-<<<<<<< HEAD (bfe4b3 [NO ISSUE][EXT] Upgrage Delta Kernel API to v4.0.0)
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <version>10.0.2</version>
+ </dependency>
+ <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
@@ -683,11 +687,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>3.4.1</version>
-=======
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>10.0.2</version>
->>>>>>> BRANCH (4565c0 Merge branch 'gerrit/neo' into 'gerrit/trinity')
</dependency>
</dependencies>
</dependencyManagement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20276
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: I1354b0dd1e86c77d6054448e8970074d904f0424
Gerrit-Change-Number: 20276
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
