Skip to content
Permalink
Browse files
[NO ISSUE][*DB][EXT] Consume JSR-250 annotations from tomcat-annotati…
…ons-api

Change-Id: Ia27b1a21b0adf433b1c3f81caf1dcea3bcf6e225
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13983
Reviewed-by: Michael Blow <mblow@apache.org>
Reviewed-by: Till Westmann <tillw@apache.org>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
  • Loading branch information
mblow committed Nov 7, 2021
1 parent 7d462c3 commit 5d1c3d1e4980fe711803f3bd9ef92a11e49df973
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
@@ -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>
@@ -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>
@@ -470,6 +471,10 @@
<groupId>com.google.cloud</groupId>
<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>
@@ -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 -->

0 comments on commit 5d1c3d1

Please sign in to comment.