>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17556 )
Change subject: Merge branch 'gerrit/cheshire-cat'
......................................................................
Merge branch 'gerrit/cheshire-cat'
Change-Id: I0c0bbeae92635eb016af3e42e0b1f9c5d5743645
---
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, 17 insertions(+), 18 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/56/17556/1
diff --git a/asterixdb/asterix-external-data/pom.xml
b/asterixdb/asterix-external-data/pom.xml
index 132c4cf..c2d7819 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -537,7 +537,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
</dependency>
-<<<<<<< HEAD (aedda3 [NO ISSUE][*DB]: Update smart-json to avoid encountered
CVE)
<!-- 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 -->
<dependency>
@@ -552,11 +551,10 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
-=======
+ </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
->>>>>>> BRANCH (35c42a [NO ISSUE][*DB]: Update Azure blob library)
</dependency>
</dependencies>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index b19e072..495b92f 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -519,7 +519,6 @@
<aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
<aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
<aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
-<<<<<<< HEAD (aedda3 [NO ISSUE][*DB]: Update smart-json to avoid encountered
CVE)
<aliasUrl>https://raw.githubusercontent.com/jorabin/KeePassJava2/KeePassJava2-2.1.4/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.7/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.11/LICENSE</aliasUrl>
@@ -544,9 +543,7 @@
<aliasUrl>https://raw.githubusercontent.com/googleapis/gapic-generator-java/v2.13.0/java-common-protos/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/googleapis/google-api-java-client/v2.1.2/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.52.1/LICENSE</aliasUrl>
-=======
<aliasUrl>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.28/LICENSE</aliasUrl>
->>>>>>> BRANCH (35c42a [NO ISSUE][*DB]: Update Azure blob library)
</aliasUrls>
<metric>1</metric>
</license>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index a0b51ab..868c7ee 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -88,18 +88,13 @@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
-<<<<<<< HEAD (aedda3 [NO ISSUE][*DB]: Update smart-json to avoid encountered
CVE)
<parquet.version>1.12.3</parquet.version>
<hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version>
- <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
+ <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
+ <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version>
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>2.17.2</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-=======
- <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
- <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version>
- <parquet.version>1.8.2</parquet.version>
->>>>>>> BRANCH (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 9d3fb69..671ef14 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -914,10 +914,6 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<properties>
-<<<<<<< HEAD (aedda3 [NO ISSUE][*DB]: Update smart-json to avoid encountered
CVE)
-
<license.ignoreMissingEmbeddedLicense>2.12.6</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>2.12.6</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedNotice>2.13.5</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
@@ -943,7 +939,6 @@
<artifactId>stax2-api</artifactId>
<properties>
<license.ignoreMissingEmbeddedNotice>4.2.1</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (35c42a [NO ISSUE][*DB]: Update Azure blob library)
</properties>
</project>
</supplement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17556
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-667a908755
Gerrit-Change-Id: I0c0bbeae92635eb016af3e42e0b1f9c5d5743645
Gerrit-Change-Number: 17556
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
