Skip to content

Commit 5c2ee0a

Browse files
committed
jakarta
1 parent adb197b commit 5c2ee0a

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

jakarta-ee-example/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@
5858
<version>1.7.33</version>
5959
</dependency>
6060

61+
<dependency>
62+
<groupId>org.glassfish</groupId>
63+
<artifactId>jakarta.json</artifactId>
64+
<version>2.0.1</version>
65+
</dependency>
66+
6167
<dependency>
6268
<groupId>org.junit.jupiter</groupId>
6369
<artifactId>junit-jupiter</artifactId>

jakarta-ee-example/src/main/java/de/rieckpil/blog/JAXRSConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package de.rieckpil.blog;
22

3-
43
import jakarta.ws.rs.ApplicationPath;
54
import jakarta.ws.rs.core.Application;
65

jakarta-ee-example/src/main/liberty/config/server.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<server description="new server">
33

44
<featureManager>
5-
<feature>javaee-8.0</feature>
6-
<feature>microProfile-4.0</feature>
5+
<feature>jakartaee-10.0</feature>
6+
<feature>microProfile-6.0</feature>
77
</featureManager>
88

99
<httpEndpoint id="defaultHttpEndpoint" httpPort="9080" httpsPort="9443"/>

jakarta-ee-example/src/test/java/de/rieckpil/blog/microshedtesting/SampleApplicationConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ public class SampleApplicationConfig implements SharedContainerConfiguration {
1212

1313
@Container
1414
public static PostgreSQLContainer<?> postgres =
15-
new PostgreSQLContainer<>(DockerImageName.parse("postgres:12"))
15+
new PostgreSQLContainer<>(DockerImageName.parse("postgres:17"))
1616
.withNetworkAliases("postgres")
1717
.withUsername("duke")
1818
.withPassword("s3cr3t")
1919
.withDatabaseName("users");
2020

2121
@Container
2222
public static MockServerContainer mockServer =
23-
new MockServerContainer(DockerImageName.parse("mockserver/mockserver:mockserver-5.11.2"))
23+
new MockServerContainer(DockerImageName.parse("mockserver/mockserver:5.15.0"))
2424
.withNetworkAliases("mockserver");
2525

2626
@Container

spring-boot-example/src/test/java/de/rieckpil/blog/localstack/ManualBeanOverrideIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import software.amazon.awssdk.core.sync.RequestBody;
1919
import software.amazon.awssdk.services.s3.S3Client;
2020
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
21+
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
2122
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
2223
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
2324
import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
@@ -71,6 +72,7 @@ void shouldProcessIncomingUploadEventAndUploadThumbnailImage() throws IOExceptio
7172
given()
7273
.atMost(Duration.ofSeconds(5))
7374
.await()
75+
.ignoreException(NoSuchKeyException.class)
7476
.untilAsserted(() -> assertNotNull(s3Client.getObject(GetObjectRequest.builder().bucket("processed-images").key("thumbnail-duke-mascot.png").build())));
7577
}
7678
}

0 commit comments

Comments
 (0)