You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2022/08/23 15:40:50 UTC

[ignite] branch master updated: IGNITE-17565 Update Ignite dependency: jodd-lagarto (#10209)

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

ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new b57d331183f IGNITE-17565 Update Ignite dependency: jodd-lagarto (#10209)
b57d331183f is described below

commit b57d331183f719a4a8bd2abfa1e1d40ea65f3a72
Author: nao <56...@users.noreply.github.com>
AuthorDate: Tue Aug 23 18:40:42 2022 +0300

    IGNITE-17565 Update Ignite dependency: jodd-lagarto (#10209)
---
 modules/tools/pom.xml                                              | 2 +-
 .../org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index dfb059d06bb..18b0ead28ff 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>org.jodd</groupId>
             <artifactId>jodd-lagarto</artifactId>
-            <version>3.4.8</version>
+            <version>6.0.6</version>
         </dependency>
 
         <dependency>
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
index 76283acca5c..e142c658a77 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java
@@ -31,6 +31,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import jodd.jerry.Jerry;
+import jodd.lagarto.dom.LagartoDOMBuilder;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
@@ -164,7 +165,11 @@ public class GridJavadocAntTask extends MatchingTask {
 
         if (verify) {
             // Parse HTML.
-            Jerry doc = Jerry.jerry(fileContent);
+            Jerry doc = Jerry.create(
+                    new LagartoDOMBuilder()
+                            .enableHtmlMode()
+                            .configure(cfg -> cfg.setErrorLogEnabled(false))
+            ).parse(fileContent);
 
             // TODO https://issues.apache.org/jira/browse/IGNITE-13202 Check also index.html file.
             if (file.endsWith("overview-summary.html")) {