This is an automated email from the ASF dual-hosted git repository. tandraschko 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 b3feab9f4 fixed RAT b3feab9f4 is described below commit b3feab9f465b3a4ba6aef56d6c913eddbbc52095 Author: Thomas Andraschko <tandrasc...@apache.org> AuthorDate: Wed Apr 19 14:44:06 2023 +0200 fixed RAT --- deltaspike/cdictrl/impl-openejb/pom.xml | 16 ++++++++-------- .../OpenEJbContainerControlConfigurationTest.java | 2 +- deltaspike/cdictrl/impl-weld/pom.xml | 5 ----- deltaspike/cdictrl/pom.xml | 2 -- deltaspike/parent/pom.xml | 6 ++---- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml b/deltaspike/cdictrl/impl-openejb/pom.xml index d1de017ee..33967a8f0 100644 --- a/deltaspike/cdictrl/impl-openejb/pom.xml +++ b/deltaspike/cdictrl/impl-openejb/pom.xml @@ -94,14 +94,14 @@ <activation> <activeByDefault>true</activeByDefault> </activation> - <dependencies> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <version>${openejb.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</artifactId> + <version>${openejb.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> </profile> <profile> diff --git a/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java b/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java index 8bf687256..5cea2d48b 100644 --- a/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java +++ b/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import jakarta.enterprise.inject.spi.BeanManager; import javax.naming.NamingException; -import jakarta.sql.DataSource; +import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; diff --git a/deltaspike/cdictrl/impl-weld/pom.xml b/deltaspike/cdictrl/impl-weld/pom.xml index d70cc8439..62df8288e 100644 --- a/deltaspike/cdictrl/impl-weld/pom.xml +++ b/deltaspike/cdictrl/impl-weld/pom.xml @@ -71,11 +71,6 @@ <version>2.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.deltaspike.test</groupId> <artifactId>test-utils</artifactId> diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml index 148e07eca..a73867449 100644 --- a/deltaspike/cdictrl/pom.xml +++ b/deltaspike/cdictrl/pom.xml @@ -63,10 +63,8 @@ <modules> <module>api</module> <module>impl-owb</module> -<!-- <module>impl-weld</module> <module>impl-openejb</module> ---> <module>tck</module> </modules> </profile> diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml index 148de5f13..bf3b2578a 100644 --- a/deltaspike/parent/pom.xml +++ b/deltaspike/parent/pom.xml @@ -54,6 +54,7 @@ <weld.version>4.0.3.Final</weld.version> <!-- for cdictrl-openejb --> + <openejb.version>4.7.5</openejb.version> <tomee.version>9.0.0.RC1</tomee.version> <openejb.owb.version>${owb.version}</openejb.owb.version> @@ -65,16 +66,13 @@ <!-- JSF-2.0 implementations--> <myfaces.version>4.0.0-RC4</myfaces.version> <myfaces2.version.current>4.0.0-RC4</myfaces2.version.current> -<!-- - <mojarra2.version>2.0.3-b03</mojarra2.version> ---> + <tomcat.version>10.1.5</tomcat.version> <!-- used for some bytecode proxy stuff. Shaded in --> <asm.version>9.5</asm.version> - <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version> <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version> <maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>