>From Hussain Towaileb <[email protected]>:
Hussain Towaileb has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17551 )
Change subject: [NO ISSUE][*DB]: Update Azure blob library
......................................................................
[NO ISSUE][*DB]: Update Azure blob library
Change-Id: I0b46060587dd787dfd7cbd0cb454491fe3c4d373
---
M asterixdb/asterix-server/pom.xml
R
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_azure-storage-blob_12.22.0_LICENSE.txt
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
R
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_azure-storage-blob_12.22.0_NOTICE.txt
5 files changed, 72 insertions(+), 41 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/51/17551/1
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 2e6afb2..33ab588 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -218,15 +218,22 @@
</override>
<override>
<gavs>
- <gav>com.azure:azure-core:1.24.1</gav>
- <gav>com.azure:azure-core-http-netty:1.11.6</gav>
- <gav>com.azure:azure-storage-blob:12.14.3</gav>
- <gav>com.azure:azure-storage-common:12.14.2</gav>
- <gav>com.azure:azure-storage-internal-avro:12.1.3</gav>
+ <gav>com.azure:azure-core:1.38.0</gav>
+ <gav>com.azure:azure-core-http-netty:1.13.2</gav>
+ <gav>com.azure:azure-json:1.0.0</gav>
+ <gav>com.azure:azure-storage-blob:12.22.0</gav>
+ <gav>com.azure:azure-storage-common:12.21.0</gav>
+ <gav>com.azure:azure-storage-internal-avro:12.7.0</gav>
</gavs>
- <!-- azure-storage-blob-batch_12.11.3 release is at
89a32290750a18d1b99c27c16b1b11d42f16c622 -->
-
<noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/89a32290750a18d1b99c27c16b1b11d42f16c622/NOTICE.txt</noticeUrl>
-
<url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/89a32290750a18d1b99c27c16b1b11d42f16c622/LICENSE.txt</url>
+
<noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/azure-storage-blob_12.22.0/NOTICE.txt</noticeUrl>
+
<url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/azure-storage-blob_12.22.0/LICENSE.txt</url>
+ </override>
+ <override>
+ <gavs>
+ <gav>io.projectreactor.netty:reactor-netty-core:1.0.28</gav>
+ <gav>io.projectreactor.netty:reactor-netty-http:1.0.28</gav>
+ </gavs>
+
<url>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.28/LICENSE</url>
</override>
<override>
<gav>org.mindrot:jbcrypt:0.4</gav>
@@ -271,6 +278,7 @@
<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>
+
<aliasUrl>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.28/LICENSE</aliasUrl>
</aliasUrls>
<metric>1</metric>
</license>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 5d6a5fe..92f0473 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -88,7 +88,8 @@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
- <azurejavasdk.version>12.12.0</azurejavasdk.version>
+ <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
+ <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version>
<parquet.version>1.8.2</parquet.version>
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
@@ -1523,7 +1524,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
- <version>12.14.3</version>
+ <version>${azureblobjavasdk.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -1594,7 +1595,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
- <version>12.14.2</version>
+ <version>${azurecommonjavasdk.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 24eca6a..89e1253 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -653,10 +653,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>12.14.3</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>12.14.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.14.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.14.3</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>12.22.0</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>12.22.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.22.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.22.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -666,10 +666,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>12.14.2</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>12.14.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.14.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.14.2</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>12.21.0</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>12.21.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.21.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.21.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -679,10 +679,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-internal-avro</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>12.1.3</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>12.1.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.1.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.1.3</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>12.7.0</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>12.7.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.7.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.7.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -692,10 +692,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>1.24.1</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.24.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.24.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.24.1</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>1.38.0</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.38.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.38.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.38.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -705,10 +705,23 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>1.11.6</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.11.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.11.6</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.11.6</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>1.13.2</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.13.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.13.2</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.13.2</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-json</artifactId>
+ <properties>
+
<license.ignoreMissingEmbeddedLicense>1.0.0</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.0.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.0.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.0.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -721,7 +734,7 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedNotice>2.13.1</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedNotice>2.13.5</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -733,7 +746,7 @@
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedNotice>6.2.7</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedNotice>6.4.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -756,8 +769,8 @@
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>3.4.13</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>3.4.13</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedLicense>3.4.27</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>3.4.27</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -768,8 +781,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedLicense>1.0.28</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.0.28</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -780,8 +793,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedLicense>1.0.28</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.0.28</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -792,8 +805,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<properties>
-
<license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreMissingEmbeddedLicense>1.0.28</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>1.0.28</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_89a32290750a18d1b99c27c16b1b11d42f16c622_LICENSE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_azure-storage-blob_12.22.0_LICENSE.txt
similarity index 100%
rename from
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_89a32290750a18d1b99c27c16b1b11d42f16c622_LICENSE.txt
rename to
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_azure-storage-blob_12.22.0_LICENSE.txt
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_89a32290750a18d1b99c27c16b1b11d42f16c622_NOTICE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_azure-storage-blob_12.22.0_NOTICE.txt
similarity index 100%
rename from
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_89a32290750a18d1b99c27c16b1b11d42f16c622_NOTICE.txt
rename to
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_azure-storage-blob_12.22.0_NOTICE.txt
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17551
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I0b46060587dd787dfd7cbd0cb454491fe3c4d373
Gerrit-Change-Number: 17551
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <[email protected]>
Gerrit-MessageType: newchange
