(maven-plugin-tools) branch master updated: Fix possible NPE

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new 495f2e27 Fix possible NPE
495f2e27 is described below

commit 495f2e27093823b6eee01957a3a136bb2f3395ad
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jun 21 11:44:51 2024 +0200

    Fix possible NPE
---
 .../maven/plugin/plugin/report/RequirementsHistory.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
 
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
index 9d797168..e97be9a1 100644
--- 
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
+++ 
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
@@ -25,6 +25,7 @@ import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginContainer;
 import org.apache.maven.model.Prerequisites;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
@@ -121,9 +122,9 @@ public class RequirementsHistory {
         if (jdk != null) {
             return jdk;
         }
-        Plugin compiler = 
getCompilerPlugin(project.getBuild().getPluginsAsMap());
+        Plugin compiler = getCompilerPlugin(project.getBuild());
         if (compiler == null) {
-            compiler = 
getCompilerPlugin(project.getPluginManagement().getPluginsAsMap());
+            compiler = getCompilerPlugin(project.getPluginManagement());
         }
 
         jdk = getPluginParameter(compiler, "release");
@@ -155,8 +156,12 @@ public class RequirementsHistory {
         return jdk;
     }
 
-    private static Plugin getCompilerPlugin(Map<String, Plugin> pluginsAsMap) {
-        return 
pluginsAsMap.get("org.apache.maven.plugins:maven-compiler-plugin");
+    private static Plugin getCompilerPlugin(PluginContainer container) {
+        if (container != null) {
+            Map<String, Plugin> pluginsAsMap = container.getPluginsAsMap();
+            return 
pluginsAsMap.get("org.apache.maven.plugins:maven-compiler-plugin");
+        }
+        return null;
     }
 
     private static String getPluginParameter(Plugin plugin, String parameter) {