[maven-doxia-sitetools] branch DOXIASITETOOLS-191 updated (83afb02 -> bc1b142)

[kh...@apache.org]

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

khmarbaise pushed a change to branch DOXIASITETOOLS-191
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.


 discard 83afb02  [DOXIASITETOOLS-191] - Upgrade maven-parent 32
     new bc1b142  [DOXIASITETOOLS-191] - Upgrade maven-parent 32  o Fixed checkstyle errors based on 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   (83afb02)
            \
             N -- N -- N   refs/heads/DOXIASITETOOLS-191 (bc1b142)

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:
 .../inheritance/DefaultDecorationModelInheritanceAssembler.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-191] - Upgrade maven-parent 32 o Fixed checkstyle errors based on upgrade.

[kh...@apache.org]

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

khmarbaise pushed a commit to branch DOXIASITETOOLS-191
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit bc1b142a0d4ac7bba48b9a0e27577ccf5bcfd773
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Sep 1 22:27:58 2018 +0200

    [DOXIASITETOOLS-191] - Upgrade maven-parent 32
     o Fixed checkstyle errors based on upgrade.
---
 .../inheritance/DefaultDecorationModelInheritanceAssembler.java         | 2 +-
 pom.xml                                                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
index fd511ae..fb4195b 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
+++ b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
@@ -418,7 +418,7 @@ public class DefaultDecorationModelInheritanceAssembler
          * @param oldPath the old path.
          * @param newPath the new path.
          */
-        public URLRebaser( final String oldPath, final String newPath )
+        URLRebaser( final String oldPath, final String newPath )
         {
             this.oldPath = oldPath;
             this.newPath = newPath;
diff --git a/pom.xml b/pom.xml
index 74c61f6..242d79e 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>