Prepare for Doxia 2.0.0

Author: michael-o

pom.xml

@@ -129,7 +129,7 @@
     <doxiaVersion>1.12.0</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
     <pluginVersion>${project.version}</pluginVersion>
-    <sitePluginVersion>3.7</sitePluginVersion>
+    <sitePluginVersion>3.12.1</sitePluginVersion>
     <!-- dotted property can not be used in .vm -->
     <fluidoVersion>${maven-fluido-skin.version}</fluidoVersion>
     <modelloNamespaceRuleVersion>2.1.0</modelloNamespaceRuleVersion>

versions-maven-plugin/src/it/it-dependency-updates-aggregate-report-issue-333/src/site/site.xml

@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -230,15 +229,6 @@ protected MavenProject getProject() {
         return project;
     }
 
-    @Override
-    protected String getOutputDirectory() {
-        if (!outputDirectory.isAbsolute()) {
-            outputDirectory = new File(project.getBasedir(), outputDirectory.getPath());
-        }
-
-        return outputDirectory.getAbsolutePath();
-    }
-
     @Override
     protected Renderer getSiteRenderer() {
         return siteRenderer;

versions-maven-plugin/src/it/it-dependency-updates-report-001/src/site/site.xml

@@ -112,9 +112,11 @@ protected void renderBody() {
      */
     protected void renderOverview() {
         sink.table();
+        sink.tableRows(null, false);
         sink.tableRow();
         renderOverviewTableRow(computeOverviewStats());
         sink.tableRow_();
+        sink.tableRows_();
         sink.table_();
     }
 
@@ -187,6 +189,7 @@ protected void renderIcon(boolean success) {
 
     protected void renderSummaryTable(Map<Dependency, ArtifactVersions> contents, boolean hasScope) {
         sink.table();
+        sink.tableRows(null, false);
 
         sink.tableRow();
         renderSummaryTableHeader(hasScope, true);
@@ -198,6 +201,7 @@ protected void renderSummaryTable(Map<Dependency, ArtifactVersions> contents, bo
         renderSummaryTableHeader(hasScope, true);
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 
@@ -368,26 +372,26 @@ protected void renderVersions(ArtifactVersion[] allUpdates, AbstractVersionDetai
                 someNotAllowed = true;
             }
             if (allowed && label != null) {
-                safeBold();
+                sink.bold();
             }
             sink.text(allUpdates[i].toString());
             if (label != null) {
                 if (allowed) {
-                    safeBold_();
+                    sink.bold_();
                 }
                 sink.nonBreakingSpace();
-                safeItalic();
+                sink.italic();
                 sink.text(label);
-                safeItalic_();
+                sink.italic_();
             }
         }
         if (someNotAllowed) {
             sink.lineBreak();
             sink.lineBreak();
             sink.text("* ");
-            safeItalic();
+            sink.italic();
             sink.text(getText("report.excludedVersion"));
-            safeItalic_();
+            sink.italic_();
         }
     }
 

versions-maven-plugin/src/it/it-dependency-updates-report-002/src/site/site.xml

@@ -93,6 +93,7 @@ private void renderTable(String titleKey, Map<Dependency, PluginUpdatesDetails>
 
     protected void renderSummaryTable(Map<Dependency, PluginUpdatesDetails> contents) {
         sink.table();
+        sink.tableRows(null, false);
 
         sink.tableRow();
         renderSummaryTableHeader(false, false);
@@ -104,6 +105,7 @@ protected void renderSummaryTable(Map<Dependency, PluginUpdatesDetails> contents
         renderSummaryTableHeader(false, false);
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 

versions-maven-plugin/src/it/it-dependency-updates-report-003/src/site/site.xml

@@ -81,6 +81,7 @@ protected void renderTable(String titleKey, Map<Property, PropertyVersions> cont
 
     protected void renderSummaryTable(Map<Property, PropertyVersions> contents) {
         sink.table();
+        sink.tableRows(null, false);
 
         sink.tableRow();
         renderSummaryTableHeader(false, false);
@@ -92,6 +93,7 @@ protected void renderSummaryTable(Map<Property, PropertyVersions> contents) {
         renderSummaryTableHeader(false, false);
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 

versions-maven-plugin/src/it/it-dependency-updates-report-004/src/site/site.xml

@@ -96,40 +96,6 @@ protected boolean equals(ArtifactVersion v1, ArtifactVersion v2) {
                 || (v1 != null && v2 != null && v1.toString().equals(v2.toString()));
     }
 
-    protected void safeBold() {
-        try {
-            sink.bold();
-        } catch (NoSuchMethodError e) {
-            // ignore Maven 2.1.0
-        }
-    }
-
-    @SuppressWarnings("checkstyle:MethodName")
-    protected void safeBold_() {
-        try {
-            sink.bold_();
-        } catch (NoSuchMethodError e) {
-            // ignore Maven 2.1.0
-        }
-    }
-
-    protected void safeItalic() {
-        try {
-            sink.italic();
-        } catch (NoSuchMethodError e) {
-            // ignore Maven 2.1.0
-        }
-    }
-
-    @SuppressWarnings("checkstyle:MethodName")
-    protected void safeItalic_() {
-        try {
-            sink.italic_();
-        } catch (NoSuchMethodError e) {
-            // ignore Maven 2.1.0
-        }
-    }
-
     /**
      * Renders a table header containing elements denoted by the given keys
      * @param keys variable argument list containing keys of the property file to retrieve the
@@ -188,11 +154,11 @@ protected void renderBoldText(boolean bold, Object object) {
             String text = object.toString();
             if (!text.isEmpty()) {
                 if (bold) {
-                    safeBold();
+                    sink.bold();
                 }
                 sink.text(text);
                 if (bold) {
-                    safeBold_();
+                    sink.bold_();
                 }
             }
         }