>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17461 )
Change subject: [NO ISSUE][*DB][EXT] -= javax.annotation-api override ...................................................................... [NO ISSUE][*DB][EXT] -= javax.annotation-api override Change-Id: Ie448a6d256ae7ef70755ffddc5bb5531c70032fc Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17461 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/pom.xml 3 files changed, 13 insertions(+), 22 deletions(-) Approvals: Michael Blow: Looks good to me, but someone else must approve; Verified Hussain Towaileb: Looks good to me, approved diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 41a6f47..18a1f58 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -154,7 +154,6 @@ <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> @@ -878,10 +877,6 @@ <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 dec2ad8..068e294 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -210,7 +210,6 @@ <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,10 +470,6 @@ <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 6e198a7..45f1986 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1858,18 +1858,6 @@ <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.1.5</version> </dependency> <!-- Google Cloud Storage end --> <!-- Azure Data Lake start --> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17461 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-667a908755 Gerrit-Change-Id: Ie448a6d256ae7ef70755ffddc5bb5531c70032fc Gerrit-Change-Number: 17461 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-CC: Jenkins <[email protected]> Gerrit-MessageType: merged
