From e09e76adb13417687c1e794ee7da46fa67ad90f7 Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@omnifish.ee>
Date: Sun, 1 Dec 2024 19:53:35 +0100
Subject: [PATCH] Fix TCK failure for EJB32 tests

Use EclipseLink 4.0.3 instead of 4.0.4
Weld back to 5.1.3
---
 appserver/pom.xml                                             | 4 ++--
 .../main/java/org/glassfish/main/tests/tck/ant/TckRunner.java | 3 ++-
 nucleus/parent/pom.xml                                        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/appserver/pom.xml b/appserver/pom.xml
index ad457326220..dce1ad6b74c 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -108,7 +108,7 @@
 
         <!-- Jakarta Persistence -->
         <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
-        <eclipselink.version>4.0.4</eclipselink.version>
+        <eclipselink.version>4.0.3</eclipselink.version>
         <eclipselink.asm.version>9.7.1</eclipselink.asm.version>
 
         <!-- Jakarta Transactions -->
@@ -143,7 +143,7 @@
 
         <!-- Jakarta CDI -->
         <jakarta.cdi-api.version>4.0.1</jakarta.cdi-api.version>
-        <weld.version>5.1.2.Final</weld.version>
+        <weld.version>5.1.3.Final</weld.version>
         <jboss.classfilewriter.version>1.3.1.Final</jboss.classfilewriter.version>
 
         <!-- Jakarta MVC -->
diff --git a/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java b/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java
index d94025aed12..184df357a0d 100644
--- a/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java
+++ b/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java
@@ -183,7 +183,7 @@ private void deleteDirectory(final Path directory) throws IOException {
     }
 
     private Process startBash(final String command) throws IOException {
-        ProcessBuilder bash = new ProcessBuilder("/bin/bash", "-c", command).inheritIO().directory(cfg.getTargetDir());
+        ProcessBuilder bash = new ProcessBuilder("/bin/zsh", "-c", command).inheritIO().directory(cfg.getTargetDir());
         configureEnvironment(bash.environment());
         return bash.start();
     }
@@ -206,6 +206,7 @@ private void configureEnvironment(Map<String, String> env) {
         env.put("PATH", String.join(":",
             cfg.getJdkDirectory().getAbsolutePath() + "/bin",
             cfg.getAntDirectory().getAbsolutePath() + "/bin",
+            "/opt/homebrew/bin", // For macOs, to override BSD tar with GNU Tar etc
             "/usr/bin",
             "/bin"));
         env.put("CTS_HOME", cfg.getTargetDir().getAbsolutePath());
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 01b52c85dbd..7e254e69858 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -136,8 +136,8 @@
         <!-- 3rd party dependencies -->
 
         <commons-io.version>2.18.0</commons-io.version>
-        <jboss.logging.annotation.version>2.2.1.Final</jboss.logging.annotation.version>
-        <jboss.logging.version>3.5.3.Final</jboss.logging.version>
+        <jboss.logging.annotation.version>3.0.3.Final</jboss.logging.annotation.version>
+        <jboss.logging.version>3.6.1.Final</jboss.logging.version>
         <javassist.version>3.30.2-GA</javassist.version>
         <asm.version>9.7.1</asm.version>
         <jsch.version>0.2.21</jsch.version>