This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit f90b6c4b07887b6782a0a2a46aa3a2bb9f7a9026 Merge: ec3ec0d7d8 beb8ab2033 Author: Michael Blow <[email protected]> AuthorDate: Thu Nov 28 18:27:03 2024 -0500 Merge branch 'gerrit/goldfish' into 'master' Change-Id: I773295752e1368cd16cbebfe5e6fb717e601f3ce .../reader/aws/delta/AwsS3DeltaReaderFactory.java | 4 +-- .../asterix/external/util/ExternalDataUtils.java | 7 +++- asterixdb/asterix-server/pom.xml | 35 ++++++++++--------- asterixdb/pom.xml | 4 +-- .../appended-resources/supplemental-models.xml | 36 +++++++++----------- ...-library-for-java_refs_tags_v1.17.1_LICENSE.txt | 21 ++++++++++++ ...e-sdk-for-java_azure-identity_1.9.0_LICENSE.txt | 21 ------------ ...ava_refs_tags_azure-identity_1.13.3_NOTICE.txt} | 22 +++++++++++- .../org/apache/hyracks/api/util/InvokeUtil.java | 39 ++++++++++++++++++++++ hyracks-fullstack/pom.xml | 5 +++ 10 files changed, 132 insertions(+), 62 deletions(-) diff --cc asterixdb/asterix-server/pom.xml index 82534fbdf4,e65c742ed6..c64d4bb376 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -250,30 -250,30 +250,35 @@@ </override> <override> <gavs> -- <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> ++ <gav>com.azure:azure-core:1.45.1</gav> ++ <gav>com.azure:azure-core-http-netty:1.13.11</gav> ++ <gav>com.azure:azure-json:1.3.0</gav> ++ <gav>com.azure:azure-storage-blob:12.25.1</gav> ++ <gav>com.azure:azure-storage-common:12.24.1</gav> ++ <gav>com.azure:azure-storage-internal-avro:12.10.1</gav> </gavs> -- <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> ++ <url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/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> ++ <gav>com.azure:azure-identity:1.13.3</gav> </gavs> -- <url>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.28/LICENSE</url> ++ <url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/LICENSE.txt</url> ++ <noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/refs/tags/azure-identity_1.13.3/NOTICE.txt</noticeUrl> </override> <override> -- <gav>com.microsoft.azure:msal4j:1.16.1</gav> -- <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.16.1/LICENSE</url> ++ <gavs> ++ <gav>com.microsoft.azure:msal4j:1.17.1</gav> ++ <gav>com.microsoft.azure:msal4j-persistence-extension:1.3.0</gav> ++ </gavs> ++ <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/refs/tags/v1.17.1/LICENSE</url> </override> <override> -- <gav>com.microsoft.azure:msal4j-persistence-extension:1.3.0</gav> -- <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-extensions-for-java/master/LICENSE</url> ++ <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>com.microsoft.azure:azure-keyvault-core:1.2.4</gav>
