This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 0a382e765696b199f2e9a0f4a4f940a2bf583673 Merge: b7ee9398f5 822afae229 Author: Michael Blow <[email protected]> AuthorDate: Tue Jan 21 12:15:34 2025 -0500 Merge branch 'gerrit/trinity' into 'gerrit/goldfish' Ext-ref: MB-64561 Change-Id: I3bdaefb82beb2de31cfefa7745f8660081085e54 asterixdb/asterix-server/pom.xml | 13 +++ asterixdb/pom.xml | 2 +- .../originals/www.bouncycastle.org_licence.html | 102 +++++++++++++++++++++ .../content/www.bouncycastle.org_licence.html.txt | 8 ++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --cc asterixdb/asterix-server/pom.xml index 83ee04df93,438feab2b7..4529f4229b --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -261,25 -250,23 +261,29 @@@ </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.13.8</gav> - <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.13.8/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.2.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:msal4j-persistence-extension:1.3.0</gav> + <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-extensions-for-java/master/LICENSE</url> + </override> <override> <gav>com.microsoft.azure:azure-keyvault-core:1.2.4</gav> <url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/keyvault/LICENSE</url> @@@ -561,49 -544,10 +565,53 @@@ <gav>com.google.api:gax-grpc:2.7.1</gav> <url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url> </override> + <override> + <gav>com.google.api:gax-grpc:2.7.1</gav> + <url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url> + </override> + <override> + <gavs> + <gav>org.jetbrains:annotations:17.0.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/JetBrains/java-annotations/master/LICENSE.txt</url> + </override> + <override> + <gavs> + <gav>org.roaringbitmap:RoaringBitmap:0.9.22</gav> + <gav>org.roaringbitmap:shims:0.9.22</gav> + </gavs> + <url>https://raw.githubusercontent.com/RoaringBitmap/RoaringBitmap/0.9.39/LICENSE</url> + </override> + <override> + <gavs> + <gav>io.airlift:aircompressor:0.21</gav> + </gavs> + <url>https://raw.githubusercontent.com/airlift/aircompressor/0.21/license.txt</url> + <noticeUrl>https://raw.githubusercontent.com/airlift/aircompressor/0.21/notice.md</noticeUrl> + </override> + <override> + <gavs> + <gav>org.apache.orc:orc-core:1.8.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/apache/orc/v1.8.0/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/apache/orc/v1.8.0/NOTICE</noticeUrl> + </override> + <override> + <gavs> + <gav>tech.allegro.schema.json2avro:converter:0.2.15</gav> + </gavs> + <url>https://raw.githubusercontent.com/allegro/json-avro-converter/json-avro-converter-0.2.15/LICENSE.md</url> + </override> + <override> + <gavs> + <gav>com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1</gav> + </gavs> + <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> + </override> + <override> + <gav>org.bouncycastle:bcprov-jdk18on:1.78.1</gav> + <url>https://raw.githubusercontent.com/bcgit/bc-java/refs/tags/r1rv78v1/LICENSE.html</url> + </override> </overrides> <licenses> <license>
