[javassist] 02/04: Merge tag 'upstream/3.21.0'

[Emmanuel Bourg]

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

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

commit 95d3bea6991668b806babba13fdbbc06b20ca94c
Merge: 6e0a52b f9a8bd6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 16 17:23:15 2016 +0100

    Merge tag 'upstream/3.21.0'
    
    Upstream version 3.21.0

 Readme.html                                        |  12 +-
 build.xml                                          |  10 +-
 pom.xml                                            |   8 +-
 src/main/META-INF/MANIFEST.MF                      |   2 +-
 src/main/javassist/CtBehavior.java                 |  10 +-
 src/main/javassist/CtClass.java                    |  25 +-
 src/main/javassist/CtClassType.java                |  86 ++++--
 src/main/javassist/CtField.java                    |  21 +-
 src/main/javassist/CtMember.java                   |  25 +-
 .../javassist/bytecode/AnnotationsAttribute.java   |  26 ++
 src/main/javassist/bytecode/AttributeInfo.java     |  15 +-
 src/main/javassist/bytecode/Bytecode.java          |  40 ++-
 src/main/javassist/bytecode/ClassFile.java         |  30 +-
 src/main/javassist/bytecode/ConstPool.java         |   3 +
 src/main/javassist/bytecode/FieldInfo.java         |  16 +
 .../javassist/bytecode/InnerClassesAttribute.java  |  34 +++
 src/main/javassist/bytecode/MethodInfo.java        |  16 +
 .../javassist/bytecode/analysis/ControlFlow.java   |   9 +-
 .../javassist/bytecode/annotation/Annotation.java  |   2 +-
 .../bytecode/annotation/ArrayMemberValue.java      |   2 +-
 src/main/javassist/bytecode/stackmap/TypeData.java | 328 +++++++++++++++------
 src/main/javassist/bytecode/stackmap/TypeTag.java  |  10 +-
 src/main/javassist/compiler/CodeGen.java           |   3 +-
 src/main/javassist/compiler/Javac.java             |  12 +-
 src/main/javassist/compiler/JvstCodeGen.java       |   7 +-
 src/main/javassist/compiler/MemberCodeGen.java     |   2 +-
 src/main/javassist/compiler/MemberResolver.java    |   6 +-
 src/main/javassist/compiler/TypeChecker.java       |   2 +-
 src/main/javassist/expr/MethodCall.java            |   2 +-
 src/main/javassist/tools/Callback.java             |  10 +-
 src/main/javassist/util/proxy/ProxyFactory.java    |  54 +++-
 src/test/Test.java                                 |  53 +++-
 src/test/javassist/JvstTest.java                   |   2 +-
 src/test/javassist/JvstTest2.java                  |   8 +-
 src/test/javassist/JvstTest3.java                  |   3 +-
 src/test/javassist/JvstTest4.java                  |   4 +
 src/test/javassist/JvstTest5.java                  | 193 ++++++++++++
 .../javassist/proxyfactory/ProxyFactoryTest.java   |  39 ++-
 .../proxy/ProxyFactoryCompatibilityTest.java       |   6 +-
 src/test/test/javassist/proxy/ProxySimpleTest.java | 100 +++++++
 src/test/test5/BoolTest.java                       |  15 +
 src/test/test5/Entity.java                         |   9 +
 src/test/test5/InnerClassRemove.java               |   8 +
 src/test/test5/InvalidCastDollar.java              |  11 +
 src/test/test5/JIRA248.java                        |  22 ++
 src/test/test5/JIRA250Super.java                   |  17 ++
 src/test/test5/JIRA250Super2.java                  |   5 +
 src/test/test5/JavassistInvalidCastTest.java       |   6 +
 src/test/test5/ProceedDefault.java                 |  13 +
 src/test/test5/RemoveAnnotation.java               |  20 ++
 src/test/test5/StackmapWithArray83.java            |  38 +++
 .../testproxy/ProxyFactoryPerformanceTest.java     |   2 +-
 src/test/testproxy/ProxyTester.java                |  50 ++--
 tutorial/tutorial2.html                            |   3 +-
 54 files changed, 1217 insertions(+), 238 deletions(-)

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