You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/05/03 00:28:59 UTC
[tomee-jakarta] 04/12: Replace jakarta annotation api jar
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit 11395a08461b96f439f845f36161289de9238408
Author: David Blevins <da...@gmail.com>
AuthorDate: Sun May 2 16:05:07 2021 -0700
Replace jakarta annotation api jar
---
jakartaee-api/pom.xml | 28 +++++++---------------------
tomee/tomee-plume-webapp/pom.xml | 8 +++++++-
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/jakartaee-api/pom.xml b/jakartaee-api/pom.xml
index c6f707b..90e4c42 100644
--- a/jakartaee-api/pom.xml
+++ b/jakartaee-api/pom.xml
@@ -335,16 +335,16 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>${geronimo-annotation_1.3_spec.version}</version>
- <classifier>sources</classifier>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.0.0</version>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>${geronimo-annotation_1.3_spec.version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.0.0</version>
+ <classifier>sources</classifier>
<optional>true</optional>
</dependency>
@@ -378,20 +378,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor_1.2_spec.version}</version>
- <classifier>sources</classifier>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor_1.2_spec.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
<version>${geronimo-j2ee-connector_1.6_spec.version}</version>
<classifier>sources</classifier>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index c9e5ae1..9932412 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -415,6 +415,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -515,7 +521,7 @@
<source>${project.basedir}/../../transform/src/patch/java/</source>
</patchSources>
<sourceExcludes>
-<!-- <exclude>org/apache/cxf/jaxrs</exclude>-->
+ <!-- <exclude>org/apache/cxf/jaxrs</exclude>-->
<exclude>org/apache/bval</exclude>
</sourceExcludes>
<transformSources>true</transformSources>