Skip to content
Permalink
Browse files
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: Icde6ac90cccb845b4973155eac5a0380e8f6ff58
  • Loading branch information
mblow committed Jan 23, 2022
2 parents 14d9cfd + fa0ddb6 commit a7f6d399455b90e6ecf77b43baa02cae403e3b42
Show file tree
Hide file tree
Showing 15 changed files with 187 additions and 164 deletions.
@@ -117,7 +117,7 @@
<compilation-unit name="common/bucket-does-not-exist">
<placeholder name="adapter" value="S3" />
<output-dir compare="Text">common/bucket-does-not-exist</output-dir>
<expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null)</expected-error>
<expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null, Extended Request ID: null)</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset" check-warnings="true">
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -149,7 +149,6 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>8.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -171,32 +171,21 @@
<url>https://raw.githubusercontent.com/mojohaus/appassembler/appassembler-2.0.0/LICENSE.txt</url>
</override>
<override>
<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>
<gavs>
<gav>io.netty:netty-buffer:4.1.69.Final</gav>
<gav>io.netty:netty-codec:4.1.69.Final</gav>
<gav>io.netty:netty-codec-http:4.1.69.Final</gav>
<gav>io.netty:netty-common:4.1.69.Final</gav>
<gav>io.netty:netty-handler:4.1.69.Final</gav>
<gav>io.netty:netty-resolver:4.1.69.Final</gav>
<gav>io.netty:netty-transport:4.1.69.Final</gav>
</gavs>
<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>
<gav>io.netty:netty-tcnative-classes:2.0.46.Final</gav>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<noticeUrl>https://raw.githubusercontent.com/netty/netty-tcnative/netty-tcnative-parent-2.0.46.Final/NOTICE.txt</noticeUrl>
</override>
<override>
<gav>org.reactivestreams:reactive-streams:1.0.2</gav>
@@ -346,6 +335,13 @@
<url>PUBLIC_DOMAIN</url>
<aliasUrls>Public Domain</aliasUrls>
</license>
<license>
<url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url>
<aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
<aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
<aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
<aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
</license>
</licenses>
<templateProperties>
<packageName>Apache AsterixDB Server Install</packageName>
@@ -86,8 +86,8 @@
<hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.14.1</log4j.version>
<awsjavasdk.version>2.10.83</awsjavasdk.version>
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.116</awsjavasdk.version>
<azurejavasdk.version>12.12.0</azurejavasdk.version>
<parquet.version>1.8.2</parquet.version>

@@ -945,17 +945,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.28</version>
<version>1.7.33</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.8.3</version>
<version>3.8.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.8.3</version>
<version>3.8.4</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -1414,12 +1414,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.8.3</version>
<version>3.8.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.8.3</version>
<version>3.8.4</version>
</dependency>
<dependency>
<groupId>com.esri.geometry</groupId>

0 comments on commit a7f6d39

Please sign in to comment.