rc5

avaje · Feb 7, 2023 · 6e65622 · 6e65622
1 parent ca6c9e5
commit 6e65622
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 50 deletions.
diff --git a/blackbox-aspect/pom.xml b/blackbox-aspect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/blackbox-other/pom.xml b/blackbox-other/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>

diff --git a/blackbox-test-inject/pom.xml b/blackbox-test-inject/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java b/inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java
@@ -14,7 +14,7 @@
  */
 final class ExternalProvider {
 
-  private static final boolean moduleLoaded = moduleCP();
+  private static final boolean injectAvailable = moduleCP();
 
   private ExternalProvider() {}
 
@@ -30,7 +30,7 @@ private static boolean moduleCP() {
 
   public static Set<String> registerModuleProvidedTypes(Set<String> providedTypes) {
 
-    if (!moduleLoaded) return Set.of();
+    if (!injectAvailable) return Set.of();
 
     final ServiceLoader<Module> load =
         ServiceLoader.load(Module.class, ExternalProvider.class.getClassLoader());
@@ -60,7 +60,7 @@ public static Set<String> registerModuleProvidedTypes(Set<String> providedTypes)
    */
   public static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
 
-    if (!moduleLoaded) return;
+    if (!injectAvailable) return;
 
     for (final Plugin plugin : ServiceLoader.load(Plugin.class, Processor.class.getClassLoader())) {
       for (final Class<?> provide : plugin.provides()) {

diff --git a/inject-generator/src/main/java/module-info.java b/inject-generator/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
   requires java.compiler;
   requires io.avaje.inject;
-  requires io.avaje.inject.prism;
+  requires avaje.inject.prism;
 
   uses io.avaje.inject.spi.Plugin;
   uses io.avaje.inject.spi.Module;

diff --git a/inject-maven-plugin/pom.xml b/inject-maven-plugin/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>8.12-RC3</version>
+      <version>8.12-RC4</version>
     </dependency>
   </dependencies>
 

diff --git a/inject-prism/pom.xml b/inject-prism/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
   <artifactId>avaje-inject-prism</artifactId>
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>8.12-RC4</version>
+      <version>${project.version}</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -22,37 +22,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-jar</id>
-            <configuration>
-              <archive>
-                <manifestEntries>
-                  <Automatic-Module-Name>io.avaje.inject.prism</Automatic-Module-Name>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+</project>
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>
@@ -124,7 +124,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-inject-generator</artifactId>
-              <version>8.12-RC4</version>
+              <version>${project.version}</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

diff --git a/inject/pom.xml b/inject/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.12-RC4</version>
+    <version>8.12-RC5</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>8.12-RC4</version>
+  <version>8.12-RC5</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>
@@ -49,4 +49,3 @@
   </profiles>
 
 </project>
-