[aries] branch trunk updated: [ARIES-2062]aries.proxy:ensure to support JDK18

[jb...@apache.org]

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

jbonofre pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f8493eb  [ARIES-2062]aries.proxy:ensure to support JDK18
     new 6dc0e2c  Merge pull request #137 from ffang/ARIES-2062
f8493eb is described below

commit f8493eb436c47089f438c5ed1ffca5c3d1bbcbee
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Oct 19 15:18:15 2021 -0400

    [ARIES-2062]aries.proxy:ensure to support JDK18
---
 proxy/proxy-impl/pom.xml                                              | 4 ++--
 .../src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java         | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index 2ff7ca8..9c8c49e 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -77,13 +77,13 @@
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
             <optional>true</optional>
-            <version>9.1</version>
+            <version>9.2</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
             <optional>true</optional>
-            <version>9.1</version>
+            <version>9.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
index 4237011..ed97831 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
@@ -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.V18:
+          LOGGER.debug("Weaving to Java 18");
+          weavingJavaVersion = Opcodes.V18;
+          break;
         case Opcodes.V17:
           LOGGER.debug("Weaving to Java 17");
           weavingJavaVersion = Opcodes.V17;