You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by sb...@apache.org on 2019/03/14 05:49:36 UTC

svn commit: r1855487 - in /aries/branches/java6support/proxy/proxy-impl: pom.xml src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java

Author: sbratton
Date: Thu Mar 14 05:49:36 2019
New Revision: 1855487

URL: http://svn.apache.org/viewvc?rev=1855487&view=rev
Log:
add v12 Opcode

Modified:
    aries/branches/java6support/proxy/proxy-impl/pom.xml
    aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java

Modified: aries/branches/java6support/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/pom.xml?rev=1855487&r1=1855486&r2=1855487&view=diff
==============================================================================
--- aries/branches/java6support/proxy/proxy-impl/pom.xml (original)
+++ aries/branches/java6support/proxy/proxy-impl/pom.xml Thu Mar 14 05:49:36 2019
@@ -76,13 +76,13 @@
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
             <optional>true</optional>
-            <version>7.0-beta</version>
+            <version>7.0</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
             <optional>true</optional>
-            <version>7.0-beta</version>
+            <version>7.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java?rev=1855487&r1=1855486&r2=1855487&view=diff
==============================================================================
--- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java (original)
+++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java Thu Mar 14 05:49:36 2019
@@ -39,6 +39,10 @@ public class ProxyUtils
     	//In order to avoid an inconsistent stack error the version of the woven byte code needs to match
     	//the level of byte codes in the original class
     	switch(JAVA_CLASS_VERSION) {
+			case Opcodes.V12:
+				LOGGER.debug("Weaving to Java 12");
+				weavingJavaVersion = Opcodes.V12;
+				break;
 			case Opcodes.V11:
 				LOGGER.debug("Weaving to Java 11");
 				weavingJavaVersion = Opcodes.V11;