You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2021/09/15 07:06:17 UTC
[tomee] branch master updated: TOMEE-3745 - Try to make ActiveMQ
optional TOMEE-3682 - Server / API bom in example (consequence of
TOMEE-3745) TOMEE-3683 - Server / API bom in example (consequence of
TOMEE-3745) TOMEE-3684 - Server / API bom in example (consequence of
TOMEE-3745) TOMEE-3596 - Server / API bom in example (consequence of
TOMEE-3745)
This is an automated email from the ASF dual-hosted git repository.
rzo1 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 df082ec TOMEE-3745 - Try to make ActiveMQ optional TOMEE-3682 - Server / API bom in example (consequence of TOMEE-3745) TOMEE-3683 - Server / API bom in example (consequence of TOMEE-3745) TOMEE-3684 - Server / API bom in example (consequence of TOMEE-3745) TOMEE-3596 - Server / API bom in example (consequence of TOMEE-3745)
new 7516a1e Merge remote-tracking branch 'origin/master'
df082ec is described below
commit df082ecc39280cb4d471d33ea33977c7e7bbc52d
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Wed Sep 15 09:05:53 2021 +0200
TOMEE-3745 - Try to make ActiveMQ optional
TOMEE-3682 - Server / API bom in example (consequence of TOMEE-3745)
TOMEE-3683 - Server / API bom in example (consequence of TOMEE-3745)
TOMEE-3684 - Server / API bom in example (consequence of TOMEE-3745)
TOMEE-3596 - Server / API bom in example (consequence of TOMEE-3745)
---
arquillian/arquillian-tomee-tests/pom.xml | 19 ++++++++++++++++
examples/injection-of-connectionfactory/pom.xml | 12 +++++-----
examples/quartz-app/pom.xml | 14 +++++++-----
examples/quartz-app/quartz-beans/pom.xml | 29 ++++---------------------
examples/quartz-app/quartz-ra/pom.xml | 4 ++--
examples/simple-mdb-and-cdi/pom.xml | 12 +++++-----
examples/simple-mdb-with-descriptor/pom.xml | 12 +++++-----
examples/simple-mdb/pom.xml | 12 +++++-----
tck/cdi-embedded/pom.xml | 23 +++++++++++++++++++-
9 files changed, 79 insertions(+), 58 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 326eeb6..ae0152e 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -121,6 +121,25 @@
<version>${project.version}</version>
</dependency>
+ <!-- ActiveMQ is optional in openejb-core -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>activemq-broker</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- for tests with Hibernate -->
diff --git a/examples/injection-of-connectionfactory/pom.xml b/examples/injection-of-connectionfactory/pom.xml
index d6051ae..803ebe3 100644
--- a/examples/injection-of-connectionfactory/pom.xml
+++ b/examples/injection-of-connectionfactory/pom.xml
@@ -66,15 +66,15 @@
</repositories>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>[8.0,)</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>8.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<!--
@@ -82,8 +82,8 @@
code is dependent on any OpenEJB classes.
-->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
<version>8.0.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index a2a8a2d..1dd4292 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -75,14 +75,16 @@
<version>2.2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
+ <version>8.0.9-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>[8.0,)</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>8.0.9-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/quartz-app/quartz-beans/pom.xml b/examples/quartz-app/quartz-beans/pom.xml
index 635e158..e8fb9aa 100644
--- a/examples/quartz-app/quartz-beans/pom.xml
+++ b/examples/quartz-app/quartz-beans/pom.xml
@@ -43,37 +43,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
</dependency>
<!--
Note that <scope>test</scope> is NOT specified here because some OpenEJB specific classes
are used in the JobBean example.
-->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
</dependency>
</dependencies>
<!--
diff --git a/examples/quartz-app/quartz-ra/pom.xml b/examples/quartz-app/quartz-ra/pom.xml
index ec59481..ac1d217 100644
--- a/examples/quartz-app/quartz-ra/pom.xml
+++ b/examples/quartz-app/quartz-ra/pom.xml
@@ -36,8 +36,8 @@
<artifactId>quartz</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
</dependency>
</dependencies>
<!--
diff --git a/examples/simple-mdb-and-cdi/pom.xml b/examples/simple-mdb-and-cdi/pom.xml
index 1773a0b..7867be9 100644
--- a/examples/simple-mdb-and-cdi/pom.xml
+++ b/examples/simple-mdb-and-cdi/pom.xml
@@ -66,15 +66,15 @@
</repositories>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>[8.0,)</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>8.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<!--
@@ -82,8 +82,8 @@
code is dependent on any OpenEJB classes.
-->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
<version>8.0.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/examples/simple-mdb-with-descriptor/pom.xml b/examples/simple-mdb-with-descriptor/pom.xml
index 886001f..d4e3aaf 100644
--- a/examples/simple-mdb-with-descriptor/pom.xml
+++ b/examples/simple-mdb-with-descriptor/pom.xml
@@ -66,15 +66,15 @@
</repositories>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>[8.0,)</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>8.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<!--
@@ -82,8 +82,8 @@
code is dependent on any OpenEJB classes.
-->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
<version>8.0.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/examples/simple-mdb/pom.xml b/examples/simple-mdb/pom.xml
index c223038..16a692f 100644
--- a/examples/simple-mdb/pom.xml
+++ b/examples/simple-mdb/pom.xml
@@ -66,15 +66,15 @@
</repositories>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>[8.0,)</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>8.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<!--
@@ -82,8 +82,8 @@
code is dependent on any OpenEJB classes.
-->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
<version>8.0.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 0c9ad0e..c0c00fe 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -185,7 +185,28 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+ <!-- ActiveMQ is optional in openejb-core (embedded needs openejb-core + all deps)-->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>activemq-broker</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>