Merge branch 'master' into test-merge-services

Author: rbygrave

inject-generator/pom.xml

@@ -24,14 +24,37 @@
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.avaje</groupId>
+          <artifactId>avaje-inject-events</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>io.avaje</groupId>
+          <artifactId>avaje-inject-aop</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject-events</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject-aop</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-prisms</artifactId>
       <version>${avaje.prisms.version}</version>
       <optional>true</optional>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -45,7 +68,6 @@
       <artifactId>avaje-http-api</artifactId>
       <version>3.2</version>
       <optional>true</optional>
-      <scope>provided</scope>
     </dependency>
 
     <!-- test dependencies -->

inject-generator/src/main/java/module-info.java

@@ -5,9 +5,9 @@
 
   requires java.compiler;
   requires io.avaje.inject;
-  requires io.avaje.inject.aop;
-  requires io.avaje.inject.events;
 
+  requires static io.avaje.inject.aop;
+  requires static io.avaje.inject.events;
   requires static io.avaje.http.api;
   requires static io.avaje.prism;
   requires static io.avaje.spi;