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 2022/06/19 10:48:52 UTC
[maven-doxia-sitetools] branch DOXIASITETOOLS-256 updated (387c6dd -> 49804dd)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIASITETOOLS-256
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
omit 387c6dd [DOXIASITETOOLS-256] Upgrade to Doxia 2.0.0-M3
new 49804dd [DOXIASITETOOLS-256] Upgrade to Doxia 2.0.0-M3
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (387c6dd)
\
N -- N -- N refs/heads/DOXIASITETOOLS-256 (49804dd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.../maven/doxia/siterenderer/AptVerifier.java | 26 +++++++--------
.../doxia/siterenderer/AttributesVerifier.java | 36 ++++++++++----------
.../maven/doxia/siterenderer/EntitiesVerifier.java | 38 +++++++++++-----------
.../maven/doxia/siterenderer/FaqVerifier.java | 14 ++++----
.../doxia/siterenderer/JavascriptVerifier.java | 28 ++++++++--------
.../doxia/siterenderer/MultipleBlockVerifier.java | 8 ++---
.../doxia/siterenderer/NestedItemsVerifier.java | 28 ++++++++--------
.../resources/site-validate/xdoc/entityTest.xml | 10 +++---
.../src/test/resources/site/xdoc/nestedItems.xml | 6 ++--
9 files changed, 97 insertions(+), 97 deletions(-)
[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-256] Upgrade to Doxia 2.0.0-M3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIASITETOOLS-256
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 49804dd87f58e952a9bb0a4ee7f49d032e4398dc
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 18 22:30:36 2022 +0200
[DOXIASITETOOLS-256] Upgrade to Doxia 2.0.0-M3
This closes #50
---
.../maven/doxia/siterenderer/AptVerifier.java | 26 +++++++--------
.../doxia/siterenderer/AttributesVerifier.java | 36 ++++++++++----------
.../maven/doxia/siterenderer/EntitiesVerifier.java | 38 +++++++++++-----------
.../maven/doxia/siterenderer/FaqVerifier.java | 14 ++++----
.../doxia/siterenderer/JavascriptVerifier.java | 28 ++++++++--------
.../doxia/siterenderer/MultipleBlockVerifier.java | 8 ++---
.../doxia/siterenderer/NestedItemsVerifier.java | 28 ++++++++--------
.../resources/site-validate/xdoc/entityTest.xml | 10 +++---
.../src/test/resources/site/xdoc/nestedItems.xml | 6 ++--
pom.xml | 2 +-
10 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
index adaf4f4..22f5c7e 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
@@ -24,8 +24,8 @@ import com.gargoylesoftware.htmlunit.html.HtmlBold;
import com.gargoylesoftware.htmlunit.html.HtmlCode;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -64,9 +64,9 @@ public class AptVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "Links", h2.asNormalizedText().trim() );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( "Links", h1.asNormalizedText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertEquals( "Links", a.getAttribute( "name" ) );
@@ -109,10 +109,10 @@ public class AptVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
// Note: htmlunit strips the white space, actual result is ok
- assertEquals( "Section formatting: italic bold mono", h2.asNormalizedText().trim() );
+ assertEquals( "Section formatting: italic bold mono", h1.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Section_formatting:_italic_bold_mono", a.getAttribute( "name" ) );
@@ -132,10 +132,10 @@ public class AptVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
- assertNotNull( h3 );
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
+ assertNotNull( h2 );
// Note: htmlunit strips the white space, actual result is ok
- assertEquals( "SubSection formatting: italic bold mono", h3.asNormalizedText().trim() );
+ assertEquals( "SubSection formatting: italic bold mono", h2.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "SubSection_formatting:_italic_bold_mono", a.getAttribute( "name" ) );
@@ -170,9 +170,9 @@ public class AptVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "No Default Anchor in Section Title with Explicit Anchor", h2.asNormalizedText().trim() );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( "No Default Anchor in Section Title with Explicit Anchor", h1.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "No_Default_Anchor_in_Section_Title_with_Explicit_Anchor", a.getAttribute( "name" ) );
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 b233543..99f9865 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
@@ -23,8 +23,8 @@ import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlBold;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlImage;
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -76,9 +76,9 @@ public class AttributesVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "section", h2.asNormalizedText().trim() );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( "section", h1.asNormalizedText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -197,30 +197,30 @@ public class AttributesVerifier
assertEquals( "pretty", pre.getAttribute( "id" ) );
section = (HtmlSection) elementIterator.next();
- h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( "Section without id", h2.asNormalizedText().trim() );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Section without id", h1.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Section_without_id", a.getAttribute( "name" ) );
section = (HtmlSection) elementIterator.next();
- HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
- assertEquals( "Subsection without id", h3.asNormalizedText().trim() );
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
+ assertEquals( "Subsection without id", h2.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Subsection_without_id", a.getAttribute( "name" ) );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "section-id", a.getAttribute( "name" ) );
section = (HtmlSection) elementIterator.next();
- h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( "Section with id", h2.asNormalizedText().trim() );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Section with id", h1.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Section_with_id", a.getAttribute( "name" ) );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "subsection-id", a.getAttribute( "name" ) );
section = (HtmlSection) elementIterator.next();
- h3 = (HtmlHeading3) elementIterator.next();
- assertEquals( "Subsection with id", h3.asNormalizedText().trim() );
+ h2 = (HtmlHeading2) elementIterator.next();
+ assertEquals( "Subsection with id", h2.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Subsection_with_id", a.getAttribute( "name" ) );
@@ -229,9 +229,9 @@ public class AttributesVerifier
section = (HtmlSection) elementIterator.next();
assertEquals( "bar", section.getAttribute( "class" ) );
assertEquals( "foo", section.getAttribute( "id" ) );
- h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( "Section name", h2.asNormalizedText().trim() );
- assertEquals( "", h2.getAttribute( "class" ) );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Section name", h1.asNormalizedText().trim() );
+ assertEquals( "", h1.getAttribute( "class" ) );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Section_name", a.getAttribute( "name" ) );
@@ -240,9 +240,9 @@ public class AttributesVerifier
section = (HtmlSection) elementIterator.next();
assertEquals( "subbar", section.getAttribute( "class" ) );
assertEquals( "subfoo", section.getAttribute( "id" ) );
- h3 = (HtmlHeading3) elementIterator.next();
- assertEquals( "Subsection name", h3.asNormalizedText().trim() );
- assertEquals( "", h3.getAttribute( "class" ) );
+ h2 = (HtmlHeading2) elementIterator.next();
+ assertEquals( "Subsection name", h2.asNormalizedText().trim() );
+ assertEquals( "", h2.getAttribute( "class" ) );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Subsection_name", a.getAttribute( "name" ) );
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 0291b6f..ed593cf 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
@@ -22,9 +22,9 @@ package org.apache.maven.doxia.siterenderer;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading4;
import com.gargoylesoftware.htmlunit.html.HtmlMeta;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -105,9 +105,9 @@ public class EntitiesVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( h2.asNormalizedText().trim(), "section name with entities: '&' '\u0391' ' ' '\uD835\uDFED'" );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( h1.asNormalizedText().trim(), "section name with entities: '&' '\u0391' ' ' '\uD835\uDFED'" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -120,9 +120,9 @@ public class EntitiesVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- HtmlHeading4 h4 = (HtmlHeading4) elementIterator.next();
- assertNotNull( h4 );
- assertEquals( "Entities", h4.asNormalizedText().trim() );
+ HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
+ assertNotNull( h3 );
+ assertEquals( "Entities", h3.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -131,9 +131,9 @@ public class EntitiesVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
- assertNotNull( h3 );
- assertEquals( "Generic Entities: '&' '<' '>' '\"' '''", h3.asNormalizedText().trim() );
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
+ assertNotNull( h2 );
+ assertEquals( "Generic Entities: '&' '<' '>' '\"' '''", h2.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
@@ -144,9 +144,9 @@ public class EntitiesVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h3 = (HtmlHeading3) elementIterator.next();
- assertNotNull( h3 );
- assertEquals( "Local Entities: '\u0391' '\u0392' '\u0393' '\uD835\uDFED'", h3.asNormalizedText().trim() );
+ h2 = (HtmlHeading2) elementIterator.next();
+ assertNotNull( h2 );
+ assertEquals( "Local Entities: '\u0391' '\u0392' '\u0393' '\uD835\uDFED'", h2.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
@@ -157,9 +157,9 @@ public class EntitiesVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h3 = (HtmlHeading3) elementIterator.next();
- assertNotNull( h3 );
- assertEquals( "DTD Entities: ' ' '\u00A1' '\u00A2'", h3.asNormalizedText().trim() );
+ h2 = (HtmlHeading2) elementIterator.next();
+ assertNotNull( h2 );
+ assertEquals( "DTD Entities: ' ' '\u00A1' '\u00A2'", h2.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
@@ -170,9 +170,9 @@ public class EntitiesVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h4 = (HtmlHeading4) elementIterator.next();
- assertNotNull( h4 );
- assertEquals( "CDATA", h4.asNormalizedText().trim() );
+ h3 = (HtmlHeading3) elementIterator.next();
+ assertNotNull( h3 );
+ assertEquals( "CDATA", h3.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
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 ed5a83f..3173b1c 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
@@ -25,7 +25,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlDefinitionList;
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionTerm;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
import com.gargoylesoftware.htmlunit.html.HtmlOrderedList;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -66,8 +66,8 @@ public class FaqVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( "Oft Asked Questions", h2.asNormalizedText().trim() );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Oft Asked Questions", h1.asNormalizedText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertEquals( a.getAttribute( "name" ), "Oft_Asked_Questions" );
@@ -110,8 +110,8 @@ public class FaqVerifier
section = (HtmlSection) elementIterator.next();
- h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( "Contributing", h2.asNormalizedText().trim() );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Contributing", h1.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Contributing", a.getAttribute( "name" ) );
@@ -162,8 +162,8 @@ public class FaqVerifier
section = (HtmlSection) elementIterator.next();
- h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( "Using Maven", h2.asNormalizedText().trim() );
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Using Maven", h1.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Using_Maven", a.getAttribute( "name" ) );
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
index 27bc459..630436a 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
@@ -24,7 +24,7 @@ import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
@@ -67,39 +67,39 @@ public class JavascriptVerifier
// HtmlUnit
try ( WebClient webClient = new WebClient() ) {
webClient.getOptions().setCssEnabled( false );
-
+
final List<String> collectedAlerts = new ArrayList<String>( 4 );
webClient.setAlertHandler( new CollectingAlertHandler( collectedAlerts ) );
-
+
HtmlPage page = (HtmlPage) webClient.getPage( jsTest.toURI().toURL() );
assertNotNull( page );
-
+
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
-
+
Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
-
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
-
+
HtmlSection section = (HtmlSection) elementIterator.next();
assertNotNull( section );
-
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "Test", h2.asNormalizedText().trim() );
-
+
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( "Test", h1.asNormalizedText().trim() );
+
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
assertEquals( "Test", a.getAttribute( "name" ) );
-
+
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
assertEquals( "You should see a JavaScript alert...", p.asNormalizedText().trim() );
-
+
HtmlScript script = (HtmlScript) elementIterator.next();
assertNotNull( script );
assertEquals( "text/javascript", script.getAttribute( "type" ) );
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
index ce22c0c..fe7d657 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
@@ -22,7 +22,7 @@ package org.apache.maven.doxia.siterenderer;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -63,9 +63,9 @@ public class MultipleBlockVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "section name", h2.asNormalizedText().trim() );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( "section name", h1.asNormalizedText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
index f4802c5..049f7ea 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
@@ -27,8 +27,8 @@ import com.gargoylesoftware.htmlunit.html.HtmlDefinitionList;
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionTerm;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading4;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
import com.gargoylesoftware.htmlunit.html.HtmlOrderedList;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -68,9 +68,9 @@ public class NestedItemsVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "List Section", h2.asNormalizedText().trim() );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertNotNull( h1 );
+ assertEquals( "List Section", h1.asNormalizedText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -86,9 +86,9 @@ public class NestedItemsVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- HtmlHeading4 h4 = (HtmlHeading4) elementIterator.next();
- assertNotNull( h4 );
- assertEquals( "Unordered lists", h4.asNormalizedText().trim() );
+ HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
+ assertNotNull( h3 );
+ assertEquals( "Unordered lists", h3.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -176,9 +176,9 @@ public class NestedItemsVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h4 = (HtmlHeading4) elementIterator.next();
- assertNotNull( h4 );
- assertEquals( "Ordered lists", h4.asNormalizedText().trim() );
+ h3 = (HtmlHeading3) elementIterator.next();
+ assertNotNull( h3 );
+ assertEquals( "Ordered lists", h3.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -262,9 +262,9 @@ public class NestedItemsVerifier
section = (HtmlSection) elementIterator.next();
assertNotNull( section );
- h4 = (HtmlHeading4) elementIterator.next();
- assertNotNull( h4 );
- assertEquals( "Definition lists", h4.asNormalizedText().trim() );
+ h3 = (HtmlHeading3) elementIterator.next();
+ assertNotNull( h3 );
+ assertEquals( "Definition lists", h3.asNormalizedText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
diff --git a/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml b/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml
index 48460b7..f524fe7 100644
--- a/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml
+++ b/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml
@@ -50,17 +50,17 @@
<section name="section name with entities: '&' 'Α' ' ' '&tritPos;'">
- <h4>Entities</h4>
- <h3>Generic Entities: '&' '<' '>' '"' '''</h3>
+ <h3>Entities</h3>
+ <h2>Generic Entities: '&' '<' '>' '"' '''</h2>
<p>'&' '<' '>' '"' '''</p>
- <h3>Local Entities: 'Α' 'Β' 'Γ' '&tritPos;'</h3>
+ <h2>Local Entities: 'Α' 'Β' 'Γ' '&tritPos;'</h2>
<p>'Α' 'Β' 'Γ' '&tritPos;𝟭' '&flo;ř' '&myCustomEntity;'</p>
- <h3>DTD Entities: ' ' '¡' '¢'</h3>
+ <h2>DTD Entities: ' ' '¡' '¢'</h2>
<p>' ' '¡' '¢'</p>
- <h4>CDATA</h4>
+ <h3>CDATA</h3>
<source><![CDATA[<project xmlns:ant="jelly:ant">]]></source>
<p><![CDATA[' ' '¡']]></p>
diff --git a/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml b/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
index 5ffa9b8..a24d413 100644
--- a/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
+++ b/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
@@ -27,7 +27,7 @@ under the License.
<body>
<section name="List Section">
- <h4>Unordered lists</h4>
+ <h3>Unordered lists</h3>
<p>
Below is an unordered list, followed by six paragraphs.
</p>
@@ -92,7 +92,7 @@ under the License.
Paragraph 6 below list.
</p>
- <h4>Ordered lists</h4>
+ <h3>Ordered lists</h3>
<p>
Below is an ordered list, followed by six paragraphs.
</p>
@@ -157,7 +157,7 @@ under the License.
Paragraph 6 below list.
</p>
- <h4>Definition lists</h4>
+ <h3>Definition lists</h3>
<p>
Below is a definition list, followed by six paragraphs.
</p>
diff --git a/pom.xml b/pom.xml
index ad9ca19..126c57b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <doxiaVersion>2.0.0-M2</doxiaVersion>
+ <doxiaVersion>2.0.0-M3</doxiaVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<mavenVersion>3.2.5</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>