Merge pull request #25256 from arjantijms/fix_ejb32_tck_failure

Fix TCK failure for EJB32 tests
eclipse-ee4j · Dec 2, 2024 · 2bff8c3 · 2bff8c3
2 parents 1091ef4 + 5ae092c
commit 2bff8c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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/...sts/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java b/...sts/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java
@@ -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
@@ -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>