This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch update-pax-exam-in-ejb in repository https://gitbox.apache.org/repos/asf/aries.git
commit 4e0693106fbed922e4b84f6650ac80a4380f6331 Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Feb 15 16:37:35 2025 +0100 [MAINTENANCE] Update pax-exam in ejb --- ejb/ejb-modeller-itest/pom.xml | 6 +++--- ejb/openejb-extender-itest/pom.xml | 15 +++++++-------- .../ejb/openejb/extender/itest/AbstractOpenEJBTest.java | 11 +++++------ .../ejb/openejb/extender/itest/AdvancedEJBBundleTest.java | 3 ++- .../aries/ejb/openejb/extender/itest/EJBBundleTest.java | 10 ++++++++++ 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml index 0d5cbbf88..960a62d3c 100644 --- a/ejb/ejb-modeller-itest/pom.xml +++ b/ejb/ejb-modeller-itest/pom.xml @@ -47,7 +47,7 @@ <commons-lang.version>2.6</commons-lang.version> <commons-lang3.version>3.17.0</commons-lang3.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <exam.version>3.4.0</exam.version> + <exam.version>4.13.5</exam.version> <geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version> <geronimo-annotation_1.1_spec.version>1.0.1</geronimo-annotation_1.1_spec.version> <geronimo-ejb_3.1_spec.version>1.0.2</geronimo-ejb_3.1_spec.version> @@ -87,7 +87,7 @@ <org.apache.servicemix.bundles.javassist.version>3.12.1.GA_3</org.apache.servicemix.bundles.javassist.version> <org.apache.servicemix.bundles.jaxb-impl.version>2.2.1.1_2</org.apache.servicemix.bundles.jaxb-impl.version> <org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version> - <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version> + <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <scannotation.version>1.0.2_1</scannotation.version> <tinybundles.version>2.0.0</tinybundles.version> <url.version>2.6.16</url.version> @@ -480,7 +480,7 @@ </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-forked</artifactId> + <artifactId>pax-exam-container-native</artifactId> <version>${exam.version}</version> <scope>test</scope> </dependency> diff --git a/ejb/openejb-extender-itest/pom.xml b/ejb/openejb-extender-itest/pom.xml index 3a28964bf..49fdba6f3 100644 --- a/ejb/openejb-extender-itest/pom.xml +++ b/ejb/openejb-extender-itest/pom.xml @@ -91,9 +91,9 @@ <org.apache.servicemix.bundles.jaxb-impl.version>2.2.1.1_2</org.apache.servicemix.bundles.jaxb-impl.version> <org.apache.servicemix.bundles.serp.version>1.13.1_2</org.apache.servicemix.bundles.serp.version> <org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version> - <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version> + <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <org.osgi.enterprise.version>4.2.0</org.osgi.enterprise.version> - <pax-exam.version>3.4.0</pax-exam.version> + <pax-exam.version>4.13.3</pax-exam.version> <pax-logging-api.version>1.7.2</pax-logging-api.version> <pax-logging-service.version>1.7.2</pax-logging-service.version> <pax-url-aether.version>2.6.16</pax-url-aether.version> @@ -102,12 +102,6 @@ </properties> <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.enterprise</artifactId> - <version>${org.osgi.enterprise.version}</version> - </dependency> - <!-- framework --> <dependency> <groupId>org.eclipse.platform</groupId> @@ -120,6 +114,11 @@ <artifactId>junit</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.enterprise</artifactId> + <version>${org.osgi.enterprise.version}</version> + </dependency> <!-- logging --> <dependency> diff --git a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java index f74762661..26df23678 100644 --- a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java +++ b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java @@ -24,17 +24,16 @@ import java.util.zip.ZipOutputStream; import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.util.io.IOUtils; -import org.ops4j.pax.exam.Configuration; + import org.ops4j.pax.exam.Option; public abstract class AbstractOpenEJBTest extends AbstractIntegrationTest { - @Configuration - public static Option[] configuration() { - return options( + public static Option baseConfiguration() { + return composite( junitBundles(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"), + mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), + mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), frameworkProperty("org.osgi.framework.system.packages") .value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax. [...] diff --git a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AdvancedEJBBundleTest.java b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AdvancedEJBBundleTest.java index beba12227..d3e5ca305 100644 --- a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AdvancedEJBBundleTest.java +++ b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AdvancedEJBBundleTest.java @@ -55,8 +55,9 @@ import beans.jpa.Laptop; public class AdvancedEJBBundleTest extends AbstractOpenEJBTest { @Configuration - public static Option[] jpaConfig() { + public Option[] jpaConfig() { return options( + baseConfiguration(), mavenBundle("org.apache.derby", "derby").versionAsInProject(), mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api").versionAsInProject(), mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container").versionAsInProject(), diff --git a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/EJBBundleTest.java b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/EJBBundleTest.java index fac227e4a..499077218 100644 --- a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/EJBBundleTest.java +++ b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/EJBBundleTest.java @@ -18,6 +18,7 @@ package org.apache.aries.ejb.openejb.extender.itest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.ops4j.pax.exam.CoreOptions.*; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,6 +26,8 @@ import java.util.zip.ZipOutputStream; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -39,6 +42,13 @@ import beans.xml.RemoteIface; @ExamReactorStrategy(PerClass.class) public class EJBBundleTest extends AbstractOpenEJBTest { + @Configuration + public Option[] configuration() { + return options( + baseConfiguration() + ); + } + private void assertXML(Bundle test, boolean exists) throws Exception { ServiceReference[] local = context().getAllServiceReferences(LocalIface.class.getName(), "(&(ejb.name=XML)(ejb.type=Singleton))");
