This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 6e7faae RATIS-1492. Use tomcat annotations-api. (#582)
6e7faae is described below
commit 6e7faaefb653a73e2e7b970ce678ff41d31f8171
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Wed Jan 19 17:44:48 2022 +0800
RATIS-1492. Use tomcat annotations-api. (#582)
---
pom.xml | 7 ++++---
ratis-proto/pom.xml | 4 ++--
ratis-resource-bundle/src/main/resources/supplemental-models.xml | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index c5bd8e6..fb736b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,9 +470,10 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ <version>6.0.53</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/ratis-proto/pom.xml b/ratis-proto/pom.xml
index 48d391f..e2f64d0 100644
--- a/ratis-proto/pom.xml
+++ b/ratis-proto/pom.xml
@@ -189,8 +189,8 @@
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/ratis-resource-bundle/src/main/resources/supplemental-models.xml
b/ratis-resource-bundle/src/main/resources/supplemental-models.xml
index f82da85..4ddfa1b 100644
--- a/ratis-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/ratis-resource-bundle/src/main/resources/supplemental-models.xml
@@ -866,12 +866,12 @@ under the License.
</supplement>
<supplement>
<project>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
<licenses>
<license>
- <name>Common Development and Distribution License (CDDL) v1.0</name>
- <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
