Bump to avaje-inject 6.1, add requires=Validator.class to tests

Author: rbygrave

http-hibernate-validator/pom.xml

@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
       <scope>provided</scope>
     </dependency>
 

tests/test-client/pom.xml

@@ -16,7 +16,7 @@
 
   <properties>
     <jex.version>1.6</jex.version>
-    <avaje-inject.version>6.0</avaje-inject.version>
+    <avaje-inject.version>6.1</avaje-inject.version>
   </properties>
 
   <dependencies>

tests/test-helidon/pom.xml

@@ -41,12 +41,12 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
       <scope>provided</scope>
     </dependency>
 

tests/test-javalin/pom.xml

@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
     </dependency>
 
     <dependency>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
       <scope>provided</scope>
     </dependency>
 

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

@@ -1,10 +1,8 @@
 package org.example.myapp;
 
-import io.avaje.http.api.InvalidPathArgumentException;
-import io.avaje.http.api.InvalidTypeArgumentException;
-import io.avaje.http.api.ValidationException;
-import io.avaje.http.api.WebRoutes;
+import io.avaje.http.api.*;
 import io.avaje.inject.ApplicationScope;
+import io.avaje.inject.InjectModule;
 import io.javalin.Javalin;
 import io.javalin.http.staticfiles.Location;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
@@ -16,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-//@ContextModule(name = "app", dependsOn= "validator")
+@InjectModule(name = "app", dependsOn= "validator", requires = Validator.class)
 @OpenAPIDefinition(info = @Info(title = "Example service", description = "Example Javalin controllers with Java and Maven"))
 public class Main {
 

tests/test-jex/pom.xml

@@ -19,7 +19,7 @@
     <jex.version>1.6</jex.version>
     <swagger.version>2.0.8</swagger.version>
     <jackson.version>2.12.3</jackson.version>
-    <avaje-inject.version>6.0</avaje-inject.version>
+    <avaje-inject.version>6.1</avaje-inject.version>
     <avaje-http.version>1.7-SNAPSHOT</avaje-http.version>
   </properties>
 

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

@@ -1,14 +1,17 @@
 package org.example;
 
 import io.avaje.http.api.ValidationException;
+import io.avaje.http.api.Validator;
 import io.avaje.inject.ApplicationScope;
 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) {

tests/test-jex/src/main/resources/public/openapi.json

@@ -129,7 +129,8 @@
             "nullable" : false
           },
           "name" : {
-            "type" : "string"
+            "type" : "string",
+            "nullable" : false
           }
         }
       }

tests/test-spark/pom.xml

@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
     </dependency>
 
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
       <scope>provided</scope>
     </dependency>