This is an automated email from the ASF dual-hosted git repository. cschneider 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 4c21235 Upgrade to ASM 7.2 for Java 14 support new 85da51f Merge pull request #101 from aguibert/proxy-impl-java14 4c21235 is described below commit 4c21235280c8672613a4cef590073e855392441e Author: Andrew Guibert <andy.guib...@gmail.com> AuthorDate: Tue Oct 1 16:32:31 2019 -0500 Upgrade to ASM 7.2 for Java 14 support --- proxy/proxy-impl/pom.xml | 4 +- .../org/apache/aries/proxy/impl/ProxyUtils.java | 90 +++++++++++----------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml index 80161d7..545d535 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>7.1</version> + <version>7.2</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> <optional>true</optional> - <version>7.1</version> + <version>7.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 e91cbf4..0babe4e 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 @@ -36,49 +36,53 @@ public class ProxyUtils */ public static int getWeavingJavaVersion() { if (weavingJavaVersion == -1 ) { - //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.V13: - LOGGER.debug("Weaving to Java 13"); - weavingJavaVersion = Opcodes.V13; - break; - 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; - break; - case Opcodes.V10: - LOGGER.debug("Weaving to Java 10"); - weavingJavaVersion = Opcodes.V10; - break; - case Opcodes.V9: - LOGGER.debug("Weaving to Java 9"); - weavingJavaVersion = Opcodes.V9; - break; - case Opcodes.V1_8: - LOGGER.debug("Weaving to Java 8"); - weavingJavaVersion = Opcodes.V1_8; - break; - case Opcodes.V1_7: - LOGGER.debug("Weaving to Java 7"); - weavingJavaVersion = Opcodes.V1_7; - break; - case Opcodes.V1_6: - LOGGER.debug("Weaving to Java 6"); - weavingJavaVersion = Opcodes.V1_6; - break; - case Opcodes.V1_5: - LOGGER.debug("Weaving to Java 5"); - weavingJavaVersion = Opcodes.V1_5; - break; - default: - //aries should work with Java 5 or above - also will highlight when a higher level (and unsupported) level of Java is released - throw new IllegalArgumentException("Invalid Java version " + JAVA_CLASS_VERSION); - } + //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.V14: + LOGGER.debug("Weaving to Java 14"); + weavingJavaVersion = Opcodes.V14; + break; + case Opcodes.V13: + LOGGER.debug("Weaving to Java 13"); + weavingJavaVersion = Opcodes.V13; + break; + 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; + break; + case Opcodes.V10: + LOGGER.debug("Weaving to Java 10"); + weavingJavaVersion = Opcodes.V10; + break; + case Opcodes.V9: + LOGGER.debug("Weaving to Java 9"); + weavingJavaVersion = Opcodes.V9; + break; + case Opcodes.V1_8: + LOGGER.debug("Weaving to Java 8"); + weavingJavaVersion = Opcodes.V1_8; + break; + case Opcodes.V1_7: + LOGGER.debug("Weaving to Java 7"); + weavingJavaVersion = Opcodes.V1_7; + break; + case Opcodes.V1_6: + LOGGER.debug("Weaving to Java 6"); + weavingJavaVersion = Opcodes.V1_6; + break; + case Opcodes.V1_5: + LOGGER.debug("Weaving to Java 5"); + weavingJavaVersion = Opcodes.V1_5; + break; + default: + //aries should work with Java 5 or above - also will highlight when a higher level (and unsupported) level of Java is released + throw new IllegalArgumentException("Invalid Java version " + JAVA_CLASS_VERSION); + } } return weavingJavaVersion; }