Merge branch 'master' into isbeanAbsent

Author: SentryMan

blackbox-aspect/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

blackbox-aspect/src/main/java/org/example/external/aspect/spi/AspectPlugin.java

@@ -6,7 +6,7 @@
 import io.avaje.inject.spi.InjectPlugin;
 import io.avaje.inject.spi.PluginProvides;
 
-@PluginProvides(provides = PluginProvidedClass.class)
+@PluginProvides(PluginProvidedClass.class)
 public class AspectPlugin implements InjectPlugin {
 
   @Override

blackbox-other/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>

blackbox-test-inject/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

inject-aop/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
   <artifactId>avaje-inject-aop</artifactId>
   <dependencies>

inject-events/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
   <artifactId>avaje-inject-events</artifactId>
   <name>avaje inject events</name>

inject-generator/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>

inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java

@@ -204,7 +204,7 @@ private static void addPluginToScope(ScopeInfo defaultScope, TypeElement pluginT
       return;
     }
     var prism = PluginProvidesPrism.getInstanceOn(pluginType);
-    for (final var provide : prism.provides()) {
+    for (final var provide : prism.value()) {
       defaultScope.pluginProvided(provide.toString());
     }
     for (final var provide : prism.providesStrings()) {

inject-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
 
   <artifactId>avaje-inject-maven-plugin</artifactId>

inject-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>

inject/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.5-RC5</version>
+    <version>10.5-RC6</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>

inject/src/main/java/io/avaje/inject/spi/PluginProvides.java

@@ -6,12 +6,13 @@
 import java.lang.annotation.Target;
 
 /**
- * Registers {@link InjectPlugin} classes for auto-detection.
- * <p>
- * Plugins can be registered traditionally via service loading etc but
- * if we use this {@code @PluginProvides} annotation, then avaje inject
- * can ALSO auto-detect the plugin and the types that it provides.
- * Otherwise, we need to use Maven/Gradle plugins to perform this detection.
+ * Registers {@link InjectPlugin} classes for auto-detection with JPMS.
+ *
+ * <p>Plugins can be registered with the ServiceLoader manually, but manually registered plugins may cause dependency missing
+ * errors to consumers using JPMS. (This can be fixed if the consumer uses the inject maven/gradle plugin)
+ *
+ * <p>If we use this {@code @PluginProvides} annotation, then avaje inject can auto-detect the
+ * plugin and the types that it provides when a consumer uses JPMS. This eliminates the need for a plugin consumer to take action.
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.CLASS)
@@ -20,7 +21,7 @@
   /**
    * The types this plugin provides.
    */
-  Class<?>[] provides() default {};
+  Class<?>[] value() default {};
 
   /**
    * Fully Qualified Strings of the classes provided. Use when providing generic types

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>10.5-RC5</version>
+  <version>10.5-RC6</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>
@@ -22,7 +22,7 @@
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <surefire.useModulePath>false</surefire.useModulePath>
     <argLine>-Dnet.bytebuddy.experimental=true</argLine>
-    <project.build.outputTimestamp>2024-11-05T07:11:42Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-11-05T19:04:52Z</project.build.outputTimestamp>
     <!-- VALHALLA-START ___
     <maven.compiler.release>23</maven.compiler.release>
     <maven.compiler.enablePreview>true</maven.compiler.enablePreview>