From 9209a7a175041ba1b2e6902f6f2dbb247a96529d Mon Sep 17 00:00:00 2001
From: Gabriel Belingueres <belingueres@gmail.com>
Date: Thu, 11 May 2023 23:00:44 -0300
Subject: [PATCH] [MPIR-437] 'Java version' is set to 0.0 when no JDK details
 are detected in dependencies

This closes #51
---
 src/it/MPIR-437/pom.xml                       | 71 +++++++++++++++++++
 src/it/MPIR-437/verify.groovy                 | 31 ++++++++
 .../renderer/DependenciesRenderer.java        |  6 +-
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 src/it/MPIR-437/pom.xml
 create mode 100644 src/it/MPIR-437/verify.groovy

diff --git a/src/it/MPIR-437/pom.xml b/src/it/MPIR-437/pom.xml
new file mode 100644
index 00000000..963868f9
--- /dev/null
+++ b/src/it/MPIR-437/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.project-info-reports</groupId>
+  <artifactId>MPIR-437</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Detect dependencies with no jdk details</name>
+  <description>
+    MPIR retrieves class version information from dependencies to display that Java detected,
+    but when no detected should display a dash.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-i18n-de</artifactId>
+      <version>9.0.74</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>@sitePluginVersion@</version>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>@project.version@</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>dependencies</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
diff --git a/src/it/MPIR-437/verify.groovy b/src/it/MPIR-437/verify.groovy
new file mode 100644
index 00000000..343724b0
--- /dev/null
+++ b/src/it/MPIR-437/verify.groovy
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File dependencies = new File( basedir, 'target/site/dependencies.html' )
+def summaryRow = '''\
+<tr class="b">
+<td align="right">1</td>
+<td align="right">78.8 kB</td>
+<td align="right">141</td>
+<td align="right">-</td>
+<td align="right">-</td>
+<td align="center">-</td>
+<td align="right">-</td></tr>
+'''
+
+assert dependencies.text.contains( summaryRow.replaceAll( "\n", System.lineSeparator() ) )
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index 2470a4fe..e5eb5874 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -25,6 +25,7 @@
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.FieldPosition;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -90,6 +91,9 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
     /** Used to format file length values */
     private final DecimalFormat fileLengthDecimalFormat;
 
+    private final MessageFormat javaVersionFormat =
+            new MessageFormat("{0,choice,0#|1.1<{0,number,0.0}|9#{0,number,0}}", Locale.ROOT);
+
     /**
      * @since 2.1.1
      */
@@ -611,7 +615,7 @@ private void renderSectionDependencyFileDetails() {
                     totalentries.getTotalString(i),
                     totalclasses.getTotalString(i),
                     totalpackages.getTotalString(i),
-                    (i < 0) ? String.valueOf(highestJavaVersion) : "",
+                    (i < 0) ? javaVersionFormat.format(new Object[] {highestJavaVersion}) : "",
                     totalDebugInformation.getTotalString(i),
                     totalsealed.getTotalString(i)
                 });