[openjpa] branch master updated: OPENJPA-2757 upgrade to xbean-asm7 for Java7 support

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[openjpa] branch master updated: OPENJPA-2757 upgrade to xbean-asm7 for Java7 support

struberg
This is an automated email from the ASF dual-hosted git repository.

struberg 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 39bde81  OPENJPA-2757 upgrade to xbean-asm7 for Java7 support
39bde81 is described below

commit 39bde81aa2fe6f5ac8348bf4a6a39669b67dbe7d
Author: Mark Struberg <[hidden email]>
AuthorDate: Sat Nov 10 21:33:02 2018 +0100

    OPENJPA-2757 upgrade to xbean-asm7 for Java7 support
---
 openjpa-features/src/main/feature/feature.xml                  |  2 +-
 openjpa-kernel/pom.xml                                         |  4 ++--
 .../src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java   | 10 +++++-----
 openjpa-project/assembly.xml                                   |  2 +-
 openjpa-project/bin-assembly.xml                               |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml
index c49ac3a..dc7e497 100644
--- a/openjpa-features/src/main/feature/feature.xml
+++ b/openjpa-features/src/main/feature/feature.xml
@@ -28,7 +28,7 @@
         <bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/2.5.0</bundle>
         <bundle dependency="true">mvn:commons-collections/commons-collections4/4.3</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm6-shaded/4.9</bundle>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm7-shaded/4.12</bundle>
         <bundle>mvn:org.apache.openjpa/openjpa/${project.version}</bundle>
         <capability>
             osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 49a4916..857c88a 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -74,8 +74,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm6-shaded</artifactId>
-            <version>4.10</version>
+            <artifactId>xbean-asm7-shaded</artifactId>
+            <version>4.12</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 ff2b3b9..d3cfe03 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.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassVisitor;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.Opcodes;
 
 import serp.bytecode.BCClass;
 
@@ -117,7 +117,7 @@ public final class AsmAdaptor {
         final ClassReader cr = new ClassReader(b);
         try
         {
-            cr.accept(new ClassVisitor(Opcodes.ASM6)
+            cr.accept(new ClassVisitor(Opcodes.ASM7)
             {
                 @Override
                 public void visit(final int i, final int i1,
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index 75b17b6..32f3c68 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -143,7 +143,7 @@
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
-                <include>org.apache.xbean:xbean-asm6-shaded</include>
+                <include>org.apache.xbean:xbean-asm7-shaded</include>
             </includes>
         </dependencySet>
     </dependencySets>
diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
index c0e6c4a..927bc5a 100644
--- a/openjpa-project/bin-assembly.xml
+++ b/openjpa-project/bin-assembly.xml
@@ -82,7 +82,7 @@
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
-                <include>org.apache.xbean:xbean-asm6-shaded</include>
+                <include>org.apache.xbean:xbean-asm7-shaded</include>
             </includes>
         </dependencySet>
     </dependencySets>