Bump tests to use avaje-inject 6.12 (and bumped hibernate validator)

Author: rbygrave

tests/test-client/pom.xml

@@ -15,7 +15,7 @@
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
     <jex.version>1.6</jex.version>
-    <avaje-inject.version>6.1</avaje-inject.version>
+    <avaje-inject.version>6.12</avaje-inject.version>
   </properties>
 
   <dependencies>

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

@@ -1,6 +1,5 @@
 package org.example.server;
 
-import io.avaje.inject.ApplicationScope;
 import io.avaje.inject.BeanScope;
 import io.avaje.jex.Jex;
 import io.avaje.jex.Routing;
@@ -14,7 +13,8 @@ public static void main(String[] args) {
   }
 
   public static Jex.Server start(int port) {
-    return start(port, ApplicationScope.scope());
+    BeanScope beanScope = BeanScope.newBuilder().build();
+    return start(port, beanScope);
   }
 
   public static Jex.Server start(int port, BeanScope context) {

tests/test-helidon/pom.xml

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

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

@@ -1,6 +1,6 @@
 package org.example;
 
-import io.avaje.inject.ApplicationScope;
+import io.avaje.inject.BeanScope;
 import io.helidon.health.HealthSupport;
 import io.helidon.media.jackson.JacksonSupport;
 import io.helidon.metrics.MetricsSupport;
@@ -58,7 +58,8 @@ private static Routing createRouting() {
       .register(MetricsSupport.create())
       .register("/greet", new GreetService());
 
-    ApplicationScope.list(Service.class).forEach(builder::register);
+    BeanScope beanScope = BeanScope.newBuilder().build();
+    beanScope.list(Service.class).forEach(builder::register);
 
     return builder.build();
   }

tests/test-javalin/pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>6.1</version>
+      <version>6.12</version>
     </dependency>
 
     <dependency>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.5</version>
+      <version>2.6</version>
     </dependency>
 
     <dependency>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>6.1</version>
+      <version>6.12</version>
       <scope>provided</scope>
     </dependency>
 

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

@@ -1,7 +1,7 @@
 package org.example.myapp;
 
 import io.avaje.http.api.*;
-import io.avaje.inject.ApplicationScope;
+import io.avaje.inject.BeanScope;
 import io.avaje.inject.InjectModule;
 import io.javalin.Javalin;
 import io.javalin.http.staticfiles.Location;
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-@InjectModule(name = "app", dependsOn= "validator", requires = Validator.class)
+@InjectModule(name = "app", requires = Validator.class)
 @OpenAPIDefinition(info = @Info(title = "Example service", description = "Example Javalin controllers with Java and Maven"))
 public class Main {
 
@@ -68,7 +68,8 @@ public static Javalin start(int port) {
     });
 
     // All WebRoutes / Controllers ... from DI Context
-    List<WebRoutes> webRoutes = ApplicationScope.list(WebRoutes.class);
+    BeanScope beanScope = BeanScope.newBuilder().build();
+    List<WebRoutes> webRoutes = beanScope.list(WebRoutes.class);
     app.routes(() -> webRoutes.forEach(WebRoutes::registerRoutes));
 
     app.start(port);

tests/test-jex/pom.xml

@@ -18,7 +18,7 @@
     <jex.version>2.0</jex.version>
     <swagger.version>2.0.8</swagger.version>
     <jackson.version>2.12.3</jackson.version>
-    <avaje-inject.version>6.1</avaje-inject.version>
+    <avaje-inject.version>6.12</avaje-inject.version>
     <avaje-http.version>1.13-SNAPSHOT</avaje-http.version>
   </properties>
 
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.5</version>
+      <version>2.6</version>
     </dependency>
 
     <dependency>

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

@@ -2,7 +2,6 @@
 
 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;
@@ -19,7 +18,8 @@ public static void main(String[] args) {
   }
 
   public static Jex.Server start(int port) {
-    return start(port, ApplicationScope.scope());
+    BeanScope beanScope = BeanScope.newBuilder().build();
+    return start(port, beanScope);
   }
 
   public static Jex.Server start(int port, BeanScope context) {

tests/test-spark/pom.xml

@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>6.1</version>
+      <version>6.12</version>
     </dependency>
 
     <dependency>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.5</version>
+      <version>2.6</version>
     </dependency>
 
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>6.1</version>
+      <version>6.12</version>
       <scope>provided</scope>
     </dependency>