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 @@ 3.1.0 - 4.0.4 + 4.0.3 9.7.1 @@ -143,7 +143,7 @@ 4.0.1 - 5.1.2.Final + 5.1.3.Final 1.3.1.Final 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..2318181dac8 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 @@ -206,6 +206,7 @@ private void configureEnvironment(Map 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 @@ 2.18.0 - 2.2.1.Final - 3.5.3.Final + 3.0.3.Final + 3.6.1.Final 3.30.2-GA 9.7.1 0.2.21