This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 0567bf5 Added missing dependency for microprofile
new f595445 Merge pull request #610 from scriptmonkey/master
0567bf5 is described below
commit 0567bf565a2d6177e6f632b1f19ae274f17d9f1f
Author: Rod Jenkins <[email protected]>
AuthorDate: Mon Nov 18 15:10:09 2019 -0600
Added missing dependency for microprofile
---
container/openejb-core/pom.xml | 6 ++++++
tomee/tomee-plume-webapp/pom.xml | 5 -----
tomee/tomee-plus-webapp/pom.xml | 5 -----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 572e591..15f8049 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -520,6 +520,12 @@
<artifactId>commons-collections</artifactId>
</dependency>
+ <dependency> <!-- Added in for backwards compatibility with the move to
Jakarta EE coordinates -->
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+
<!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index ca9ade7..b2cd028 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -148,11 +148,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency> <!-- Added in for backwards compatibility with the move to
Jakarta EE coordinates -->
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>1.2.1</version>
- </dependency>
<!-- if i'm not mistaken we decided to remove it from our default
deliveries
<dependency>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 0a932dc..cdf5f3e 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -147,11 +147,6 @@
<version>${jcs.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency> <!-- Added in for backwards compatibility with the move to
Jakarta EE coordinates -->
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>1.2.1</version>
- </dependency>
<!-- if i'm not mistaken we decided to remove it from our default
deliveries
<dependency>
