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 1e158bfca some cleanup and fixed cdicontainer.version 1e158bfca is described below commit 1e158bfca0c69ebf777c4f69daf38a5f537867a9 Author: Thomas Andraschko <tandrasc...@apache.org> AuthorDate: Tue Feb 27 15:17:58 2024 +0100 some cleanup and fixed cdicontainer.version --- .../deltaspike/test/core/api/provider/BeanProviderTest.java | 9 --------- .../test/core/impl/custom/spi/ServiceUtilsTest.java | 9 --------- deltaspike/parent/code/pom.xml | 12 ++++++------ .../apache/deltaspike/test/utils/CdiContainerUnderTest.java | 5 ----- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java index 73d33507a..eef12a2d2 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java @@ -22,7 +22,6 @@ package org.apache.deltaspike.test.core.api.provider; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.api.provider.DependentProvider; import org.apache.deltaspike.test.util.ArchiveUtils; -import org.apache.deltaspike.test.utils.CdiContainerUnderTest; import org.apache.deltaspike.test.utils.Serializer; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -30,7 +29,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; -import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,9 +40,6 @@ import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL; @RunWith(Arquillian.class) public class BeanProviderTest { - private static final String CONTAINER_OWB_1_1_x = "owb-1\\.1\\..*"; - private static final String CONTAINER_TOMEE_1_5_x = "tomee-1\\.5\\..*"; - /** *X TODO creating a WebArchive is only a workaround because JavaArchive cannot contain other archives. @@ -221,10 +216,6 @@ public class BeanProviderTest @Test public void testDependentBeanSerialization() throws Exception { - // this test is known to not work under owb-1.1.x as ManagedBean for Dependent scoped classes did not implement PassivationCapable. - Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_1_x)); - Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_TOMEE_1_5_x)); - DependentProvider<DependentTestBean> dependentTestBeanProvider = BeanProvider.getDependent(DependentTestBean.class); Serializer<DependentProvider<DependentTestBean>> serializer = new Serializer<DependentProvider<DependentTestBean>>(); diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/ServiceUtilsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/ServiceUtilsTest.java index bd2ed9094..4c4a3a554 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/ServiceUtilsTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/ServiceUtilsTest.java @@ -19,23 +19,14 @@ package org.apache.deltaspike.test.core.impl.custom.spi; import org.apache.deltaspike.core.util.ServiceUtils; -import org.apache.deltaspike.test.utils.CdiContainerUnderTest; import org.junit.Assert; -import org.junit.Assume; import org.junit.Test; public abstract class ServiceUtilsTest { - private static final String CONTAINER_OWB_1_1_x = "owb-1\\.1\\..*"; - private static final String CONTAINER_OWB_1_2_0 = "owb-1\\.2\\.0"; - @Test public void lookupOfSpiImplementations() { - //exclude it due to an issue with the arquillian-adapter for owb 1.1.x and 1.2.0 - Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_1_x) && - !CdiContainerUnderTest.is(CONTAINER_OWB_1_2_0)); - Assert.assertTrue(ServiceUtils.loadServiceImplementations(MyInterface.class).iterator().hasNext()); Assert.assertNotNull(ServiceUtils.loadServiceImplementations(MyInterface.class)); diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index 633f30144..529be58f2 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -507,7 +507,7 @@ <properties> <jakartaeeapi.version>10.0-M2</jakartaeeapi.version> <owb.version>4.0.2</owb.version> - <cdicontainer.version>tomee-${tomee.version}</cdicontainer.version> + <cdicontainer.version>owb-${owb.version}</cdicontainer.version> </properties> <dependencies> @@ -583,7 +583,7 @@ <properties> <!-- Actual default Weld version used with this profile --> <weld.version>5.1.2.Final</weld.version> - <cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version> + <cdicontainer.version>weld-${weld.version}</cdicontainer.version> </properties> <dependencies> @@ -653,7 +653,7 @@ <properties> <!-- Actual default Weld version used with this profile --> <weld.version>5.1.2.Final</weld.version> - <cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version> + <cdicontainer.version>weld-${weld.version}</cdicontainer.version> </properties> <dependencies> @@ -747,7 +747,7 @@ <!-- Wildfly must be started manually for this work correctly - for debug hints see arquillian-jboss.xml --> <properties> - <cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version> + <cdicontainer.version>weld-${weld.version}</cdicontainer.version> </properties> <dependencies> @@ -811,7 +811,7 @@ <properties> <weld.version>5.0.1.Final</weld.version> - <cdicontainer.version>payara-${payara.version}</cdicontainer.version> + <cdicontainer.version>weld-${weld.version}</cdicontainer.version> </properties> <dependencies> @@ -870,7 +870,7 @@ <properties> <weld.version>5.0.1.Final</weld.version> - <cdicontainer.version>payara-${payara.version}</cdicontainer.version> + <cdicontainer.version>weld-${weld.version}</cdicontainer.version> </properties> <dependencies> diff --git a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java index 90f86da8f..5400b9cd9 100644 --- a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java +++ b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/utils/CdiContainerUnderTest.java @@ -225,9 +225,4 @@ public class CdiContainerUnderTest } } } - - public static boolean isNotTomEE() - { - return !System.getProperty("cdicontainer.version").startsWith("tomee"); - } }