From 03cc91405358bcda2fa82d49363a62296228dd5f Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Wed, 30 Oct 2024 17:39:47 -0600 Subject: [PATCH] Add an empty beans.xml to the CustomJsonbSerializationIT and ApplicationContextIT test archives. This applies to the 10.0.x branch. Fixes #1526 Signed-off-by: Scott M Stark --- .../tck/core/rest/context/app/ApplicationContextIT.java | 4 +++- .../tck/core/rest/jsonb/cdi/CustomJsonbSerializationIT.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/context/app/ApplicationContextIT.java b/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/context/app/ApplicationContextIT.java index f8b7d55d19..05a90db364 100644 --- a/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/context/app/ApplicationContextIT.java +++ b/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/context/app/ApplicationContextIT.java @@ -24,6 +24,7 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.Test; @@ -46,7 +47,8 @@ public static WebArchive createTestArchive() { archive.addClass(SimpleApplicationBean.class) .addClass(ApplicationResource.class) - .addClass(JaxRsActivator.class); + .addClass(JaxRsActivator.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); System.out.printf("test archive: %s\n", archive.toString(true)); archive.as(ZipExporter.class).exportTo(new File("/tmp/" + archive.getName()), true); return archive; diff --git a/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/jsonb/cdi/CustomJsonbSerializationIT.java b/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/jsonb/cdi/CustomJsonbSerializationIT.java index 6c1275b6d2..5b75c6e20c 100644 --- a/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/jsonb/cdi/CustomJsonbSerializationIT.java +++ b/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/jsonb/cdi/CustomJsonbSerializationIT.java @@ -35,6 +35,7 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -65,7 +66,8 @@ public static WebArchive createTestArchive() throws Exception { .addClass(SomeMessage.class) .addClass(Utils.class) .addClass(JaxRsActivator.class) - .addAsResource(new StringAsset(pubKeyString), "key.pub"); + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsResource(new StringAsset(pubKeyString), "key.pub") ; System.out.printf("test archive: %s\n", archive.toString(true)); archive.as(ZipExporter.class).exportTo(new File("/tmp/" + archive.getName()), true);