[plexus-velocity] 23/25: Merge tag 'upstream/1.2'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-velocity.

commit bc0f21124142118fd2f8d22092d8d76a6089f4f5
Merge: 9390baa 7d30d46
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 30 23:11:54 2016 +0100

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2

 .gitignore                                         |   7 +
 pom.xml                                            |  85 ++++++++++
 .../velocity/ContextClassLoaderResourceLoader.java |  80 ++++++++++
 .../plexus/velocity/DefaultVelocityComponent.java  | 177 +++++++++++++++++++++
 .../plexus/velocity/SiteResourceLoader.java        |  91 +++++++++++
 .../plexus/velocity/VelocityComponent.java         |  30 ++++
 src/main/resources/META-INF/plexus/components.xml  |  52 ++++++
 src/site/site.xml                                  |  17 ++
 src/site/xdoc/index.xml                            |  53 ++++++
 .../velocity/DefaultVelocityComponentTest.java     |  59 +++++++
 src/test/log4j.properties                          |  10 ++
 .../velocity/DefaultVelocityComponentTest.vm       |   1 +
 .../velocity/DefaultVelocityComponentTest.xml      |  25 +++
 13 files changed, 687 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-velocity.git