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

snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.


    from fe697f4  Merge pull request #66 from mbien/spring_renovations
     new 037fe73  upgraded apache velocity from 1.7 to 2.2.
     new 237faae  ws-commons-util has a compile scope dependency to junit, 
which pulled an old junit jar into the project.
     new 53addde  Merge pull request #67 from mbien/velocity_renovations

The 4512 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:
 app/pom.xml                                        | 17 ++++++++++++++---
 .../roller/planet/tasks/GeneratePlanetTask.java    |  6 ++++--
 .../rendering/velocity/RollerResourceLoader.java   | 22 ++++++++++++++--------
 .../ui/rendering/velocity/ThemeResourceLoader.java | 15 ++++++++++-----
 .../rendering/velocity/WebappResourceLoader.java   | 17 ++++++++++++-----
 .../ui/struts2/editor/WeblogConfigBean.java        |  2 +-
 .../weblogger/business/PlanetManagerLocalTest.java |  2 +-
 .../roller/weblogger/business/WeblogPageTest.java  |  2 +-
 8 files changed, 57 insertions(+), 26 deletions(-)

Reply via email to