This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
discard 107e8c1 mvn4 aggregator
add 1770550 [DOXIASITETOOLS-156] Fail if deprecated ${reports},
${parentProject} or ${modules} is found
add f0ce5f2 [DOXIASITETOOLS-242] Remove all deprecated code
add d2b8843 [maven-release-plugin] prepare release
doxia-sitetools-2.0.0-M1
add 9ea8a57 [maven-release-plugin] prepare for next development iteration
add ddaa2fc [DOXIASITETOOLS-244] Clean up exceptions and log messages
add 9ca083f [DOXIASITETOOLS-245] Upgrade to Java 8
add f318d09 [DOXIASITETOOLS-243] Drop Maven 2 bits, upgrade to Maven 3.2.5
add c5878f7 Document bug in Plexus Utils 3.4.0
add 2b4347d Don't use FileReader if the encoding is unknown
add 65d6f46 Remove unused Commons Collections
add 66a224e [DOXIASITETOOLS-248] Upgrade Maven Reporting API to 3.1.0
add 96dd2f7 [DOXIASITETOOLS-249] Upgrade Commons Lang to 3.12.0
add 3748d2e [DOXIASITETOOLS-250] Upgrade Commons IO to 2.11.0
add 4bf8fdb [DOXIASITETOOLS-247] Replace Plexus Annotations with Java
Inject along with JUnit 5
add c3e4eef Ignore .factorypath from Eclipse
add 661d21c [maven-release-plugin] prepare release
doxia-sitetools-2.0.0-M2
add 9f4f081 [maven-release-plugin] prepare for next development iteration
add 9839255 [DOXIASITETOOLS-251] Plexus to Sisu migration misses
Singleton annotation
add 74febe0 Drop Plexus plugin in favor of Sisu plugin
new d098354 mvn4 aggregator
new be8e0db Upgrade to doxia 2.0.0-M2-SNAPSHOT, JUnit 5, Maven 3.1.1
new 1171259 Switch a few core plugins to the new api
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 (107e8c1)
\
N -- N -- N refs/heads/mvn4 (1171259)
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 3 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:
.gitignore | 1 +
doxia-decoration-model/pom.xml | 19 +-
.../DecorationModelInheritanceAssembler.java | 3 -
...DefaultDecorationModelInheritanceAssembler.java | 7 +-
.../decoration/inheritance/PathDescriptor.java | 255 ----
.../site/decoration/inheritance/PathUtils.java | 145 --
.../doxia/site/decoration/DecorationUtilsTest.java | 10 +-
.../DecorationModelInheritanceAssemblerTest.java | 273 ++--
.../site/decoration/inheritance/Doxia91Test.java | 72 -
.../decoration/inheritance/PathDescriptorTest.java | 655 ---------
.../site/decoration/inheritance/PathUtilsTest.java | 80 -
.../inheritance/URIPathDescriptorTest.java | 34 +-
doxia-integration-tools/pom.xml | 114 +-
.../apache/maven/doxia/tools/DefaultSiteTool.java | 307 +---
.../apache/maven/doxia/tools/ReportComparator.java | 7 +-
.../org/apache/maven/doxia/tools/SiteTool.java | 3 -
doxia-integration-tools/src/site/apt/index.apt | 25 +-
.../maven/doxia/tools/DefaultSiteToolTest.java | 10 +-
.../org/apache/maven/doxia/tools/SiteToolTest.java | 82 +-
.../maven/doxia/tools/stubs/MavenProjectStub.java | 1541 ++++++++++++++++++++
.../tools/stubs/SiteToolMavenProjectStub.java | 5 +-
.../unit/interpolated-site/src/site/site.xml | 2 +-
.../unit/site-tool-test/src/site/site.xml | 2 +-
doxia-site-renderer/pom.xml | 49 +-
.../doxia/siterenderer/DefaultSiteRenderer.java | 108 +-
.../apache/maven/doxia/siterenderer/Renderer.java | 64 -
.../maven/doxia/siterenderer/RenderingContext.java | 12 -
.../doxia/siterenderer/SkinResourceLoader.java | 125 --
.../doxia/siterenderer/sink/SiteRendererSink.java | 12 +-
.../siterenderer/resources/default-site-macros.vm | 28 +-
.../doxia/siterenderer/resources/default-site.vm | 2 +
doxia-site-renderer/src/site/apt/index.apt.vm | 14 -
.../maven/doxia/siterenderer/AbstractVerifier.java | 7 +-
.../maven/doxia/siterenderer/AptVerifier.java | 2 +
.../doxia/siterenderer/AttributesVerifier.java | 5 +
.../maven/doxia/siterenderer/CommentsVerifier.java | 6 +-
.../siterenderer/DefaultSiteRendererTest.java | 112 +-
.../maven/doxia/siterenderer/EntitiesVerifier.java | 5 +
.../maven/doxia/siterenderer/FaqVerifier.java | 4 +
.../maven/doxia/siterenderer/HeadVerifier.java | 7 +-
.../doxia/siterenderer/JavascriptVerifier.java | 5 +
.../maven/doxia/siterenderer/MiscVerifier.java | 3 +
.../doxia/siterenderer/MultipleBlockVerifier.java | 4 +
.../doxia/siterenderer/NestedItemsVerifier.java | 4 +
.../doxia/siterenderer/RenderingContextTest.java | 10 +-
.../doxia/siterenderer/SkinResourceLoaderTest.java | 63 -
.../siterenderer/velocity-toolmanager.expected.txt | 74 +-
.../doxia/siterenderer/velocity-toolmanager.vm | 2 +-
doxia-skin-model/pom.xml | 2 +-
pom.xml | 56 +-
50 files changed, 2185 insertions(+), 2252 deletions(-)
delete mode 100644
doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.java
delete mode 100644
doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java
delete mode 100644
doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java
delete mode 100644
doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java
delete mode 100644
doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtilsTest.java
create mode 100644
doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/MavenProjectStub.java
delete mode 100644
doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java
delete mode 100644
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/SkinResourceLoaderTest.java
