Skip to content

Commit b144bfe

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #516 from avaje/dependabot/maven/master/dependencies-744d747e40
Bump the dependencies group with 3 updates
2 parents 620d73d + 68b7759 commit b144bfe

File tree

25 files changed

+102
-102
lines changed

25 files changed

+102
-102
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ build/
1313
*.Module
1414
dependency-reduced-pom.xml
1515
.DS_Store
16+
tests/test-sigma/avaje-processors.txt
17+
tests/test-sigma/io.avaje.jsonb.spi.JsonbExtension

‎htmx-nima-jstache/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>io.avaje</groupId>
4141
<artifactId>avaje-inject</artifactId>
42-
<version>10.5</version>
42+
<version>11.0</version>
4343
<scope>provided</scope>
4444
<optional>true</optional>
4545
</dependency>

‎http-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.avaje</groupId>
4545
<artifactId>avaje-inject</artifactId>
46-
<version>10.5</version>
46+
<version>11.0</version>
4747
<optional>true</optional>
4848
</dependency>
4949

@@ -99,7 +99,7 @@
9999
<path>
100100
<groupId>io.avaje</groupId>
101101
<artifactId>avaje-inject-generator</artifactId>
102-
<version>10.5</version>
102+
<version>11.0</version>
103103
</path>
104104
</annotationProcessorPaths>
105105
</configuration>

‎http-hibernate-validator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.avaje</groupId>
4545
<artifactId>avaje-inject</artifactId>
46-
<version>10.1</version>
46+
<version>11.0</version>
4747
<scope>provided</scope>
4848
</dependency>
4949

‎http-inject-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>io.avaje</groupId>
2121
<artifactId>avaje-inject</artifactId>
22-
<version>10.5</version>
22+
<version>11.0</version>
2323
<scope>provided</scope>
2424
<optional>true</optional>
2525
</dependency>

‎tests/pom.xml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<assertj.version>3.26.3</assertj.version>
1717
<jackson.version>2.18.1</jackson.version>
1818
<jex.version>2.5</jex.version>
19-
<avaje-inject.version>10.5</avaje-inject.version>
19+
<avaje-inject.version>11.0</avaje-inject.version>
2020
<nima.version>4.1.4</nima.version>
2121
<javalin.version>6.3.0</javalin.version>
2222
</properties>
@@ -43,5 +43,26 @@
4343
</modules>
4444
</profile>
4545
</profiles>
46+
47+
<dependencies>
48+
<dependency>
49+
<groupId>io.avaje</groupId>
50+
<artifactId>avaje-validator</artifactId>
51+
<version>2.3</version>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>io.avaje</groupId>
56+
<artifactId>avaje-validator-constraints</artifactId>
57+
<version>2.3</version>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>io.avaje</groupId>
62+
<artifactId>avaje-validator-generator</artifactId>
63+
<version>2.3</version>
64+
</dependency>
65+
66+
</dependencies>
4667

4768
</project>

‎tests/test-javalin-jsonb/pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,12 @@
4949
<version>${project.version}</version>
5050
</dependency>
5151

52-
<dependency>
53-
<groupId>io.avaje</groupId>
54-
<artifactId>avaje-http-hibernate-validator</artifactId>
55-
<version>3.5-RC3</version>
56-
</dependency>
57-
5852
<dependency>
5953
<groupId>io.swagger.core.v3</groupId>
6054
<artifactId>swagger-annotations</artifactId>
6155
<version>${swagger.version}</version>
62-
</dependency>
63-
56+
</dependency>
57+
6458
<!-- java annotation processors -->
6559

6660
<dependency>
@@ -89,7 +83,7 @@
8983
<version>2.3</version>
9084
<scope>provided</scope>
9185
</dependency>
92-
86+
9387
<!-- test dependencies -->
9488
<dependency>
9589
<groupId>io.avaje</groupId>

‎tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/GetBeanForm.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import io.avaje.http.api.Ignore;
88
import io.avaje.http.api.QueryParam;
99
import io.avaje.jsonb.Json;
10-
import jakarta.validation.Valid;
11-
import jakarta.validation.constraints.Email;
12-
import jakarta.validation.constraints.NotNull;
13-
import jakarta.validation.constraints.Size;
10+
import io.avaje.validation.constraints.Email;
11+
import io.avaje.validation.constraints.NotNull;
12+
import io.avaje.validation.constraints.Size;
13+
import io.avaje.validation.constraints.Valid;
1414

1515
@Json
1616
@Valid

‎tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/HelloForm.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
import java.time.LocalDate;
44

5-
import org.hibernate.validator.constraints.URL;
6-
5+
import io.avaje.http.api.Valid;
76
import io.avaje.jsonb.Json;
8-
import jakarta.validation.Valid;
9-
import jakarta.validation.constraints.Email;
10-
import jakarta.validation.constraints.Future;
11-
import jakarta.validation.constraints.NotNull;
12-
import jakarta.validation.constraints.Size;
7+
import io.avaje.validation.constraints.Email;
8+
import io.avaje.validation.constraints.Future;
9+
import io.avaje.validation.constraints.NotNull;
10+
import io.avaje.validation.constraints.Size;
11+
import io.avaje.validation.constraints.URI;
1312

1413
@Json
1514
@Valid
@@ -22,10 +21,12 @@ public class HelloForm {
2221
@Email
2322
@Size(max = 100)
2423
String email;
25-
@URL
26-
private String url;
27-
@Future
28-
public LocalDate startDate;
24+
25+
@URI
26+
private String url;
27+
28+
@Future
29+
public LocalDate startDate;
2930

3031
public HelloForm(String name, String email) {
3132
this.name = name;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void hello() {
4545
@Test
4646
void hello2() {
4747

48-
TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
48+
TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
4949
final List<HelloDto> beans = given()
5050
.get(baseUrl + "/hello")
5151
.then()
@@ -64,7 +64,7 @@ void hello2() {
6464

6565
@Test
6666
void helloAsyncRequestHandling() {
67-
TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
67+
TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
6868
final List<HelloDto> beans = given()
6969
.get(baseUrl + "/hello/async")
7070
.then()
@@ -207,8 +207,6 @@ void postForm_validation_expect_badRequest() {
207207
.as(ErrorResponse.class);
208208

209209
assertNotNull(res);
210-
assertThat(res.getMessage()).contains("failed validation");
211-
assertThat(res.get("url")).isEqualTo("must be a valid URL");
212210
assertThat(res.get("name")).isEqualTo("must not be null");
213211

214212
try {
@@ -227,7 +225,7 @@ void postForm_validation_expect_badRequest() {
227225
assertEquals(422, httpResponse.statusCode());
228226

229227
final ErrorResponse errorResponse = e.bean(ErrorResponse.class);
230-
assertThat(errorResponse.get("url")).isEqualTo("must be a valid URL");
228+
assertThat(res.get("name")).isEqualTo("must not be null");
231229
assertThat(errorResponse.get("name")).isEqualTo("must not be null");
232230
}
233231
}

‎tests/test-javalin/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656

5757
<dependency>
5858
<groupId>io.avaje</groupId>
59-
<artifactId>avaje-http-hibernate-validator</artifactId>
60-
<version>3.5-RC3</version>
59+
<artifactId>avaje-validator</artifactId>
60+
<version>2.3</version>
6161
</dependency>
62-
62+
6363
<dependency>
6464
<groupId>io.swagger.core.v3</groupId>
6565
<artifactId>swagger-annotations</artifactId>
@@ -82,7 +82,6 @@
8282
<scope>provided</scope>
8383
</dependency>
8484

85-
8685
<!-- test dependencies -->
8786
<dependency>
8887
<groupId>io.avaje</groupId>

‎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
@@ -19,7 +19,7 @@
1919
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
2020
import io.swagger.v3.oas.annotations.info.Info;
2121

22-
@InjectModule(name = "app", requires = Validator.class)
22+
@InjectModule(name = "app")
2323
@OpenAPIDefinition(info = @Info(title = "Example service", description = "Example Javalin controllers with Java and Maven"))
2424
public class Main {
2525

‎tests/test-javalin/src/main/java/org/example/myapp/web/GetBeanForm.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.example.myapp.web;
22

3-
import jakarta.validation.Valid;
4-
import jakarta.validation.constraints.Email;
5-
import jakarta.validation.constraints.NotNull;
6-
import jakarta.validation.constraints.Size;
3+
import io.avaje.validation.constraints.Email;
4+
import io.avaje.validation.constraints.NotNull;
5+
import io.avaje.validation.constraints.Size;
6+
import io.avaje.validation.constraints.Valid;
77

88
@Valid
99
public class GetBeanForm {

‎tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import io.avaje.http.api.Post;
2222
import io.avaje.http.api.Produces;
2323
import io.avaje.http.api.QueryParam;
24+
import io.avaje.http.api.Valid;
2425
import io.javalin.http.Context;
2526
import io.swagger.v3.oas.annotations.Hidden;
2627
import jakarta.inject.Inject;
27-
import jakarta.validation.Valid;
2828

2929
/**
3030
* Hello resource manager.

‎tests/test-javalin/src/main/java/org/example/myapp/web/HelloForm.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import java.time.LocalDate;
44

5-
import org.hibernate.validator.constraints.URL;
6-
7-
import jakarta.validation.Valid;
8-
import jakarta.validation.constraints.Email;
9-
import jakarta.validation.constraints.Future;
10-
import jakarta.validation.constraints.NotNull;
11-
import jakarta.validation.constraints.Size;
5+
import io.avaje.validation.constraints.Email;
6+
import io.avaje.validation.constraints.Future;
7+
import io.avaje.validation.constraints.NotNull;
8+
import io.avaje.validation.constraints.Size;
9+
import io.avaje.validation.constraints.URI;
10+
import io.avaje.validation.constraints.Valid;
1211

1312
@Valid
1413
public class HelloForm {
@@ -19,7 +18,7 @@ public class HelloForm {
1918
@Email @Size(max = 100)
2019
String email;
2120

22-
@URL
21+
@URI
2322
String url;
2423

2524
@Future

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void hello() {
4545
@Test
4646
void hello2() {
4747

48-
TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
48+
TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
4949
final List<HelloDto> beans = given()
5050
.get(baseUrl + "/hello")
5151
.then()
@@ -65,7 +65,7 @@ void hello2() {
6565

6666
@Test
6767
void helloAsyncRequestHandling() {
68-
TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
68+
TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
6969
final List<HelloDto> beans = given()
7070
.get(baseUrl + "/hello/async")
7171
.then()
@@ -209,9 +209,7 @@ void postForm_validation_expect_badRequest() {
209209
.as(ErrorResponse.class);
210210

211211
assertNotNull(res);
212-
assertThat(res.getMessage()).contains("failed validation");
213-
assertThat(res.get("url")).isEqualTo("must be a valid URL");
214-
assertThat(res.get("name")).isEqualTo("must not be null");
212+
assertThat(res.getMessage()).contains("must not be null");
215213

216214
try {
217215
client.request()
@@ -229,7 +227,8 @@ void postForm_validation_expect_badRequest() {
229227
assertEquals(422, httpResponse.statusCode());
230228

231229
final ErrorResponse errorResponse = e.bean(ErrorResponse.class);
232-
assertThat(errorResponse.get("url")).isEqualTo("must be a valid URL");
230+
231+
assertThat(res.getMessage()).contains("must not be null");
233232
assertThat(errorResponse.get("name")).isEqualTo("must not be null");
234233
}
235234
}

‎tests/test-jex/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@
5454
<version>${project.version}</version>
5555
</dependency>
5656

57-
<dependency>
58-
<groupId>io.avaje</groupId>
59-
<artifactId>avaje-http-hibernate-validator</artifactId>
60-
<version>3.5-RC3</version>
61-
</dependency>
62-
6357
<dependency>
6458
<groupId>io.swagger.core.v3</groupId>
6559
<artifactId>swagger-annotations</artifactId>

‎tests/test-jex/src/main/java/org/example/Main.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package org.example;
22

33
import io.avaje.http.api.ValidationException;
4-
import io.avaje.http.api.Validator;
54
import io.avaje.inject.BeanScope;
6-
import io.avaje.inject.InjectModule;
75
import io.avaje.jex.Jex;
86
import io.avaje.jex.Routing;
97

108
import java.util.LinkedHashMap;
119
import java.util.Map;
1210

13-
@InjectModule(requires = Validator.class)
1411
public class Main {
1512

1613
public static void main(String[] args) {

‎tests/test-jex/src/main/java/org/example/web/HelloDto.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.web;
22

3-
import jakarta.validation.Valid;
4-
import jakarta.validation.constraints.NotNull;
3+
import io.avaje.validation.constraints.NotNull;
4+
import io.avaje.validation.constraints.Valid;
55

66
@Valid
77
public class HelloDto {

‎tests/test-nima-jsonb/.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>test-nima</name>
3+
<name>test-nima-jsonb</name>
44
<comment></comment>
55
<projects>
66
</projects>

0 commit comments

Comments
 (0)