[template] fix NPE when resolving templates from catalog. Fixes #560

jreleaser · Nov 30, 2021 · d05add2 · d05add2
1 parent 5e6bdd0
commit d05add2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0-SNAPSHOT
+0.9.1-SNAPSHOT
diff --git a/core/jreleaser-templates/src/main/java/org/jreleaser/templates/TemplateUtils.java b/core/jreleaser-templates/src/main/java/org/jreleaser/templates/TemplateUtils.java
@@ -35,6 +35,7 @@
 import java.util.Properties;
 
 import static org.jreleaser.util.StringUtils.isBlank;
+import static org.jreleaser.util.StringUtils.isNotBlank;
 
 /**
  * @author Andres Almiray
@@ -135,8 +136,10 @@ public static Map<String, Reader> resolveTemplates(JReleaserLogger logger, Strin
             values = TEMPLATES_INVENTORY.getProperty(templatePrefix);
         }
 
-        for (String k : values.split(",")) {
-            templates.put(k, resolveTemplate(logger, distributionTypeName + "/" + toolName.toLowerCase() + "/" + k));
+        if (isNotBlank(values)) {
+            for (String k : values.split(",")) {
+                templates.put(k, resolveTemplate(logger, distributionTypeName + "/" + toolName.toLowerCase() + "/" + k));
+            }
         }
 
         return templates;

diff --git a/core/jreleaser-utils/src/main/java/org/jreleaser/util/CalVer.java b/core/jreleaser-utils/src/main/java/org/jreleaser/util/CalVer.java
@@ -37,7 +37,7 @@
 
 /**
  * @author Andres Almiray
- * @since 1.0.0
+ * @since 0.9.1
  */
 public class CalVer implements Comparable<CalVer> {
     private static final Map<String, String> PATTERNS = new LinkedHashMap<>();

diff --git a/core/jreleaser-utils/src/test/java/org/jreleaser/util/CalVerTest.java b/core/jreleaser-utils/src/test/java/org/jreleaser/util/CalVerTest.java
@@ -32,7 +32,7 @@
 
 /**
  * @author Andres Almiray
- * @since 1.0.0
+ * @since 0.9.1
  */
 public class CalVerTest {
     @ParameterizedTest

diff --git a/plugins/jdks-maven-plugin/jdks-maven-plugin.gradle b/plugins/jdks-maven-plugin/jdks-maven-plugin.gradle
@@ -26,7 +26,7 @@ config {
 }
 
 mavenPlugin {
-    helpMojoPackage = 'org.jreleaser.maven.plugin'
+    helpMojoPackage = 'org.jreleaser.jdks.maven.plugin.help'
 }
 
 dependencies {

diff --git a/plugins/jreleaser-maven-plugin/jreleaser-maven-plugin.gradle b/plugins/jreleaser-maven-plugin/jreleaser-maven-plugin.gradle
@@ -26,7 +26,7 @@ config {
 }
 
 mavenPlugin {
-    helpMojoPackage = 'org.jreleaser.maven.plugin'
+    helpMojoPackage = 'org.jreleaser.maven.plugin.help'
 }
 
 dependencies {