Skip to content

Commit 53a1bd2

Browse files
committed
Update test dependencies
1 parent 1e0fa1d commit 53a1bd2

File tree

12 files changed

+24
-28
lines changed

12 files changed

+24
-28
lines changed

tests/test-client/src/main/java/org/example/server/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static void main(String[] args) {
1313
}
1414

1515
public static Jex.Server start(int port) {
16-
BeanScope beanScope = BeanScope.newBuilder().build();
16+
BeanScope beanScope = BeanScope.builder().build();
1717
return start(port, beanScope);
1818
}
1919

tests/test-client/src/test/java/org/example/CommonApiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static void start() {
2424
final int port = new Random().nextInt(1000) + 10_000;
2525
Main.start(port);
2626

27-
final HttpClientContext clientContext = HttpClientContext.newBuilder()
27+
final HttpClientContext clientContext = HttpClientContext.builder()
2828
.baseUrl("http://localhost:" + port)
2929
.bodyAdapter(new JacksonBodyAdapter())
3030
.build();

tests/test-client/src/test/java/org/example/SimpleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void listRepos() {
2424
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2525

2626
final HttpClientContext clientContext =
27-
HttpClientContext.newBuilder()
27+
HttpClientContext.builder()
2828
.baseUrl("https://api.github.com")
2929
.bodyAdapter(new JacksonBodyAdapter(objectMapper))
3030
.build();

tests/test-helidon/pom.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323
<dependencies>
2424

2525
<dependency>
26-
<groupId>ch.qos.logback</groupId>
27-
<artifactId>logback-classic</artifactId>
28-
<version>1.2.3</version>
26+
<groupId>org.avaje</groupId>
27+
<artifactId>logback</artifactId>
28+
<version>1.0</version>
2929
</dependency>
30+
3031
<dependency>
3132
<groupId>org.slf4j</groupId>
3233
<artifactId>jul-to-slf4j</artifactId>
33-
<version>1.7.25</version>
34+
<version>1.7.36</version>
3435
</dependency>
3536

3637
<dependency>
@@ -41,12 +42,12 @@
4142
<dependency>
4243
<groupId>io.avaje</groupId>
4344
<artifactId>avaje-inject</artifactId>
44-
<version>6.12</version>
45+
<version>8.3</version>
4546
</dependency>
4647
<dependency>
4748
<groupId>io.avaje</groupId>
4849
<artifactId>avaje-inject-generator</artifactId>
49-
<version>6.12</version>
50+
<version>8.3</version>
5051
<scope>provided</scope>
5152
</dependency>
5253

@@ -83,14 +84,14 @@
8384
<dependency>
8485
<groupId>org.junit.jupiter</groupId>
8586
<artifactId>junit-jupiter-api</artifactId>
86-
<version>5.6.2</version>
87+
<version>5.8.2</version>
8788
<scope>test</scope>
8889
</dependency>
8990

9091
<dependency>
9192
<groupId>org.junit.jupiter</groupId>
9293
<artifactId>junit-jupiter-engine</artifactId>
93-
<version>5.6.2</version>
94+
<version>5.8.2</version>
9495
<scope>test</scope>
9596
</dependency>
9697

@@ -103,13 +104,13 @@
103104
<dependency>
104105
<groupId>org.assertj</groupId>
105106
<artifactId>assertj-core</artifactId>
106-
<version>3.16.1</version>
107+
<version>3.22.0</version>
107108
<scope>test</scope>
108109
</dependency>
109110
<dependency>
110111
<groupId>io.rest-assured</groupId>
111112
<artifactId>rest-assured</artifactId>
112-
<version>4.3.1</version>
113+
<version>5.0.1</version>
113114
<scope>test</scope>
114115
</dependency>
115116
<dependency>

tests/test-helidon/src/main/java/org/example/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private static Routing createRouting() {
5858
.register(MetricsSupport.create())
5959
.register("/greet", new GreetService());
6060

61-
BeanScope beanScope = BeanScope.newBuilder().build();
61+
BeanScope beanScope = BeanScope.builder().build();
6262
beanScope.list(Service.class).forEach(builder::register);
6363

6464
return builder.build();

tests/test-helidon/src/test/java/org/example/BaseWebTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static void shutdown() {
2626
}
2727

2828
public static HttpClientContext client() {
29-
return HttpClientContext.newBuilder()
29+
return HttpClientContext.builder()
3030
.baseUrl(baseUrl)
3131
.bodyAdapter(new JacksonBodyAdapter())
3232
.build();

tests/test-javalin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>io.avaje</groupId>
5454
<artifactId>avaje-inject</artifactId>
55-
<version>6.12</version>
55+
<version>8.3</version>
5656
</dependency>
5757

5858
<dependency>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>io.avaje</groupId>
8080
<artifactId>avaje-inject-generator</artifactId>
81-
<version>6.12</version>
81+
<version>8.3</version>
8282
<scope>provided</scope>
8383
</dependency>
8484

@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>io.rest-assured</groupId>
103103
<artifactId>rest-assured</artifactId>
104-
<version>4.3.1</version>
104+
<version>5.0.1</version>
105105
<scope>test</scope>
106106
</dependency>
107107

tests/test-javalin/src/main/java/org/example/myapp/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static Javalin start(int port) {
6868
});
6969

7070
// All WebRoutes / Controllers ... from DI Context
71-
BeanScope beanScope = BeanScope.newBuilder().build();
71+
BeanScope beanScope = BeanScope.builder().build();
7272
List<WebRoutes> webRoutes = beanScope.list(WebRoutes.class);
7373
app.routes(() -> webRoutes.forEach(WebRoutes::registerRoutes));
7474

tests/test-javalin/src/test/java/org/example/myapp/BaseWebTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static void shutdown() {
2626
}
2727

2828
public static HttpClientContext client() {
29-
return HttpClientContext.newBuilder()
29+
return HttpClientContext.builder()
3030
.baseUrl(baseUrl)
3131
.bodyAdapter(new JacksonBodyAdapter())
3232
.build();

tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,9 @@ class HelloControllerTest extends BaseWebTest {
2424
final HttpClientContext clientContext;
2525

2626
HelloControllerTest() {
27-
28-
final HttpClient httpClient = HttpClient.newBuilder()
29-
.build();
30-
31-
this.clientContext = HttpClientContext.newBuilder()
27+
this.clientContext = HttpClientContext.builder()
3228
.baseUrl(baseUrl)
3329
.bodyAdapter(new JacksonBodyAdapter())
34-
.client(httpClient)
3530
.build();
3631
}
3732

0 commit comments

Comments
 (0)