This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 3ca1310 DELTASPIKE-1314 fix tomee7-build-managed profile
3ca1310 is described below
commit 3ca131009825a7ccd98a76ccc19f181e127a4d85
Author: Mark Struberg <[email protected]>
AuthorDate: Fri Feb 26 23:46:00 2021 +0100
DELTASPIKE-1314 fix tomee7-build-managed profile
no other magic setting needed anymore to make it work.
---
deltaspike/cdictrl/impl-openejb/pom.xml | 30 +++++++++++++++++++++---------
deltaspike/parent/code/pom.xml | 19 +++++++++----------
deltaspike/parent/pom.xml | 20 +++++++++++++++++++-
3 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml
b/deltaspike/cdictrl/impl-openejb/pom.xml
index 571c10e..71587f4 100644
--- a/deltaspike/cdictrl/impl-openejb/pom.xml
+++ b/deltaspike/cdictrl/impl-openejb/pom.xml
@@ -106,15 +106,27 @@
<profile>
<!-- from TomEE-7.0.0 on openejb resides under the tomee group and
not openejb anymore -->
- <id>OpenEJB-TomEE</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <id>tomee7-build-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <!-- from TomEE-7.0.0 on openejb resides under the tomee group and
not openejb anymore -->
+ <id>tomee8-build-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index d8c2fd7..ead124c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -377,7 +377,7 @@
<id>OWB2</id>
<properties>
- <owb.version>2.0.11</owb.version>
+ <owb.version>2.0.21</owb.version>
<cdicontainer.version>owb-${owb.version}</cdicontainer.version>
</properties>
@@ -900,7 +900,6 @@
<profile>
<!--
- * This profile is a WIP
* arquillian-tomee-remote isn't a real remote connector for a
running server-instance
*
* DEBUGGING:
@@ -911,17 +910,17 @@
<id>tomee8-build-managed</id>
<properties>
- <tomee.version>8.0.0</tomee.version>
+ <tomee.version>8.0.6</tomee.version>
<openejb.version>${tomee.version}</openejb.version>
- <owb.version>2.0.5</owb.version>
+ <owb.version>2.0.22-SNAPSHOT</owb.version>
<cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.openejb</groupId>
+ <groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-5</version>
+ <version>8.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -997,17 +996,17 @@
<id>tomee7-build-managed</id>
<properties>
- <tomee.version>7.0.6</tomee.version>
+ <tomee.version>7.1.4</tomee.version>
<openejb.version>${tomee.version}</openejb.version>
- <owb.version>2.0.5</owb.version>
+ <owb.version>1.7.6</owb.version>
<cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.openejb</groupId>
+ <groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-5</version>
+ <version>7.0-2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 2be85f5..92e4a33 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -386,7 +386,7 @@
</roles>
<timezone>+1</timezone>
</developer>
- <developer>
+ <developer>
<id>manovotn</id>
<name>Matej Novotny</name>
<email>[email protected]</email>
@@ -463,6 +463,24 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ejb</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
<version>${owb.version}</version>
<scope>test</scope>
