[aries] branch trunk updated: [ARIES-2044] Add support for JRE16/17

[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 186c327  [ARIES-2044] Add support for JRE16/17
     new a2be80e  Merge pull request #115 from rovarga/aries2044
186c327 is described below

commit 186c327ab73b2eb17f0d791e61c3f0f91add6195
Author: Robert Varga <ro...@pantheon.tech>
AuthorDate: Sat Apr 3 21:36:26 2021 +0200

    [ARIES-2044] Add support for JRE16/17
---
 .../src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

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 355629f..4237011 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,14 @@ 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.V17:
+          LOGGER.debug("Weaving to Java 17");
+          weavingJavaVersion = Opcodes.V17;
+          break;
+        case Opcodes.V16:
+          LOGGER.debug("Weaving to Java 16");
+          weavingJavaVersion = Opcodes.V16;
+          break;
         case Opcodes.V15:
           LOGGER.debug("Weaving to Java 15");
           weavingJavaVersion = Opcodes.V15;