You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/09/01 20:47:15 UTC
[maven-doxia] branch DOXIA-572 updated (9386568 -> 40f47b0)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch DOXIA-572
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
discard 9386568 [DOXIA-572] - Upgrade parent to 31 o Fixed issues based on the upgrade.
add f8ec19d fixed site svnpubsub root
add 58ca203 use master branch instead of HEAD
add 5d193c7 [MNGSITE-328] use sha1 checksum instead of md5
add e8e3a15 [INFRA-16467] move components documentation out of CMS space
add b78b6c1 [INFRA-16467] move components documentation out of CMS space
add c99e7a4 [INFRA-16467] move components documentation out of CMS space
add d65da7e [DOXIA-497] Fix rendering links and paragraphs inside tables
add 26c6d1f [DOXIA-497] fixed codestyle
new 40f47b0 [DOXIA-572] - Upgrade parent to 32 o Fixed issues based on the upgrade.
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 (9386568)
\
N -- N -- N refs/heads/DOXIA-572 (40f47b0)
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:
.../org/apache/maven/doxia/module/apt/AptSink.java | 30 ++++++++++--
.../apache/maven/doxia/module/apt/AptSinkTest.java | 54 ++++++++++++++++++++++
pom.xml | 8 ++--
src/site/xdoc/download.xml.vm | 2 +-
4 files changed, 86 insertions(+), 8 deletions(-)
[maven-doxia] 01/01: [DOXIA-572] - Upgrade parent to 32 o Fixed
issues based on the upgrade.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch DOXIA-572
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 40f47b0c432e988a0fa8311bba8d8686d46f4855
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 7 18:16:11 2018 +0200
[DOXIA-572] - Upgrade parent to 32
o Fixed issues based on the upgrade.
---
.../apache/maven/doxia/module/apt/AptParser.java | 44 +++++++++++-----------
pom.xml | 2 +-
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
index b918a5f..b69e4e1 100644
--- a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
+++ b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
@@ -1677,7 +1677,7 @@ public class AptParser
* @param indent indent.
* @throws AptParseException AptParseException
*/
- public Block( int type, int indent )
+ Block( int type, int indent )
throws AptParseException
{
this( type, indent, null );
@@ -1691,7 +1691,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Block( int type, int indent, String firstLine )
+ Block( int type, int indent, String firstLine )
throws AptParseException
{
this.type = type;
@@ -1864,7 +1864,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public ListBreak( int indent, String firstLine )
+ ListBreak( int indent, String firstLine )
throws AptParseException
{
super( AptParser.LIST_BREAK, indent, firstLine );
@@ -1889,7 +1889,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Title( int indent, String firstLine )
+ Title( int indent, String firstLine )
throws AptParseException
{
super( TITLE, indent, firstLine );
@@ -2019,7 +2019,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Section( int type, int indent, String firstLine )
+ Section( int type, int indent, String firstLine )
throws AptParseException
{
super( type, indent, firstLine );
@@ -2052,7 +2052,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Section1( int indent, String firstLine )
+ Section1( int indent, String firstLine )
throws AptParseException
{
super( SECTION1, indent, firstLine );
@@ -2082,7 +2082,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Section2( int indent, String firstLine )
+ Section2( int indent, String firstLine )
throws AptParseException
{
super( SECTION2, indent, firstLine );
@@ -2102,7 +2102,7 @@ public class AptParser
}
/** A Section3 Block. */
- private class Section3
+ public class Section3
extends Section
{
/**
@@ -2112,7 +2112,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Section3( int indent, String firstLine )
+ Section3( int indent, String firstLine )
throws AptParseException
{
super( SECTION3, indent, firstLine );
@@ -2142,7 +2142,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Section4( int indent, String firstLine )
+ Section4( int indent, String firstLine )
throws AptParseException
{
super( SECTION4, indent, firstLine );
@@ -2172,7 +2172,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Section5( int indent, String firstLine )
+ Section5( int indent, String firstLine )
throws AptParseException
{
super( SECTION5, indent, firstLine );
@@ -2202,7 +2202,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Paragraph( int indent, String firstLine )
+ Paragraph( int indent, String firstLine )
throws AptParseException
{
super( PARAGRAPH, indent, firstLine );
@@ -2228,7 +2228,7 @@ public class AptParser
* @param line the comment line.
* @throws AptParseException AptParseException
*/
- public Comment( String line )
+ Comment( String line )
throws AptParseException
{
super( COMMENT_BLOCK, 0, line );
@@ -2259,7 +2259,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Verbatim( int indent, String firstLine )
+ Verbatim( int indent, String firstLine )
throws AptParseException
{
super( VERBATIM, indent, null );
@@ -2347,7 +2347,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Figure( int indent, String firstLine )
+ Figure( int indent, String firstLine )
throws AptParseException
{
super( FIGURE, indent, firstLine );
@@ -2385,7 +2385,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public Table( int indent, String firstLine )
+ Table( int indent, String firstLine )
throws AptParseException
{
super( TABLE, indent, firstLine );
@@ -2693,7 +2693,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public ListItem( int indent, String firstLine )
+ ListItem( int indent, String firstLine )
throws AptParseException
{
super( LIST_ITEM, indent, firstLine );
@@ -2722,7 +2722,7 @@ public class AptParser
* @param number numbering.
* @throws AptParseException AptParseException
*/
- public NumberedListItem( int indent, String firstLine, int number )
+ NumberedListItem( int indent, String firstLine, int number )
throws AptParseException
{
super( NUMBERED_LIST_ITEM, indent, firstLine );
@@ -2788,7 +2788,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public DefinitionListItem( int indent, String firstLine )
+ DefinitionListItem( int indent, String firstLine )
throws AptParseException
{
super( DEFINITION_LIST_ITEM, indent, firstLine );
@@ -2828,7 +2828,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public HorizontalRule( int indent, String firstLine )
+ HorizontalRule( int indent, String firstLine )
throws AptParseException
{
super( HORIZONTAL_RULE, indent, firstLine );
@@ -2853,7 +2853,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public PageBreak( int indent, String firstLine )
+ PageBreak( int indent, String firstLine )
throws AptParseException
{
super( PG_BREAK, indent, firstLine );
@@ -2878,7 +2878,7 @@ public class AptParser
* @param firstLine the first line.
* @throws AptParseException AptParseException
*/
- public MacroBlock( int indent, String firstLine )
+ MacroBlock( int indent, String firstLine )
throws AptParseException
{
super( MACRO, indent );
diff --git a/pom.xml b/pom.xml
index b70ed1d..8bd3aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>30</version>
+ <version>32</version>
<relativePath>../../pom/maven/pom.xml</relativePath>
</parent>