This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 5d1c3d1 [NO ISSUE][*DB][EXT] Consume JSR-250 annotations from
tomcat-annotations-api
5d1c3d1 is described below
commit 5d1c3d1e4980fe711803f3bd9ef92a11e49df973
Author: Michael Blow <[email protected]>
AuthorDate: Sat Nov 6 14:40:13 2021 -0400
[NO ISSUE][*DB][EXT] Consume JSR-250 annotations from tomcat-annotations-api
Change-Id: Ia27b1a21b0adf433b1c3f81caf1dcea3bcf6e225
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13983
Reviewed-by: Michael Blow <[email protected]>
Reviewed-by: Till Westmann <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
---
asterixdb/asterix-app/pom.xml | 5 +++++
asterixdb/asterix-external-data/pom.xml | 5 +++++
asterixdb/pom.xml | 12 ++++++++++++
3 files changed, 22 insertions(+)
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index a421618..cbc6743 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -154,6 +154,7 @@
<usedDependencies combine.children="append">
<usedDependency>org.apache.hadoop:hadoop-common</usedDependency>
<usedDependency>org.apache.asterix:asterix-geo</usedDependency>
+
<usedDependency>org.apache.tomcat:tomcat-annotations-api</usedDependency>
</usedDependencies>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:zip:*</ignoredUnusedDeclaredDependency>
@@ -866,6 +867,10 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ </dependency>
<!-- Needed for inferring the schema for writing Parquet files -->
<dependency>
<groupId>org.kitesdk</groupId>
diff --git a/asterixdb/asterix-external-data/pom.xml
b/asterixdb/asterix-external-data/pom.xml
index 4e7554f..b8a1206 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -210,6 +210,7 @@
<usedDependency>io.netty:netty-resolver-dns</usedDependency>
<usedDependency>io.netty:netty-codec-http2</usedDependency>
<usedDependency>io.netty:netty-transport-native-unix-common</usedDependency>
+
<usedDependency>org.apache.tomcat:tomcat-annotations-api</usedDependency>
</usedDependencies>
</configuration>
</plugin>
@@ -471,6 +472,10 @@
<artifactId>google-cloud-storage</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.msgpack</groupId>
<artifactId>msgpack-core</artifactId>
</dependency>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index fe065b1..e490bb8 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1801,6 +1801,18 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>${gcsjavasdk.version}</version>
+ <exclusions>
+ <!-- substitute org.apache.tomcat:tomcat-annotations-api, as it has
a nicer license -->
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>10.0.12</version>
</dependency>
<!-- Google Cloud Storage end -->
<!-- Azure Data Lake start -->
