This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push: new 910a812 [OPENJPA-2833] asm 9 910a812 is described below commit 910a812a1550382d2bafd9a001a66c5e7425ccf5 Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Tue Sep 29 16:57:20 2020 +0200 [OPENJPA-2833] asm 9 --- .../junit5/internal/OpenJPADirectoriesEnhancer.java | 14 +++++++------- openjpa-kernel/pom.xml | 2 +- .../main/java/org/apache/openjpa/enhance/AsmAdaptor.java | 8 ++++---- pom.xml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java b/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java index dd8e169..c8be809 100644 --- a/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java +++ b/openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java @@ -27,10 +27,10 @@ import org.apache.openjpa.lib.log.LogFactoryImpl; import org.apache.openjpa.lib.log.SLF4JLogFactory; import org.apache.openjpa.meta.MetaDataRepository; import org.apache.openjpa.persistence.PersistenceMetaDataFactory; -import org.apache.xbean.asm8.AnnotationVisitor; -import org.apache.xbean.asm8.ClassReader; -import org.apache.xbean.asm8.Type; -import org.apache.xbean.asm8.shade.commons.EmptyVisitor; +import org.apache.xbean.asm9.AnnotationVisitor; +import org.apache.xbean.asm9.ClassReader; +import org.apache.xbean.asm9.Type; +import org.apache.xbean.asm9.shade.commons.EmptyVisitor; import org.apache.xbean.finder.ClassLoaders; import serp.bytecode.BCClass; import serp.bytecode.Project; @@ -58,9 +58,9 @@ import java.util.logging.Logger; import java.util.stream.Stream; import static java.util.Arrays.asList; -import static org.apache.xbean.asm8.ClassReader.SKIP_CODE; -import static org.apache.xbean.asm8.ClassReader.SKIP_DEBUG; -import static org.apache.xbean.asm8.ClassReader.SKIP_FRAMES; +import static org.apache.xbean.asm9.ClassReader.SKIP_CODE; +import static org.apache.xbean.asm9.ClassReader.SKIP_DEBUG; +import static org.apache.xbean.asm9.ClassReader.SKIP_FRAMES; public class OpenJPADirectoriesEnhancer implements Runnable { private static final Logger LOGGER = Logger.getLogger(OpenJPADirectoriesEnhancer.class.getName()); diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 89450bd..d0d2793 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -77,7 +77,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm8-shaded</artifactId> + <artifactId>xbean-asm9-shaded</artifactId> <version>${xbean.version}</version> </dependency> </dependencies> diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java index 4c8b3a4..24f7c61 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java @@ -30,10 +30,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLDecoder; -import org.apache.xbean.asm8.ClassReader; -import org.apache.xbean.asm8.ClassVisitor; -import org.apache.xbean.asm8.ClassWriter; -import org.apache.xbean.asm8.Opcodes; +import org.apache.xbean.asm9.ClassReader; +import org.apache.xbean.asm9.ClassVisitor; +import org.apache.xbean.asm9.ClassWriter; +import org.apache.xbean.asm9.Opcodes; import serp.bytecode.BCClass; diff --git a/pom.xml b/pom.xml index 6bc4c9f..cf6c223 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ <javadoc.additionalparam /> <maven.surefire.version>3.0.0-M4</maven.surefire.version> - <xbean.version>4.17</xbean.version> + <xbean.version>4.18</xbean.version> <bval.version>1.1.2</bval.version> <jmock.version>2.9.0</jmock.version> <automatic-module-name>-SUBMODULES-NEED-TO-OVERRIDE-THIS-</automatic-module-name>