[aries] branch trunk updated: [ARIES-1999]aries.proxy:ensure to support JDK15

[jbonofre]

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 d90f46b  [ARIES-1999]aries.proxy:ensure to support JDK15
     new 3f3df2b  Merge pull request #112 from ffang/ARIES-1999
d90f46b is described below

commit d90f46bc2802e5c16458ba06c224b677e5443c4c
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Thu Aug 27 10:10:01 2020 -0400

    [ARIES-1999]aries.proxy:ensure to support JDK15
---
 .../src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java         | 4 ++++
 1 file changed, 4 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 0babe4e..355629f 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.V15:
+          LOGGER.debug("Weaving to Java 15");
+          weavingJavaVersion = Opcodes.V15;
+          break;
         case Opcodes.V14:
           LOGGER.debug("Weaving to Java 14");
           weavingJavaVersion = Opcodes.V14;