Skip to content

build: bump version.testcontainers from 1.20.3 to 1.20.6 #4056

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

Merged
merged 4 commits into from
May 2, 2025
Merged

build: bump version.testcontainers from 1.20.3 to 1.20.6 #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12633a8
build: bump version.testcontainers from 1.20.3 to 1.20.6
dependabot[bot] Apr 28, 2025
2347996
workaround for testcontainers issue
SylvainJuge May 2, 2025
f9e9219
Merge branch 'main' of github.com:elastic/apm-agent-java into dependa…
SylvainJuge May 2, 2025
8bdec28
make test more reliable
SylvainJuge May 2, 2025
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
8 changes: 5 additions & 3 deletions integration-tests/main-app-test/src/test/java/co/elastic/apm/test/AgentSetupIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ void testSecurityManagerWarning() {
try (AgentTestContainer.JarApp app = testAppWithJavaAgent("openjdk:17", AgentFileAccessor.Variant.STANDARD)) {

app.withSecurityManager(null)
.waitingFor(Wait.forLogMessage(expectedMsg, 1))
// using a dummy command since testcontainers 1.21.0 as waiting on stderr msg is not working anymore
// when the container fails to start. Likely related to https://github.com/testcontainers/testcontainers-java/issues/9956
.waitingFor(Wait.forLogMessage(".*processing of -javaagent failed, processJavaStart failed.*", 1))
// we expect startup to fail fast as JVM should not even properly start
.withStartupTimeout(Duration.ofSeconds(1));
.withStartupTimeout(Duration.ofSeconds(3));

app.start();

Expand All @@ -83,7 +85,7 @@ void testSecurityManagerWithPolicy(@TempDir Path temp) throws IOException {

// use a 'grant all' policy for now
Files.write(tempPolicy, Arrays.asList(
"grant codeBase \"file:///tmp/elastic-apm-agent.jar\" {",
"grant codeBase \"file:///agent.jar\" {",
" permission java.security.AllPermission;",
"};"), StandardOpenOption.CREATE
);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<!-- used both for plugin & annotations dependency -->
<version.animal-sniffer>1.17</version.animal-sniffer>

<version.testcontainers>1.20.3</version.testcontainers>
<version.testcontainers>1.21.0</version.testcontainers>

<!-- latest version compiled for java 11 -->
<version.jsonunit>2.38.0</version.jsonunit>
Expand Down
Loading