[stapler] 01/02: Merge tag 'upstream/1.228'

[Emmanuel Bourg]

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

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

commit 80633198299a22d27c6e540ab94966ed3e5db8c8
Merge: 4532c74 2eb113a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 14 09:14:09 2014 +0200

    Merge tag 'upstream/1.228'
    
    Upstream version 1.228

 LICENSE.txt                                        | 22 +++++++++
 core/pom.xml                                       |  6 +--
 .../java/org/kohsuke/stapler/ClassDescriptor.java  | 19 ++++----
 .../java/org/kohsuke/stapler/HttpResponses.java    |  2 +-
 .../org/kohsuke/stapler/TruncatedInputStream.java  |  7 ++-
 .../java/org/kohsuke/stapler/export/Model.java     |  9 ++--
 .../org/kohsuke/stapler/export/ModelBuilder.java   | 10 +++-
 .../kohsuke/stapler/export/NamedPathPruner.java    | 46 +++++++++++++++++-
 .../stapler/export/NotExportableException.java     |  4 ++
 .../java/org/kohsuke/stapler/export/Property.java  | 21 ++++++---
 .../java/org/kohsuke/stapler/export/Range.java     | 55 ++++++++++++++++++++++
 .../org/kohsuke/stapler/export/TreePruner.java     |  4 ++
 .../kohsuke/stapler/framework/io/IOException2.java |  6 +--
 .../kohsuke/stapler/interceptor/RequirePOST.java   |  2 +-
 .../stapler/export/NamedPathPrunerTest.java        | 18 +++++++
 .../java/org/kohsuke/stapler/export/RangeTest.java | 45 ++++++++++++++++++
 groovy/pom.xml                                     |  2 +-
 .../stapler/jelly/groovy/GroovierJellyScript.java  |  7 ++-
 .../stapler/jelly/groovy/GroovyTagFileLoader.java  |  2 +-
 .../kohsuke/stapler/jelly/groovy/JellyBuilder.java |  4 +-
 jelly/pom.xml                                      |  6 +--
 .../kohsuke/stapler/framework/adjunct/Adjunct.java |  5 +-
 .../kohsuke/stapler/jelly/JellyClassTearOff.java   |  2 +-
 .../org/kohsuke/stapler/jelly/JellyViewScript.java | 19 +++++++-
 jrebel/pom.xml                                     |  2 +-
 jruby/pom.xml                                      |  2 +-
 jsp/pom.xml                                        |  2 +-
 pom.xml                                            |  4 +-
 src/site/resources/.java.net.updater               |  1 -
 src/site/resources/role-approval.policy            | 28 -----------
 30 files changed, 282 insertions(+), 80 deletions(-)

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