Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TCK failure for EJB32 tests #25256

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −5
Open

Fix TCK failure for EJB32 tests #25256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down
3 changes: 2 additions & 1 deletion ...sts/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/TckRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have zsh and i don;t see it as some standard ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, accidentally in the commit

configureEnvironment(bash.environment());
return bash.start();
}
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions nucleus/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down