From edbc416226eb490b50d81a4aacc2f7ee62257cd0 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Wed, 21 Jun 2023 11:01:11 +0200
Subject: [PATCH] PR comment about if resolution JPA.JSE test fix on JDK 21 by
 Weld dependencies upgrade

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 buildsystem/compdeps/pom.xml                  |  4 ++--
 foundation/eclipselink.core.test/antbuild.xml | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/buildsystem/compdeps/pom.xml b/buildsystem/compdeps/pom.xml
index 8122c45781f..992cc589230 100644
--- a/buildsystem/compdeps/pom.xml
+++ b/buildsystem/compdeps/pom.xml
@@ -121,9 +121,9 @@
         <!-- CQ #22995 -->
         <jboss.logging.version>3.4.1.Final</jboss.logging.version>
         <!-- CQ #22996 API, #22997 SPI-->
-        <jboss.weld.api.version>3.1.SP3</jboss.weld.api.version>
+        <jboss.weld.api.version>3.1.SP4</jboss.weld.api.version>
         <!-- CQ #22998 weld-environment-common, #22999 weld-se-core,  #23000 weld-core-impl -->
-        <jboss.weld.version>3.1.6.Final</jboss.weld.version>
+        <jboss.weld.version>3.1.9.Final</jboss.weld.version>
     </properties>
 
     <build>
diff --git a/foundation/eclipselink.core.test/antbuild.xml b/foundation/eclipselink.core.test/antbuild.xml
index e861d5b6b7e..03b0c5d5b3e 100644
--- a/foundation/eclipselink.core.test/antbuild.xml
+++ b/foundation/eclipselink.core.test/antbuild.xml
@@ -564,14 +564,21 @@
     </target>
 
     <!-- Default test target, runs test.class from test.properties (default is LRG). -->
-    <target name="test" depends="init-testing">
+    <target name="test" depends="init-testing, test-all-jdks, test-less-jdk21">
         <echo message="is.less.21.jdk: ${is.less.21.jdk}"/>
+        <generate-report/>
+    </target>
+
+    <target name="test-all-jdks">
         <test include="**/junit/**/*Test.java"/>
         <test include="${test.class}"/>
-        <test include="org.eclipse.persistence.testing.tests.security.SecurityTestModel" if:true="${is.less.21.jdk}"/>
         <generate-report/>
     </target>
 
+    <target name="test-less-jdk21" if="${is.less.21.jdk}">
+        <test include="org.eclipse.persistence.testing.tests.security.SecurityTestModel"/>
+    </target>
+
     <!-- Test target to run/debug single ${test.class}. -->
     <target name="test-single" depends="init-testing">
         <test include="${test.class}"/>