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

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


    omit 3c16518  Complete conversion
     add ed49cf9  Bump junitVersion from 5.9.3 to 5.10.0
     add 77b92f9  Bump mockito-core from 2.28.2 to 4.6.0
     add 39208c9  Complete conversion
     add 2abbb65  Convert from the old to new site model on the fly
     add b782ae1  Split modello config per model
     add 9e9d490  Re-enable test
     add 4e2f237  Add conversion test
     add bf7aa17  Adjust message
     add f8fbc14  Indent

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   (3c16518)
            \
             N -- N -- N   refs/heads/site-model-rework (f8fbc14)

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.

No new revisions were added by this update.

Summary of changes:
 .../apache/maven/doxia/tools/DefaultSiteTool.java  | 209 ++++++++++++-
 .../org/apache/maven/doxia/tools/SiteToolTest.java |  36 ++-
 .../pom.xml                                        |   2 +-
 .../src/site/new-site.xml                          |  80 +++++
 .../src/site/site.xml                              |  78 +++++
 doxia-site-model/pom.xml                           |  66 ++++-
 .../src/main/mdo/{site.mdo => decoration.mdo}      | 323 +++++++++++++--------
 doxia-site-model/src/main/mdo/site.mdo             |   2 +-
 doxia-site-renderer/pom.xml                        |   2 +-
 .../siterenderer/DefaultSiteRendererTest.java      |   5 +-
 pom.xml                                            |   2 +-
 11 files changed, 655 insertions(+), 150 deletions(-)
 copy 
doxia-integration-tools/src/test/resources/unit/{site-tool-locales-test/language_country
 => old-to-new-site-model-conversion-test}/pom.xml (95%)
 create mode 100644 
doxia-integration-tools/src/test/resources/unit/old-to-new-site-model-conversion-test/src/site/new-site.xml
 create mode 100644 
doxia-integration-tools/src/test/resources/unit/old-to-new-site-model-conversion-test/src/site/site.xml
 copy doxia-site-model/src/main/mdo/{site.mdo => decoration.mdo} (72%)

Reply via email to