You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2020/04/27 15:06:49 UTC
[openwebbeans] branch master updated: OWB-1323 asm8 upgrade
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 328c9c9 OWB-1323 asm8 upgrade
328c9c9 is described below
commit 328c9c90b89d2b38b7e7b25a62f576f669d2a0a0
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Mon Apr 27 17:06:43 2020 +0200
OWB-1323 asm8 upgrade
---
distribution/pom.xml | 2 +-
distribution/src/assembly/dist-binary.xml | 2 +-
pom.xml | 4 ++--
webbeans-impl/pom.xml | 2 +-
.../apache/webbeans/proxy/AbstractProxyFactory.java | 18 +++++++++---------
.../proxy/InterceptorDecoratorProxyFactory.java | 10 +++++-----
.../webbeans/proxy/NormalScopeProxyFactory.java | 10 +++++-----
.../apache/webbeans/proxy/SubclassProxyFactory.java | 8 ++++----
.../scanner/AbstractMetaDataDiscoveryTest.java | 20 ++++++++++----------
webbeans-jetty9/README.asciidoc | 4 ++--
.../src/main/config/modules/apache-owb.mod | 2 +-
11 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e0f452a..46bc937 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -145,7 +145,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm7-shaded</artifactId>
+ <artifactId>xbean-asm8-shaded</artifactId>
</dependency>
diff --git a/distribution/src/assembly/dist-binary.xml b/distribution/src/assembly/dist-binary.xml
index a471639..5564e35 100644
--- a/distribution/src/assembly/dist-binary.xml
+++ b/distribution/src/assembly/dist-binary.xml
@@ -73,7 +73,7 @@ under the License.
<includes>
<include>org.apache.openwebbeans:openwebbeans-impl:jar</include>
<include>org.apache.xbean:xbean-finder-shaded:jar</include>
- <include>org.apache.xbean:xbean-asm7-shaded:jar</include>
+ <include>org.apache.xbean:xbean-asm8-shaded:jar</include>
</includes>
</dependencySet>
diff --git a/pom.xml b/pom.xml
index 6147f34..29ffa32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 -->
<jetty.version>9.4.12.v20180830</jetty.version>
<myfaces.version>2.3.6</myfaces.version>
- <xbean.version>4.16</xbean.version>
+ <xbean.version>4.17</xbean.version>
<arquillian.version>1.1.13.Final</arquillian.version>
<cdi.tck.version>2.0.3.Final</cdi.tck.version>
<httpclient.version>4.5.2</httpclient.version>
@@ -706,7 +706,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm7-shaded</artifactId>
+ <artifactId>xbean-asm8-shaded</artifactId>
<version>${xbean.version}</version>
</dependency>
diff --git a/webbeans-impl/pom.xml b/webbeans-impl/pom.xml
index 5f386f5..973e83a 100644
--- a/webbeans-impl/pom.xml
+++ b/webbeans-impl/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm7-shaded</artifactId>
+ <artifactId>xbean-asm8-shaded</artifactId>
</dependency>
<dependency>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
index 49216c3..2ec4daa 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.proxy;
-import static org.apache.xbean.asm7.ClassReader.SKIP_CODE;
-import static org.apache.xbean.asm7.ClassReader.SKIP_DEBUG;
-import static org.apache.xbean.asm7.ClassReader.SKIP_FRAMES;
+import static org.apache.xbean.asm8.ClassReader.SKIP_CODE;
+import static org.apache.xbean.asm8.ClassReader.SKIP_DEBUG;
+import static org.apache.xbean.asm8.ClassReader.SKIP_FRAMES;
import java.io.InputStream;
import java.lang.reflect.Constructor;
@@ -33,12 +33,12 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.ProxyGenerationException;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.spi.DefiningClassService;
-import org.apache.xbean.asm7.ClassReader;
-import org.apache.xbean.asm7.ClassWriter;
-import org.apache.xbean.asm7.MethodVisitor;
-import org.apache.xbean.asm7.Opcodes;
-import org.apache.xbean.asm7.Type;
-import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm8.ClassReader;
+import org.apache.xbean.asm8.ClassWriter;
+import org.apache.xbean.asm8.MethodVisitor;
+import org.apache.xbean.asm8.Opcodes;
+import org.apache.xbean.asm8.Type;
+import org.apache.xbean.asm8.shade.commons.EmptyVisitor;
/**
* Base class for all OWB Proxy factories
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
index 5f347c9..37ad044 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
@@ -26,11 +26,11 @@ import org.apache.webbeans.intercept.InterceptorResolutionService;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ExceptionUtil;
-import org.apache.xbean.asm7.ClassWriter;
-import org.apache.xbean.asm7.Label;
-import org.apache.xbean.asm7.MethodVisitor;
-import org.apache.xbean.asm7.Opcodes;
-import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm8.ClassWriter;
+import org.apache.xbean.asm8.Label;
+import org.apache.xbean.asm8.MethodVisitor;
+import org.apache.xbean.asm8.Opcodes;
+import org.apache.xbean.asm8.Type;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
index 0d7d456..1070370 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
@@ -41,10 +41,10 @@ import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.ExceptionUtil;
import org.apache.webbeans.util.WebBeansUtil;
-import org.apache.xbean.asm7.ClassWriter;
-import org.apache.xbean.asm7.MethodVisitor;
-import org.apache.xbean.asm7.Opcodes;
-import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm8.ClassWriter;
+import org.apache.xbean.asm8.MethodVisitor;
+import org.apache.xbean.asm8.Opcodes;
+import org.apache.xbean.asm8.Type;
/**
* This factory creates proxies which delegate the
@@ -523,7 +523,7 @@ public class NormalScopeProxyFactory extends AbstractProxyFactory
* if targetMethod is protected. Please see Java LangSpec 6.6.2 about the complex
* rules for calling 'protected' methods.
*
- * @see #generateDelegationMethod(org.apache.xbean.asm7.ClassWriter, java.lang.reflect.Method, int, Class, String)
+ * @see #generateDelegationMethod(org.apache.xbean.asm8.ClassWriter, java.lang.reflect.Method, int, Class, String)
*/
@SuppressWarnings("unused")
public static Object delegateProtectedMethod(Method method, Object instance, Object[] params)
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
index 81698d2..7cb5ebb 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
@@ -27,10 +27,10 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.ProxyGenerationException;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.util.ClassUtil;
-import org.apache.xbean.asm7.ClassWriter;
-import org.apache.xbean.asm7.MethodVisitor;
-import org.apache.xbean.asm7.Opcodes;
-import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm8.ClassWriter;
+import org.apache.xbean.asm8.MethodVisitor;
+import org.apache.xbean.asm8.Opcodes;
+import org.apache.xbean.asm8.Type;
import javax.enterprise.inject.spi.AnnotatedConstructor;
import javax.enterprise.inject.spi.AnnotatedType;
diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
index ca86eb0..91772b0 100644
--- a/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
+++ b/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
@@ -20,13 +20,13 @@ package org.apache.webbeans.corespi.scanner;
import static java.util.Collections.emptyEnumeration;
import static java.util.Collections.emptyMap;
-import static org.apache.xbean.asm7.ClassWriter.COMPUTE_FRAMES;
-import static org.apache.xbean.asm7.Opcodes.ACC_PUBLIC;
-import static org.apache.xbean.asm7.Opcodes.ACC_SUPER;
-import static org.apache.xbean.asm7.Opcodes.ALOAD;
-import static org.apache.xbean.asm7.Opcodes.INVOKESPECIAL;
-import static org.apache.xbean.asm7.Opcodes.RETURN;
-import static org.apache.xbean.asm7.Opcodes.V1_8;
+import static org.apache.xbean.asm8.ClassWriter.COMPUTE_FRAMES;
+import static org.apache.xbean.asm8.Opcodes.ACC_PUBLIC;
+import static org.apache.xbean.asm8.Opcodes.ACC_SUPER;
+import static org.apache.xbean.asm8.Opcodes.ALOAD;
+import static org.apache.xbean.asm8.Opcodes.INVOKESPECIAL;
+import static org.apache.xbean.asm8.Opcodes.RETURN;
+import static org.apache.xbean.asm8.Opcodes.V1_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -55,9 +55,9 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.corespi.DefaultSingletonService;
import org.apache.webbeans.spi.ContainerLifecycle;
-import org.apache.xbean.asm7.ClassWriter;
-import org.apache.xbean.asm7.MethodVisitor;
-import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm8.ClassWriter;
+import org.apache.xbean.asm8.MethodVisitor;
+import org.apache.xbean.asm8.Type;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
diff --git a/webbeans-jetty9/README.asciidoc b/webbeans-jetty9/README.asciidoc
index 6ef1e33..a6950fd 100644
--- a/webbeans-jetty9/README.asciidoc
+++ b/webbeans-jetty9/README.asciidoc
@@ -117,8 +117,8 @@ COPY : .../.m2/repository/org/apache/openwebbeans/openwebbeans-jetty9/2.0.11/op
COPY : .../.m2/repository/org/apache/geronimo/specs/geronimo-jcdi_2.0_spec/1.0/geronimo-jcdi_2.0_spec-1.0.jar to ${jetty.base}/lib/apache-owb/geronimo-jcdi_2.0_spec-1.0.jar
COPY : .../.m2/repository/org/apache/geronimo/specs/geronimo-atinject_1.0_spec/1.0/geronimo-atinject_1.0_spec-1.0.jar to ${jetty.base}/lib/apache-owb/geronimo-atinject_1.0_spec-1.0.jar
COPY : .../.m2/repository/org/apache/geronimo/specs/geronimo-interceptor_1.2_spec/1.0/geronimo-interceptor_1.2_spec-1.0.jar to ${jetty.base}/lib/apache-owb/geronimo-interceptor_1.2_spec-1.0.jar
-COPY : .../.m2/repository/org/apache/xbean/xbean-finder-shaded/4.13/xbean-finder-shaded-4.13.jar to ${jetty.base}/lib/apache-owb/xbean-finder-shaded-4.13.jar
-COPY : .../.m2/repository/org/apache/xbean/xbean-asm7-shaded/4.13/xbean-asm7-shaded-4.13.jar to ${jetty.base}/lib/apache-owb/xbean-asm7-shaded-4.13.jar
+COPY : .../.m2/repository/org/apache/xbean/xbean-finder-shaded/4.17/xbean-finder-shaded-4.13.jar to ${jetty.base}/lib/apache-owb/xbean-finder-shaded-4.13.jar
+COPY : .../.m2/repository/org/apache/xbean/xbean-asm8-shaded/4.17/xbean-asm8-shaded-4.13.jar to ${jetty.base}/lib/apache-owb/xbean-asm8-shaded-4.13.jar
INFO : Base directory was modified
----
diff --git a/webbeans-jetty9/src/main/config/modules/apache-owb.mod b/webbeans-jetty9/src/main/config/modules/apache-owb.mod
index 1bb474b..f0a89ab 100644
--- a/webbeans-jetty9/src/main/config/modules/apache-owb.mod
+++ b/webbeans-jetty9/src/main/config/modules/apache-owb.mod
@@ -17,7 +17,7 @@ maven://org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/${geronimo-cdi.version}
maven://org.apache.geronimo.specs/geronimo-atinject_1.0_spec/${geronimo-atinject.version}|lib/apache-owb/geronimo-atinject_1.0_spec-${geronimo-atinject.version}.jar
maven://org.apache.geronimo.specs/geronimo-interceptor_1.2_spec/${geronimo-interceptor.version}|lib/apache-owb/geronimo-interceptor_1.2_spec-${geronimo-interceptor.version}.jar
maven://org.apache.xbean/xbean-finder-shaded/${xbean.version}|lib/apache-owb/xbean-finder-shaded-${xbean.version}.jar
-maven://org.apache.xbean/xbean-asm7-shaded/${xbean.version}|lib/apache-owb/xbean-asm7-shaded-${xbean.version}.jar
+maven://org.apache.xbean/xbean-asm8-shaded/${xbean.version}|lib/apache-owb/xbean-asm8-shaded-${xbean.version}.jar
[lib]
lib/apache-owb/*.jar