[maven-doxia-sitetools] branch DOXIASITETOOLS-282 updated (b72e13d -> 907db81)

[mi...@apache.org]

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

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


    omit b72e13d  [DOXIASITETOOLS-282] Deprecate support for Maven 1.x style site directory layout
     add 18fd382  [DOXIASITETOOLS-284] Upgrade to Maven Fluido Skin 2.0.0-M2 in default site descriptor
     add ee8b511  [DOXIASITETOOLS-278] Remove menu items link in the sidebar to submodule that do not generate any site in the same build
     new 907db81  [DOXIASITETOOLS-282] Deprecate support for Maven 1.x style site directory layout

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   (b72e13d)
            \
             N -- N -- N   refs/heads/DOXIASITETOOLS-282 (907db81)

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:
 .../apache/maven/doxia/tools/DefaultSiteTool.java  | 86 ++++++++++++++++++----
 .../src/main/resources/default-site.xml            |  2 +-
 2 files changed, 73 insertions(+), 15 deletions(-)

[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-282] Deprecate support for Maven 1.x style site directory layout

[mi...@apache.org]

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

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

commit 907db8147fa684b8a01256547e5d65a1d1782345
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jan 29 13:30:53 2023 +0100

    [DOXIASITETOOLS-282] Deprecate support for Maven 1.x style site directory layout
    
    This closes #82
---
 .../org/apache/maven/doxia/siterenderer/ExtraDoxiaModuleReference.java | 1 +
 .../java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ExtraDoxiaModuleReference.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ExtraDoxiaModuleReference.java
index 42cab46..5327b33 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ExtraDoxiaModuleReference.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ExtraDoxiaModuleReference.java
@@ -26,6 +26,7 @@ import java.io.File;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
+@Deprecated
 class ExtraDoxiaModuleReference
 {
     private final String parserId;
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
index 1b4c57b..d3b22b6 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
@@ -68,6 +68,7 @@ public class SiteRenderingContext
 
     private Map<String, String> moduleExcludes;
 
+    @Deprecated
     private List<ExtraDoxiaModuleReference> modules = new ArrayList<ExtraDoxiaModuleReference>();
 
     private boolean validate;
@@ -298,6 +299,7 @@ public class SiteRenderingContext
      * @param moduleBasedir The base directory for module's source files.
      * @param moduleParserId module's Doxia parser id.
      */
+    @Deprecated
     public void addModuleDirectory( File moduleBasedir, String moduleParserId )
     {
         this.modules.add( new ExtraDoxiaModuleReference( moduleParserId, moduleBasedir ) );
@@ -318,6 +320,7 @@ public class SiteRenderingContext
      *
      * @return a {@link java.util.List} object.
      */
+    @Deprecated
     public List<ExtraDoxiaModuleReference> getModules()
     {
         return modules;