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 946e9a0f9f1d4b1e0815bfc55f6ec9dadffdcef7 Merge: a518efb 57fd936 Author: Hussain Towaileb <[email protected]> AuthorDate: Sun Aug 15 23:51:52 2021 +0300 Merge branch cheshire-cat into master Change-Id: I187274e7b28729e5a677ec7a372b44f41f2147d3 asterixdb/pom.xml | 1 - .../appended-resources/supplemental-models.xml | 34 +++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --cc asterixdb/pom.xml index 9339434,40d3848..16af5e1 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -88,10 -88,9 +88,9 @@@ <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> + <parquet.version>1.12.0</parquet.version> + <hadoop-awsjavasdk.version>1.12.1</hadoop-awsjavasdk.version> <azurejavasdk.version>12.12.0</azurejavasdk.version> - <parquet.version>1.8.2</parquet.version> - <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> <implementation.version>${project.version}</implementation.version> diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index 5ed7c32,6df5edd..ceb51e2 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -805,265 -718,6 +805,265 @@@ </project> </supplement> + <!-- com.nimbusds:oauth2-oidc-sdk has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>com.nimbusds</groupId> + <artifactId>oauth2-oidc-sdk</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>9.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>9.7</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>9.7</license.ignoreLicenseOverride> + <license.ignoreNoticeOverride>9.7</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <!-- com.nimbusds:nimbus-jose-jwt has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>com.nimbusds</groupId> + <artifactId>nimbus-jose-jwt</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>4.41.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.41.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.nimbusds:lang-tag has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>com.nimbusds</groupId> + <artifactId>lang-tag</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.5</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.nimbusds:content-type has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>com.nimbusds</groupId> + <artifactId>content-type</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2 uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-dom uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-dom</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-jaxb uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-jaxb</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-kdb uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-kdb</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-kdbx uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-kdbx</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-simple uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-simple</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:database uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>database</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </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> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.4.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.4.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- net.minidev:accessors-smart has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>net.minidev</groupId> + <artifactId>accessors-smart</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.4.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.4.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>9.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>9.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>9.1</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- jackson-datatype-jsr contains embedded license but has no NOTICE --> + <!-- See https://github.com/FasterXML/jackson-modules-java8 --> + <supplement> + <project> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + <properties> - <license.ignoreMissingEmbeddedNotice>2.10.1,2.12.3</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreMissingEmbeddedNotice>2.12.3</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.fasterxml.woodstox contains embedded license but has no NOTICE --> + <!-- See https://github.com/FasterXML/woodstox --> + <supplement> + <project> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + <properties> - <license.ignoreMissingEmbeddedNotice>6.0.2,6.2.4</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreMissingEmbeddedNotice>6.2.4</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.codehaus.woodstox contains embedded license but has no NOTICE --> + <!-- See https://github.com/FasterXML/stax2-api --> + <supplement> + <project> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <properties> - <license.ignoreMissingEmbeddedNotice>4.2,4.2.1</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreMissingEmbeddedNotice>4.2.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.0.1</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- net.java.dev.jna:jna has embedded license but no notice --> + <supplement> + <project> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>5.5.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- net.java.dev.jna:jna-platform has embedded license but no notice --> + <supplement> + <project> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>5.6.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + <!-- io.zipkin2:zipkin has embedded license but no notice --> <supplement> <project>
