[ASTERIXDB-2991][EXT] Update Azure Blob & Datalake SDKs
com.azure:azure-core........................... 1.17.0 -> 1.22.0
com.azure:azure-core-http-netty................ 1.10.0 -> 1.11.2
com.azure:azure-storage-blob................... 12.12.0 -> 12.14.2
com.azure:azure-storage-common................. 12.12.0 -> 12.14.1
com.azure:azure-storage-internal-avro.......... 12.0.5 -> 12.1.2
com.azure:azure-storage-file-datalake.......... 12.7.0 -> 12.7.2
io.projectreactor.netty:reactor-netty-core..... 1.0.7 -> 1.0.11
io.projectreactor.netty:reactor-netty-http..... 1.0.7 -> 1.0.11
io.projectreactor:reactor-core................. 3.4.6 -> 3.4.10
jackson-datatype-jsr310........................ 2.12.3 -> 2.12.5
Change-Id: Ie034686c8882147359307f8405f6ad10c91d7214
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14143
Reviewed-by: Hussain Towaileb <hussainht@gmail.com>
Tested-by: Hussain Towaileb <hussainht@gmail.com>
Integration-Tests: Hussain Towaileb <hussainht@gmail.com>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 1406cdc..3b6d6d8 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -250,19 +250,24 @@
<override>
<gavs>
<gav>com.azure:azure-core:1.17.0</gav>
+ <gav>com.azure:azure-core:1.22.0</gav>
<gav>com.azure:azure-core-http-netty:1.10.0</gav>
- <gav>com.azure:azure-identity:1.3.3</gav>
+ <gav>com.azure:azure-core-http-netty:1.11.2</gav>
+ <gav>com.azure:azure-identity:1.4.1</gav>
<gav>com.azure:azure-storage-blob:12.12.0</gav>
+ <gav>com.azure:azure-storage-blob:12.14.2</gav>
<gav>com.azure:azure-storage-common:12.12.0</gav>
+ <gav>com.azure:azure-storage-common:12.14.1</gav>
<gav>com.azure:azure-storage-internal-avro:12.0.5</gav>
- <gav>com.azure:azure-storage-file-datalake:12.7.0</gav>
+ <gav>com.azure:azure-storage-internal-avro:12.1.2</gav>
+ <gav>com.azure:azure-storage-file-datalake:12.7.2</gav>
</gavs>
<noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/master/NOTICE.txt</noticeUrl>
<url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/master/LICENSE.txt</url>
</override>
<override>
- <gav>com.microsoft.azure:msal4j:1.10.1</gav>
- <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.10.1/LICENSE</url>
+ <gav>com.microsoft.azure:msal4j:1.11.0</gav>
+ <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.11.0/LICENSE</url>
</override>
<override>
<gav>com.microsoft.azure:msal4j-persistence-extension:1.1.0</gav>
@@ -273,22 +278,6 @@
<url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/keyvault/LICENSE</url>
</override>
<override>
- <gav>xpp3:xpp3:1.1.3.3</gav>
- <url>https://raw.githubusercontent.com/aslom/xpp3/master/LICENSE.txt</url>
- </override>
- <override>
- <gavs>
- <gav>org.linguafranca.pwdb:KeePassJava2:2.1.4</gav>
- <gav>org.linguafranca.pwdb:KeePassJava2-dom:2.1.4</gav>
- <gav>org.linguafranca.pwdb:KeePassJava2-jaxb:2.1.4</gav>
- <gav>org.linguafranca.pwdb:KeePassJava2-kdb:2.1.4</gav>
- <gav>org.linguafranca.pwdb:KeePassJava2-kdbx:2.1.4</gav>
- <gav>org.linguafranca.pwdb:KeePassJava2-simple:2.1.4</gav>
- <gav>org.linguafranca.pwdb:database:2.1.4</gav>
- </gavs>
- <url>https://raw.githubusercontent.com/jorabin/KeePassJava2/KeePassJava2-2.1.4/LICENSE</url>
- </override>
- <override>
<gav>com.nimbusds:nimbus-jose-jwt:9.9.3</gav>
<noticeUrl>https://bitbucket.org/connect2id/nimbus-jose-jwt/raw/50ae2a39a4a6d0dcbf05572af8a581377174ac96/COPYRIGHT.txt</noticeUrl>
</override>
@@ -316,10 +305,21 @@
<url>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.7/LICENSE</url>
</override>
<override>
+ <gavs>
+ <gav>io.projectreactor.netty:reactor-netty-core:1.0.11</gav>
+ <gav>io.projectreactor.netty:reactor-netty-http:1.0.11</gav>
+ </gavs>
+ <url>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.11/LICENSE</url>
+ </override>
+ <override>
<gav>io.projectreactor:reactor-core:3.4.6</gav>
<url>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.6/LICENSE</url>
</override>
<override>
+ <gav>io.projectreactor:reactor-core:3.4.10</gav>
+ <url>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.10/LICENSE</url>
+ </override>
+ <override>
<gavs>
<gav>stax:stax-api:1.0.1</gav>
</gavs>
@@ -330,10 +330,6 @@
<url>https://raw.githubusercontent.com/llbit/ow2-asm/master/LICENSE.txt</url>
</override>
<override>
- <gav>com.madgag.spongycastle:core:1.54.0.0</gav>
- <url>https://raw.githubusercontent.com/rtyley/spongycastle/sc-v1.54.0.0/LICENSE.html.txt</url>
- </override>
- <override>
<gavs>
<gav>com.google.http-client:google-http-client-jackson2:1.39.2</gav>
<gav>com.google.http-client:google-http-client-appengine:1.39.2</gav>
@@ -483,7 +479,9 @@
<aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
<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>
<aliasUrl>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.6/LICENSE</aliasUrl>
+ <aliasUrl>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.10/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/codehaus/stax/master/dev/ASF2.0.txt</aliasUrl>
<aliasUrl>https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/raw/5d13925b57ace092ea5e1131c338f464d85545f4/LICENSE.txt</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/google/auto/auto-value-1.8.1/LICENSE</aliasUrl>
@@ -540,7 +538,7 @@
<aliasUrls>
<aliasUrl>http://www.opensource.org/licenses/mit-license.php</aliasUrl>
<aliasUrl>http://opensource.org/licenses/MIT</aliasUrl>
- <aliasUrl>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.10.1/LICENSE</aliasUrl>
+ <aliasUrl>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.11.0/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-extensions-for-java/1.1.0/LICENSE</aliasUrl>
</aliasUrls>
</license>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 2835eb0..55d6bf3 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -90,8 +90,8 @@
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
- <azureblobjavasdk.version>12.12.0</azureblobjavasdk.version>
- <azuredatalakejavasdk.version>12.7.0</azuredatalakejavasdk.version>
+ <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
+ <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
@@ -1585,7 +1585,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
- <version>1.3.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -1727,7 +1727,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
- <version>${azureblobjavasdk.version}</version>
+ <version>12.14.1</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 74dd474..28b688e 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -780,10 +780,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>12.12.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.12.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.12.0</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.12.0</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>12.12.0,12.14.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>12.12.0,12.14.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.12.0,12.14.2</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.12.0,12.14.2</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -795,9 +795,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-datalake</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>12.7.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.7.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.7.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>12.7.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>12.7.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.7.2</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.7.2</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -807,10 +808,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>12.12.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.12.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.12.0</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.12.0</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>12.12.0,12.14.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>12.12.0,12.14.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.12.0,12.14.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.12.0,12.14.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -820,10 +821,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-internal-avro</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>12.0.5</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.0.5</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.0.5</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.0.5</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>12.0.5,12.1.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>12.0.5,12.1.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.0.5,12.1.2</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.0.5,12.1.2</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -833,10 +834,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.17.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.17.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.17.0</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.17.0</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.17.0,1.22.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.17.0,1.22.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.17.0,1.22.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.17.0,1.22.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -846,10 +847,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.10.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.10.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.10.0</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.10.0</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.10.0,1.11.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.10.0,1.11.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.10.0,1.11.2</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.10.0,1.11.2</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -859,10 +860,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.3.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.3.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.3.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.3.3</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.4.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.4.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.4.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.4.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -873,9 +874,9 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.10.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.10.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.10.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.11.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.11.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.11.0</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -939,8 +940,8 @@
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>3.3.3.RELEASE,3.4.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.3.3.RELEASE,3.4.6</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>3.3.3.RELEASE,3.4.6,3.4.10</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.3.3.RELEASE,3.4.6,3.4.10</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -963,8 +964,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.7,1.0.11</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.7,1.0.11</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -975,8 +976,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.7,1.0.11</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.7,1.0.11</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1134,18 +1135,6 @@
</project>
</supplement>
- <supplement>
- <project>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.1.3.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.3.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.1.3.3</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- net.minidev:json-smart has ALv2 embedded in pom.xml -->
<supplement>
<project>
@@ -1593,7 +1582,7 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>2.12.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>2.12.3,2.12.5</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1738,18 +1727,6 @@
<supplement>
<project>
- <groupId>com.madgag.spongycastle</groupId>
- <artifactId>core</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.54.0.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.54.0.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.54.0.0</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <supplement>
- <project>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<properties>