You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/04/14 17:53:25 UTC
(maven-doxia-sitetools) branch DOXIASITETOOLS-335 created (now ba8a8e6)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIASITETOOLS-335
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
at ba8a8e6 [DOXIASITETOOLS-335] Upgrade to Doxia 2.0.0-M10
This branch includes the following new commits:
new ba8a8e6 [DOXIASITETOOLS-335] Upgrade to Doxia 2.0.0-M10
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-doxia-sitetools) 01/01: [DOXIASITETOOLS-335] Upgrade to Doxia 2.0.0-M10
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIASITETOOLS-335
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit ba8a8e609521f9c19602562203db9eb99ed7303c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 14 19:51:19 2024 +0200
[DOXIASITETOOLS-335] Upgrade to Doxia 2.0.0-M10
---
doxia-integration-tools/pom.xml | 2 +-
.../apache/maven/doxia/siterenderer/AttributesVerifier.java | 13 +++++++------
.../apache/maven/doxia/siterenderer/EntitiesVerifier.java | 8 ++++----
.../org/apache/maven/doxia/siterenderer/FaqVerifier.java | 8 ++++----
pom.xml | 2 +-
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index d0cae3d..d3d51cd 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M10</version>
+ <version>4.0.0-M11</version>
</dependency>
<dependency>
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
index 1672cd6..21fe068 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import org.htmlunit.html.HtmlAnchor;
import org.htmlunit.html.HtmlBold;
-import org.htmlunit.html.HtmlDivision;
+import org.htmlunit.html.HtmlCode;
import org.htmlunit.html.HtmlElement;
import org.htmlunit.html.HtmlHeading1;
import org.htmlunit.html.HtmlHeading2;
@@ -177,16 +177,17 @@ public class AttributesVerifier extends AbstractVerifier {
a = (HtmlAnchor) elementIterator.next();
assertEquals("/index.html", a.getAttribute("href"));
- HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals("verbatim source", div.getAttribute("class"));
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
+ assertNotNull(pre);
assertEquals("pretty", pre.getAttribute("class"));
+ HtmlCode code = (HtmlCode) elementIterator.next();
+ assertNotNull(code);
- div = (HtmlDivision) elementIterator.next();
- assertEquals("verbatim source", div.getAttribute("class"));
- assertEquals("", div.getAttribute("id"));
pre = (HtmlPreformattedText) elementIterator.next();
+ assertNotNull(pre);
assertEquals("pretty", pre.getAttribute("id"));
+ code = (HtmlCode) elementIterator.next();
+ assertNotNull(code);
section = (HtmlSection) elementIterator.next();
anchor = (HtmlAnchor) elementIterator.next();
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
index 1528113..f8450e7 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
@@ -21,6 +21,7 @@ package org.apache.maven.doxia.siterenderer;
import java.util.Iterator;
import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlCode;
import org.htmlunit.html.HtmlDivision;
import org.htmlunit.html.HtmlElement;
import org.htmlunit.html.HtmlHeading1;
@@ -139,12 +140,11 @@ public class EntitiesVerifier extends AbstractVerifier {
assertNotNull(h2);
assertEquals("CDATA", h2.asNormalizedText().trim());
- HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertNotNull(div);
-
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
assertNotNull(pre);
- assertEquals("<project xmlns:ant=\"jelly:ant\">", pre.asNormalizedText().trim());
+ HtmlCode code = (HtmlCode) elementIterator.next();
+ assertNotNull(code);
+ assertEquals("<project xmlns:ant=\"jelly:ant\">", code.asNormalizedText().trim());
p = (HtmlParagraph) elementIterator.next();
assertNotNull(p);
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
index 6b86466..1423982 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
@@ -21,6 +21,7 @@ package org.apache.maven.doxia.siterenderer;
import java.util.Iterator;
import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlCode;
import org.htmlunit.html.HtmlDefinitionDescription;
import org.htmlunit.html.HtmlDefinitionList;
import org.htmlunit.html.HtmlDefinitionTerm;
@@ -186,11 +187,10 @@ public class FaqVerifier extends AbstractVerifier {
assertEquals("code", element.getTagName());
assertEquals("<source></source>", element.asNormalizedText().trim());
- HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals("verbatim source", div.getAttribute("class"));
-
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
- assertEquals("<source>1.5</source>", pre.asNormalizedText().trim());
+ assertNotNull(pre);
+ HtmlCode code = (HtmlCode) elementIterator.next();
+ assertEquals("<source>1.5</source>", code.asNormalizedText().trim());
p = (HtmlParagraph) elementIterator.next();
diff --git a/pom.xml b/pom.xml
index 1a43a72..e09f6d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <doxiaVersion>2.0.0-M9</doxiaVersion>
+ <doxiaVersion>2.0.0-M10</doxiaVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<mavenVersion>3.2.5</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>