This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 9fea2ca74d233c0fdfaee26529bff692ed355a97 Author: Matt Benson <mben...@apache.org> AuthorDate: Fri Apr 20 11:20:03 2018 -0500 upgrade xbean-finder --- ant/pom.xml | 4 ++++ modules/privilizer/weaver/pom.xml | 1 - parent/pom.xml | 2 +- processor/pom.xml | 11 +++++++++-- .../src/main/java/org/apache/commons/weaver/Finder.java | 16 ++++++++-------- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index fcfbb7f..4ad1b24 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -65,8 +65,12 @@ under the License. <configuration> <parameter> <excludes> + <!-- API changes with xbean-finder-shaded --> + <exclude>org.apache.commons.weaver.Finder$Visitor</exclude> + <!-- shaded in; not part of public API --> <exclude>org.apache.commons.weaver.ant._collections4</exclude> + <exclude>org.apache.commons.weaver.ant._xbean</exclude> </excludes> </parameter> </configuration> diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 9f561f7..33b6cd1 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -36,7 +36,6 @@ under the License. <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/privilizer/weaver</developerConnection> <url>http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/weaver</url> </scm> - <dependencies> <dependency> <groupId>org.apache.commons</groupId> diff --git a/parent/pom.xml b/parent/pom.xml index d14d446..235b718 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -152,7 +152,7 @@ under the License. <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder-shaded</artifactId> - <version>4.5</version> + <version>4.8</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/processor/pom.xml b/processor/pom.xml index 275b544..0772486 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -68,8 +68,15 @@ under the License. <artifactId>japicmp-maven-plugin</artifactId> <configuration> <parameter> - <!-- obsolete dependency --> - <ignoreMissingClassesByRegularExpressions>org\.apache\.commons\.collections4\..+</ignoreMissingClassesByRegularExpressions> + <excludes> + <!-- API changes with xbean-finder-shaded --> + <exclude>org.apache.commons.weaver.Finder$Visitor</exclude> + </excludes> + <ignoreMissingClassesByRegularExpressions> + <!-- obsolete dependencies --> + <ignoreMissingClassesByRegularExpression>org\.apache\.commons\.collections4\..+</ignoreMissingClassesByRegularExpression> + <ignoreMissingClassesByRegularExpression>org\.apache\.xbean\.asm5\..+</ignoreMissingClassesByRegularExpression> + </ignoreMissingClassesByRegularExpressions> </parameter> </configuration> </plugin> diff --git a/processor/src/main/java/org/apache/commons/weaver/Finder.java b/processor/src/main/java/org/apache/commons/weaver/Finder.java index 9eb5b60..b08bc1b 100644 --- a/processor/src/main/java/org/apache/commons/weaver/Finder.java +++ b/processor/src/main/java/org/apache/commons/weaver/Finder.java @@ -48,13 +48,13 @@ import org.apache.commons.weaver.model.ScanResult; import org.apache.commons.weaver.model.Scanner; import org.apache.commons.weaver.model.WeaveInterest; import org.apache.commons.weaver.utils.Annotations; -import org.apache.xbean.asm5.AnnotationVisitor; -import org.apache.xbean.asm5.ClassReader; -import org.apache.xbean.asm5.ClassVisitor; -import org.apache.xbean.asm5.FieldVisitor; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +import org.apache.xbean.asm6.AnnotationVisitor; +import org.apache.xbean.asm6.ClassReader; +import org.apache.xbean.asm6.ClassVisitor; +import org.apache.xbean.asm6.FieldVisitor; +import org.apache.xbean.asm6.MethodVisitor; +import org.apache.xbean.asm6.Opcodes; +import org.apache.xbean.asm6.Type; import org.apache.xbean.finder.Annotated; import org.apache.xbean.finder.AnnotationFinder; import org.apache.xbean.finder.Parameter; @@ -494,7 +494,7 @@ class Finder extends AnnotationFinder implements Scanner { } } - private static final int ASM_VERSION = Opcodes.ASM5; + private static final int ASM_VERSION = Opcodes.ASM6; private static final int ASM_FLAGS = ClassReader.SKIP_CODE + ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES; private static final String INIT = "<init>"; -- To stop receiving notification emails like this one, please contact mben...@apache.org.