diff --git a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/RenderingException.java b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/RenderingException.java index 66ac670b7..f76deed41 100644 --- a/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/RenderingException.java +++ b/maven-plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/RenderingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022 Oracle and/or its affiliates. + * Copyright (c) 2018, 2025 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,13 +20,11 @@ import java.util.Arrays; import java.util.Deque; import java.util.List; +import java.util.StringJoiner; import java.util.stream.Collectors; import freemarker.template.TemplateException; -import static java.lang.System.lineSeparator; -import static java.util.stream.Collectors.joining; - /** * An exception to represent any error occurring as part of site processing. */ @@ -47,9 +45,22 @@ public RenderingException(String msg) { * @param errors exceptions to aggregate */ public RenderingException(List errors) { - this(errors.stream() - .map(Throwable::getMessage) - .collect(joining(lineSeparator()))); + this(allErrorInfo(errors)); + } + + private static String allErrorInfo(List errors) { + return errors.stream() + .map(RenderingException::cascadeMessages) + .collect(Collectors.joining()); + } + + private static String cascadeMessages(Throwable error){ + StringJoiner result = new StringJoiner(System.lineSeparator()); + while (error != null) { + result.add(error.getMessage()); + error = error.getCause(); + } + return result.toString(); } /** diff --git a/maven-plugins/sitegen-maven-plugin/src/main/resources/templates/vuetify/block_table.ftl b/maven-plugins/sitegen-maven-plugin/src/main/resources/templates/vuetify/block_table.ftl index c1b17b91f..df5b6dc3b 100644 --- a/maven-plugins/sitegen-maven-plugin/src/main/resources/templates/vuetify/block_table.ftl +++ b/maven-plugins/sitegen-maven-plugin/src/main/resources/templates/vuetify/block_table.ftl @@ -1,5 +1,5 @@ <#-- - Copyright (c) 2018, 2022 Oracle and/or its affiliates. + Copyright (c) 2018, 2025 Oracle and/or its affiliates. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -50,8 +50,14 @@ TODO: <#list row.cells as cell> <#if cell.content?is_enumerable> -<#list cell.content as cellcontent>${cellcontent} -<#else>${cell.content} +<#list cell.content as cellcontent> rowspan="${cell.rowspan}" +<#if cell.colspan??> colspan="${cell.colspan}" +>${cellcontent} +<#else> rowspan="${cell.rowspan}" +<#if cell.colspan??> colspan="${cell.colspan}" +>${cell.content}