[aspectj] 01/04: Merge tag 'upstream/1.8.5'

[Emmanuel Bourg]

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

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

commit 2ac936f273df00b83ef3601e1ab00cd31a364fb9
Merge: 6d74168 7583201
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 29 18:34:22 2015 +0200

    Merge tag 'upstream/1.8.5'
    
    Upstream version 1.8.5

 ajde.core/.classpath                               |   1 +
 build/src/$installer$/org/aspectj/Main.java        |   2 +-
 build/usedForMavenUpload/aspectjrt.pom             |   2 +-
 build/usedForMavenUpload/aspectjtools.pom          |   2 +-
 build/usedForMavenUpload/aspectjweaver.pom         |   2 +-
 build/usedForMavenUpload_release/aspectjrt.pom     |   2 +-
 build/usedForMavenUpload_release/aspectjtools.pom  |   2 +-
 build/usedForMavenUpload_release/aspectjweaver.pom |   2 +-
 docs/dist/doc/README-184.html                      |  46 ++++++++++++
 docs/dist/doc/README-185.html                      |  36 +++++++++
 docs/dist/doc/index.html                           |   4 +-
 lib/build/build.jar                                | Bin 155892 -> 155908 bytes
 .../src/org/aspectj/ajdt/ajc/messages.properties   |   2 +-
 .../compiler/lookup/InterTypeMethodBinding.java    |  23 ++++--
 .../compiler/problem/AjProblemReporter.java        |   2 +
 .../src/org/aspectj/weaver/MemberImpl.java         |   4 +-
 .../org/aspectj/weaver/patterns/PatternParser.java |   2 +
 .../weaver/patterns/TypeCategoryTypePattern.java   |   5 ++
 .../weaver/patterns/WildAnnotationTypePattern.java |  16 ++--
 org.eclipse.jdt.core/src/META-INF/MANIFEST.MF      |   2 +-
 .../compiler/apt/model/TypeElementImpl.java        |  83 ++++++++++++++++++++-
 .../compiler/ast/AbstractMethodDeclaration.java    |  28 ++++++-
 .../eclipse/jdt/internal/compiler/ast/Clinit.java  |  17 +++++
 .../compiler/ast/ConstructorDeclaration.java       |  17 +++++
 .../jdt/internal/compiler/ast/Reference.java       |   4 +-
 .../jdt/internal/compiler/ast/SwitchStatement.java |   4 +-
 .../src/org/aspectj/weaver/bcel/LazyClassGen.java  |   2 +-
 27 files changed, 279 insertions(+), 33 deletions(-)

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