This is an automated email from the ASF dual-hosted git repository. htowaileb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 57fd936021b3835f346b167188a83f61b5f87d3d Author: Hussain Towaileb <[email protected]> AuthorDate: Sun Aug 15 16:33:58 2021 +0300 [NO ISSUE] Advance Azure SDK and Azurite versions Change-Id: I1ad47076c8ed22f3b1a13661605693374fee41bb Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12843 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Reviewed-by: Michael Blow <[email protected]> Contrib: Michael Blow <[email protected]> --- asterixdb/asterix-server/pom.xml | 9 +- asterixdb/pom.xml | 50 +++++++- .../appended-resources/supplemental-models.xml | 130 +++++++++++++++++---- 3 files changed, 161 insertions(+), 28 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 0176ef8..60f2e1f 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -205,10 +205,11 @@ </override> <override> <gavs> - <gav>com.azure:azure-core:1.4.0</gav> - <gav>com.azure:azure-core-http-netty:1.5.0</gav> - <gav>com.azure:azure-storage-blob:12.6.0</gav> - <gav>com.azure:azure-storage-common:12.6.0</gav> + <gav>com.azure:azure-core:1.17.0</gav> + <gav>com.azure:azure-core-http-netty:1.10.0</gav> + <gav>com.azure:azure-storage-blob:12.12.0</gav> + <gav>com.azure:azure-storage-common:12.12.0</gav> + <gav>com.azure:azure-storage-internal-avro:12.0.5</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> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 8b769f4..40d3848 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -88,7 +88,7 @@ <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.14.1</log4j.version> <awsjavasdk.version>2.10.83</awsjavasdk.version> - <azurejavasdk.version>12.6.0</azurejavasdk.version> + <azurejavasdk.version>12.12.0</azurejavasdk.version> <parquet.version>1.8.2</parquet.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> @@ -1565,6 +1565,30 @@ <groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-dns</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns-native-macos</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1612,6 +1636,30 @@ <groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-dns</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns-native-macos</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </exclusion> </exclusions> </dependency> <!-- Azure Blob Storage end --> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 4849544..6df5edd 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -561,10 +561,10 @@ <groupId>com.azure</groupId> <artifactId>azure-storage-blob</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>12.6.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>12.6.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>12.6.0</license.ignoreLicenseOverride> - <license.ignoreNoticeOverride>12.6.0</license.ignoreNoticeOverride> + <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> </properties> </project> </supplement> @@ -574,10 +574,23 @@ <groupId>com.azure</groupId> <artifactId>azure-storage-common</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>12.6.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>12.6.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>12.6.0</license.ignoreLicenseOverride> - <license.ignoreNoticeOverride>12.6.0</license.ignoreNoticeOverride> + <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> + </properties> + </project> + </supplement> + + <supplement> + <project> + <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> </properties> </project> </supplement> @@ -587,10 +600,10 @@ <groupId>com.azure</groupId> <artifactId>azure-core</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.4.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.4.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>1.4.0</license.ignoreLicenseOverride> - <license.ignoreNoticeOverride>1.4.0</license.ignoreNoticeOverride> + <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> </properties> </project> </supplement> @@ -600,10 +613,10 @@ <groupId>com.azure</groupId> <artifactId>azure-core-http-netty</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.5.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.5.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>1.5.0</license.ignoreLicenseOverride> - <license.ignoreNoticeOverride>1.5.0</license.ignoreNoticeOverride> + <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> </properties> </project> </supplement> @@ -616,7 +629,7 @@ <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>2.10.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>2.12.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -628,7 +641,7 @@ <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>6.0.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>6.2.4</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -640,29 +653,100 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>4.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>4.2.1</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> + <!-- io.projectreactor:reactor-core uses ALv2 license and has no notice --> <supplement> <project> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>3.3.3.RELEASE</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>3.3.3.RELEASE</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>3.4.6</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>3.4.6</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> + <!-- io.projectreactor.netty:reactor-netty uses ALv2 license and has no notice --> <supplement> <project> <groupId>io.projectreactor.netty</groupId> <artifactId>reactor-netty</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>0.9.5.RELEASE</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>0.9.5.RELEASE</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.projectreactor.netty:reactor-netty-core uses ALv2 license and has no notice --> + <supplement> + <project> + <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> + </properties> + </project> + </supplement> + + <!-- io.projectreactor.netty:reactor-netty-http uses ALv2 license and has no notice --> + <supplement> + <project> + <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> + </properties> + </project> + </supplement> + + <!-- io.projectreactor.netty:reactor-netty-http-brave uses ALv2 license and has no notice --> + <supplement> + <project> + <groupId>io.projectreactor.netty</groupId> + <artifactId>reactor-netty-http-brave</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.zipkin2:zipkin has embedded license but no notice --> + <supplement> + <project> + <groupId>io.zipkin.zipkin2</groupId> + <artifactId>zipkin</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>2.23.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.zipkin.reporter2:zipkin-reporter has embedded license but no notice --> + <supplement> + <project> + <groupId>io.zipkin.reporter2</groupId> + <artifactId>zipkin-reporter</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>2.16.3</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.zipkin.reporter2:zipkin-reporter-brave has embedded license but no notice --> + <supplement> + <project> + <groupId>io.zipkin.reporter2</groupId> + <artifactId>zipkin-reporter-brave</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>2.16.3</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement>
