Merge pull request #516 from avaje/dependabot/maven/master/dependenci…

…es-744d747e40 Bump the dependencies group with 3 updates
avaje · Nov 25, 2024 · b144bfe · b144bfe
2 parents 620d73d + 68b7759
commit b144bfe
Show file tree

Hide file tree

Showing 25 changed files with 102 additions and 102 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ build/
 *.Module
 dependency-reduced-pom.xml
 .DS_Store
+tests/test-sigma/avaje-processors.txt
+tests/test-sigma/io.avaje.jsonb.spi.JsonbExtension
diff --git a/htmx-nima-jstache/pom.xml b/htmx-nima-jstache/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.5</version>
+      <version>11.0</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

diff --git a/http-client/pom.xml b/http-client/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.5</version>
+      <version>11.0</version>
       <optional>true</optional>
     </dependency>
 
@@ -99,7 +99,7 @@
                 <path>
                   <groupId>io.avaje</groupId>
                   <artifactId>avaje-inject-generator</artifactId>
-                  <version>10.5</version>
+                  <version>11.0</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>

diff --git a/http-hibernate-validator/pom.xml b/http-hibernate-validator/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.1</version>
+      <version>11.0</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/http-inject-plugin/pom.xml b/http-inject-plugin/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.5</version>
+      <version>11.0</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -16,7 +16,7 @@
     <assertj.version>3.26.3</assertj.version>
     <jackson.version>2.18.1</jackson.version>
     <jex.version>2.5</jex.version>
-    <avaje-inject.version>10.5</avaje-inject.version>
+    <avaje-inject.version>11.0</avaje-inject.version>
     <nima.version>4.1.4</nima.version>
     <javalin.version>6.3.0</javalin.version>
   </properties>
@@ -43,5 +43,26 @@
       </modules>
     </profile>
   </profiles>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-validator</artifactId>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-validator-constraints</artifactId>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-validator-generator</artifactId>
+      <version>2.3</version>
+    </dependency>
+
+  </dependencies>
 
 </project>
diff --git a/tests/test-javalin-jsonb/pom.xml b/tests/test-javalin-jsonb/pom.xml
@@ -49,18 +49,12 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>3.5-RC3</version>
-    </dependency>
-
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger.version}</version>
-    </dependency>
-
+    </dependency>    
+   
     <!-- java annotation processors -->
 
     <dependency>
@@ -89,7 +83,7 @@
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>
-
+    
     <!-- test dependencies -->
     <dependency>
       <groupId>io.avaje</groupId>

diff --git a/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/GetBeanForm.java b/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/GetBeanForm.java
@@ -7,10 +7,10 @@
 import io.avaje.http.api.Ignore;
 import io.avaje.http.api.QueryParam;
 import io.avaje.jsonb.Json;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import io.avaje.validation.constraints.Email;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Size;
+import io.avaje.validation.constraints.Valid;
 
 @Json
 @Valid

diff --git a/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/HelloForm.java b/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/HelloForm.java
@@ -2,14 +2,13 @@
 
 import java.time.LocalDate;
 
-import org.hibernate.validator.constraints.URL;
-
+import io.avaje.http.api.Valid;
 import io.avaje.jsonb.Json;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Future;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import io.avaje.validation.constraints.Email;
+import io.avaje.validation.constraints.Future;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Size;
+import io.avaje.validation.constraints.URI;
 
 @Json
 @Valid
@@ -22,10 +21,12 @@ public class HelloForm {
   @Email
   @Size(max = 100)
   String email;
-@URL
-   private String url;
-@Future
-   public LocalDate startDate;
+
+  @URI
+  private String url;
+
+  @Future
+  public LocalDate startDate;
 
   public HelloForm(String name, String email) {
     this.name = name;

diff --git a/tests/test-javalin-jsonb/src/test/java/org/example/myapp/HelloControllerTest.java b/tests/test-javalin-jsonb/src/test/java/org/example/myapp/HelloControllerTest.java
@@ -45,7 +45,7 @@ void hello() {
   @Test
   void hello2() {
 
-    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
     final List<HelloDto> beans = given()
       .get(baseUrl + "/hello")
       .then()
@@ -64,7 +64,7 @@ void hello2() {
 
   @Test
   void helloAsyncRequestHandling() {
-    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
     final List<HelloDto> beans = given()
       .get(baseUrl + "/hello/async")
       .then()
@@ -207,8 +207,6 @@ void postForm_validation_expect_badRequest() {
       .as(ErrorResponse.class);
 
     assertNotNull(res);
-    assertThat(res.getMessage()).contains("failed validation");
-    assertThat(res.get("url")).isEqualTo("must be a valid URL");
     assertThat(res.get("name")).isEqualTo("must not be null");
 
     try {
@@ -227,7 +225,7 @@ void postForm_validation_expect_badRequest() {
       assertEquals(422, httpResponse.statusCode());
 
       final ErrorResponse errorResponse = e.bean(ErrorResponse.class);
-      assertThat(errorResponse.get("url")).isEqualTo("must be a valid URL");
+      assertThat(res.get("name")).isEqualTo("must not be null");
       assertThat(errorResponse.get("name")).isEqualTo("must not be null");
     }
   }

diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml
@@ -56,10 +56,10 @@
 
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>3.5-RC3</version>
+      <artifactId>avaje-validator</artifactId>
+      <version>2.3</version>
     </dependency>
-
+    
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
@@ -82,7 +82,6 @@
       <scope>provided</scope>
     </dependency>
 
-
     <!-- test dependencies -->
     <dependency>
       <groupId>io.avaje</groupId>

diff --git a/tests/test-javalin/src/main/java/org/example/myapp/Main.java b/tests/test-javalin/src/main/java/org/example/myapp/Main.java
@@ -19,7 +19,7 @@
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
 
-@InjectModule(name = "app", requires = Validator.class)
+@InjectModule(name = "app")
 @OpenAPIDefinition(info = @Info(title = "Example service", description = "Example Javalin controllers with Java and Maven"))
 public class Main {
 

diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/GetBeanForm.java b/tests/test-javalin/src/main/java/org/example/myapp/web/GetBeanForm.java
@@ -1,9 +1,9 @@
 package org.example.myapp.web;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import io.avaje.validation.constraints.Email;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Size;
+import io.avaje.validation.constraints.Valid;
 
 @Valid
 public class GetBeanForm {

diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java
@@ -21,10 +21,10 @@
 import io.avaje.http.api.Post;
 import io.avaje.http.api.Produces;
 import io.avaje.http.api.QueryParam;
+import io.avaje.http.api.Valid;
 import io.javalin.http.Context;
 import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.inject.Inject;
-import jakarta.validation.Valid;
 
 /**
  * Hello resource manager.

diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/HelloForm.java b/tests/test-javalin/src/main/java/org/example/myapp/web/HelloForm.java
@@ -2,13 +2,12 @@
 
 import java.time.LocalDate;
 
-import org.hibernate.validator.constraints.URL;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Future;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import io.avaje.validation.constraints.Email;
+import io.avaje.validation.constraints.Future;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Size;
+import io.avaje.validation.constraints.URI;
+import io.avaje.validation.constraints.Valid;
 
 @Valid
 public class HelloForm {
@@ -19,7 +18,7 @@ public class HelloForm {
   @Email @Size(max = 100)
   String email;
 
-  @URL
+  @URI
   String url;
 
   @Future

diff --git a/tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java b/tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java
@@ -45,7 +45,7 @@ void hello() {
   @Test
   void hello2() {
 
-    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
     final List<HelloDto> beans = given()
       .get(baseUrl + "/hello")
       .then()
@@ -65,7 +65,7 @@ void hello2() {
 
   @Test
   void helloAsyncRequestHandling() {
-    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
     final List<HelloDto> beans = given()
       .get(baseUrl + "/hello/async")
       .then()
@@ -209,9 +209,7 @@ void postForm_validation_expect_badRequest() {
       .as(ErrorResponse.class);
 
     assertNotNull(res);
-    assertThat(res.getMessage()).contains("failed validation");
-    assertThat(res.get("url")).isEqualTo("must be a valid URL");
-    assertThat(res.get("name")).isEqualTo("must not be null");
+    assertThat(res.getMessage()).contains("must not be null");
 
     try {
       client.request()
@@ -229,7 +227,8 @@ void postForm_validation_expect_badRequest() {
       assertEquals(422, httpResponse.statusCode());
 
       final ErrorResponse errorResponse = e.bean(ErrorResponse.class);
-      assertThat(errorResponse.get("url")).isEqualTo("must be a valid URL");
+
+      assertThat(res.getMessage()).contains("must not be null");
       assertThat(errorResponse.get("name")).isEqualTo("must not be null");
     }
   }

diff --git a/tests/test-jex/pom.xml b/tests/test-jex/pom.xml
@@ -54,12 +54,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>3.5-RC3</version>
-    </dependency>
-
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>

diff --git a/tests/test-jex/src/main/java/org/example/Main.java b/tests/test-jex/src/main/java/org/example/Main.java
@@ -1,16 +1,13 @@
 package org.example;
 
 import io.avaje.http.api.ValidationException;
-import io.avaje.http.api.Validator;
 import io.avaje.inject.BeanScope;
-import io.avaje.inject.InjectModule;
 import io.avaje.jex.Jex;
 import io.avaje.jex.Routing;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-@InjectModule(requires = Validator.class)
 public class Main {
 
   public static void main(String[] args) {

diff --git a/tests/test-jex/src/main/java/org/example/web/HelloDto.java b/tests/test-jex/src/main/java/org/example/web/HelloDto.java
@@ -1,7 +1,7 @@
 package org.example.web;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Valid;
 
 @Valid
 public class HelloDto {

diff --git a/tests/test-nima-jsonb/.project b/tests/test-nima-jsonb/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>test-nima</name>
+	<name>test-nima-jsonb</name>
 	<comment></comment>
 	<projects>
 	</projects>