Skip to content

Commit 3e36b93

Browse files
build: bump version.testcontainers from 1.20.3 to 1.20.6 (#4056)
* build: bump version.testcontainers from 1.20.3 to 1.20.6 Bumps `version.testcontainers` from 1.20.3 to 1.20.6. Updates `org.testcontainers:testcontainers-bom` from 1.20.3 to 1.20.6 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.20.3...1.20.6) Updates `org.testcontainers:testcontainers` from 1.20.3 to 1.20.6 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.20.3...1.20.6) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-version: 1.20.6 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:testcontainers dependency-version: 1.20.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * workaround for testcontainers issue --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <[email protected]>
1 parent 37c8287 commit 3e36b93

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

integration-tests/main-app-test/src/test/java/co/elastic/apm/test/AgentSetupIT.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ void testSecurityManagerWarning() {
6666
try (AgentTestContainer.JarApp app = testAppWithJavaAgent("openjdk:17", AgentFileAccessor.Variant.STANDARD)) {
6767

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

7375
app.start();
7476

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

8486
// use a 'grant all' policy for now
8587
Files.write(tempPolicy, Arrays.asList(
86-
"grant codeBase \"file:///tmp/elastic-apm-agent.jar\" {",
88+
"grant codeBase \"file:///agent.jar\" {",
8789
" permission java.security.AllPermission;",
8890
"};"), StandardOpenOption.CREATE
8991
);

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<!-- used both for plugin & annotations dependency -->
140140
<version.animal-sniffer>1.17</version.animal-sniffer>
141141

142-
<version.testcontainers>1.20.3</version.testcontainers>
142+
<version.testcontainers>1.21.0</version.testcontainers>
143143

144144
<!-- latest version compiled for java 11 -->
145145
<version.jsonunit>2.38.0</version.jsonunit>

0 commit comments

Comments
 (0)