This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8363dcb590e150036764f4dff80f6dd3b72aa729 Merge: 5701408 e8637d0 Author: Michael Blow <[email protected]> AuthorDate: Sat Dec 4 06:02:34 2021 -0500 Merge branch 'gerrit/stabilization-5949a1cb71' Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5 asterixdb/asterix-app/pom.xml | 36 +++++- asterixdb/asterix-common/pom.xml | 2 +- asterixdb/asterix-dashboard/pom.xml | 8 +- asterixdb/asterix-external-data/pom.xml | 6 +- asterixdb/asterix-server/pom.xml | 29 ++++- asterixdb/pom.xml | 10 +- .../appended-resources/supplemental-models.xml | 129 ++++++++++++++++++--- ....com_netty_netty_netty-4.1.69.Final_NOTICE.txt} | 20 +++- .../hyracks-control/hyracks-control-cc/pom.xml | 6 +- hyracks-fullstack/hyracks/hyracks-http/pom.xml | 22 +++- .../maven/license/SourcePointerResolver.java | 10 ++ .../hyracks/hyracks-storage-common/pom.xml | 1 - hyracks-fullstack/pom.xml | 71 ++++++++++-- 13 files changed, 301 insertions(+), 49 deletions(-) diff --cc asterixdb/asterix-app/pom.xml index 255583b,b82898e..4b1fecf --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@@ -697,34 -714,17 +713,46 @@@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> + <!-- AWS --> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>sdk-core</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>regions</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>auth</artifactId> + </dependency> + <!-- Mock for AWS S3 --> + <dependency> + <groupId>io.findify</groupId> + <artifactId>s3mock_2.12</artifactId> + <scope>test</scope> + </dependency> + <!-- Needed for the s3 mock --> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-http-core_2.12</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --cc asterixdb/asterix-dashboard/pom.xml index 38f962a,aae2902..e49bd3b --- a/asterixdb/asterix-dashboard/pom.xml +++ b/asterixdb/asterix-dashboard/pom.xml @@@ -49,137 -49,126 +49,137 @@@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>com.github.eirslett</groupId> - <artifactId>frontend-maven-plugin</artifactId> - <version>1.6</version> - <configuration> - <nodeVersion>v10.3.0</nodeVersion> - <npmVersion>6.1.0</npmVersion> - <workingDirectory>target/dashboard</workingDirectory> - <installDirectory>target/dashboard</installDirectory> - </configuration> - <executions> - <execution> - <id>install node and yarn</id> - <goals> - <goal>install-node-and-npm</goal> - </goals> - <phase>generate-resources</phase> - </execution> - <execution> - <id>npm install</id> - <phase>process-resources</phase> - <goals> - <goal>npm</goal> - </goals> + <profiles> + <profile> + <id>include-dashboard</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.11.0</version> <configuration> - <arguments>install --cache ${settings.localRepository}/.npm-cache --no-optional</arguments> + <nodeVersion>v10.3.0</nodeVersion> + <npmVersion>6.1.0</npmVersion> + <workingDirectory>target/dashboard</workingDirectory> + <installDirectory>target/dashboard</installDirectory> </configuration> - </execution> - <execution> - <id>npm run-script mavenbuild</id> - <phase>compile</phase> - <goals> - <goal>npm</goal> - </goals> + <executions> + <execution> + <id>install node and yarn</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>generate-resources</phase> + </execution> + <execution> + <id>npm install</id> + <phase>process-resources</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>install --cache ${settings.localRepository}/.npm-cache --no-optional</arguments> + </configuration> + </execution> + <execution> + <id>npm run-script mavenbuild</id> + <phase>compile</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>run-script mavenbuild</arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-static</id> + <phase>${resource.stage}</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory> + ${basedir}/target/classes/dashboard/ + </outputDirectory> + <resources> + <resource> + <directory>${basedir}/target/dashboard/static/ + </directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-node</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory> + ${basedir}/target/dashboard + </outputDirectory> + <resources> + <resource> + <directory>${basedir}/src/node + </directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.hyracks</groupId> + <artifactId>license-automation-plugin</artifactId> + <executions> + <execution> + <phase>${license.stage}</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> <configuration> - <arguments>run-script mavenbuild</arguments> + <templateRootDir>${basedir}</templateRootDir> + <outputDir>${project.build.directory}/classes/META-INF</outputDir> + <generatedFiles> + <generatedFile> + <template>src/main/licenses/dashboard-license.ftl</template> + <outputFile>LICENSE</outputFile> + </generatedFile> + </generatedFiles> + <location>repo/</location> + <timeoutSecs>10</timeoutSecs> + <downloadDir> + ${project.build.directory}/generated-resources/license + </downloadDir> + <excludedScopes> + <excludedScope>test</excludedScope> + </excludedScopes> + <licenseDirectory>${basedir}/src/main/licenses/content</licenseDirectory> </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-static</id> - <phase>${resource.stage}</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory> - ${basedir}/target/classes/dashboard/ - </outputDirectory> - <resources> - <resource> - <directory>${basedir}/target/dashboard/static/ - </directory> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-node</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory> - ${basedir}/target/dashboard - </outputDirectory> - <resources> - <resource> - <directory>${basedir}/src/node - </directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.hyracks</groupId> - <artifactId>license-automation-plugin</artifactId> - <executions> - <execution> - <phase>${license.stage}</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <templateRootDir>${basedir}</templateRootDir> - <outputDir>${project.build.directory}/classes/META-INF</outputDir> - <generatedFiles> - <generatedFile> - <template>src/main/licenses/dashboard-license.ftl</template> - <outputFile>LICENSE</outputFile> - </generatedFile> - </generatedFiles> - <location>repo/</location> - <timeoutSecs>10</timeoutSecs> - <downloadDir> - ${project.build.directory}/generated-resources/license - </downloadDir> - <excludedScopes> - <excludedScope>test</excludedScope> - </excludedScopes> - <licenseDirectory>${basedir}/src/main/licenses/content</licenseDirectory> - </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>skip-dashboard</id> + </profile> + </profiles> </project> diff --cc asterixdb/asterix-external-data/pom.xml index 037436a,1092422..611e58b --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@@ -433,31 -433,11 +433,35 @@@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>aws-core</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>http-client-spi</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>sdk-core</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>regions</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>auth</artifactId> + </dependency> </dependencies> </project> diff --cc asterixdb/asterix-server/pom.xml index 266866e,8bc7560..2044fe2 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -169,38 -169,33 +169,62 @@@ <url>https://raw.githubusercontent.com/mojohaus/appassembler/appassembler-2.0.0/LICENSE.txt</url> </override> <override> - <gav>io.netty:netty-all:4.1.63.Final</gav> - <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.63.Final/NOTICE.txt</noticeUrl> + <gav>io.netty:netty-transport:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-codec:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-buffer:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-resolver:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-handler:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-common:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>io.netty:netty-codec-http:4.1.69.Final</gav> + <noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.69.Final/NOTICE.txt</noticeUrl> </override> + <override> + <gav>org.reactivestreams:reactive-streams:1.0.2</gav> + <noticeUrl>https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/COPYING.txt</noticeUrl> + <url>https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/LICENSE.txt</url> + </override> + <override> + <gavs> + <gav>software.amazon.awssdk:sdk-core:2.10.83</gav> + <gav>software.amazon.awssdk:aws-core:2.10.83</gav> + <gav>software.amazon.awssdk:auth:2.10.83</gav> + <gav>software.amazon.awssdk:arns:2.10.83</gav> + <gav>software.amazon.awssdk:annotations:2.10.83</gav> + <gav>software.amazon.awssdk:utils:2.10.83</gav> + <gav>software.amazon.awssdk:aws-query-protocol:2.10.83</gav> + <gav>software.amazon.awssdk:profiles:2.10.83</gav> + <gav>software.amazon.awssdk:protocol-core:2.10.83</gav> + <gav>software.amazon.awssdk:s3:2.10.83</gav> + <gav>software.amazon.awssdk:netty-nio-client:2.10.83</gav> + <gav>software.amazon.awssdk:apache-client:2.10.83</gav> + <gav>software.amazon.awssdk:aws-xml-protocol:2.10.83</gav> + <gav>software.amazon.awssdk:regions:2.10.83</gav> + <gav>software.amazon.awssdk:http-client-spi:2.10.83</gav> + </gavs> + <noticeUrl>https://raw.githubusercontent.com/aws/aws-sdk-java-v2/2.10.83/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>software.amazon.eventstream:eventstream:1.0.1</gav> + <noticeUrl>https://raw.githubusercontent.com/awslabs/aws-eventstream-java/7be2dd80e12f8835674c8ffb0f4a2efb64c7b585/NOTICE</noticeUrl> + </override> </overrides> <licenses> <license> @@@ -234,7 -229,7 +258,8 @@@ <aliasUrl>http://www.apache.org/licenses/LICENSE-2.0</aliasUrl> <aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.txt</aliasUrl> <aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl> + <aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl> + <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl> </aliasUrls> <metric>1</metric> </license> diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index d6ed727,ff1da0b..999b414 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -266,8 -365,8 +365,8 @@@ <!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file --> <!-- license override not needed, ALv2 is specified in its pom.xml --> <!-- see https://github.com/xerial/snappy-java/blob/1.1.7.1/LICENSE --> -- <license.ignoreMissingEmbeddedLicense>1.1.7.1</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>1.1.7.1</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --cc hyracks-fullstack/pom.xml index 5af1995,9a2c886..7ec00ad --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -272,14 -303,29 +299,34 @@@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.6.3</version> - </dependency> + <version>3.8.3</version> - </dependency> ++ </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.6.3</version> + <version>3.8.3</version> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil-core</artifactId> + <version>8.5.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.28</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> ++ <groupId>org.xerial.snappy</groupId> ++ <artifactId>snappy-java</artifactId> ++ <version>${snappy.version}</version> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>3.10.0</version>
