owb fixes for version update
Signed-off-by: Raymond Augé <rotty3000@apache.org>
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index 13d738d..df7d2ca 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -21,8 +21,8 @@
osgi.identity;filter:='(osgi.identity=*weld*)'
-runbundles: \
- openwebbeans-impl;version='[2.0.13,2.0.14)',\
- openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ openwebbeans-impl;version='[2.0.23,2.0.24)',\
+ openwebbeans-spi;version='[2.0.23,2.0.24)',\
org.apache.aries.cdi.extender;version='[1.1.4,1.1.5)',\
org.apache.aries.cdi.extension.spi;version='[1.1.4,1.1.5)',\
org.apache.aries.cdi.owb;version='[1.1.4,1.1.5)',\
@@ -38,9 +38,9 @@
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.2.0,1.2.1)',\
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
- org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
- org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
+ org.apache.xbean.asm9-shaded;version='[4.20.0,4.20.1)',\
+ org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
+ org.apache.xbean.finder-shaded;version='[4.18.0,4.18.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 19394ee..37065b4 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -29,9 +29,9 @@
junit-platform-commons;version='[1.7.2,1.7.3)',\
junit-platform-engine;version='[1.7.2,1.7.3)',\
junit-platform-launcher;version='[1.7.2,1.7.3)',\
- openwebbeans-impl;version='[2.0.13,2.0.14)',\
- openwebbeans-spi;version='[2.0.13,2.0.14)',\
- openwebbeans-web;version='[2.0.13,2.0.14)',\
+ openwebbeans-impl;version='[2.0.23,2.0.24)',\
+ openwebbeans-spi;version='[2.0.23,2.0.24)',\
+ openwebbeans-web;version='[2.0.23,2.0.24)',\
org.apache.aries.cdi.extender;version='[1.1.4,1.1.5)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.4,1.1.5)',\
org.apache.aries.cdi.extension.jndi;version='[1.1.4,1.1.5)',\
@@ -62,9 +62,9 @@
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
org.apache.httpcomponents.httpclient;version='[4.5.13,4.5.14)',\
org.apache.httpcomponents.httpcore;version='[4.4.14,4.4.15)',\
- org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
- org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
+ org.apache.xbean.asm9-shaded;version='[4.20.0,4.20.1)',\
+ org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
+ org.apache.xbean.finder-shaded;version='[4.18.0,4.18.1)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
diff --git a/cdi-owb/pom.xml b/cdi-owb/pom.xml
index bedc050..ec46560 100644
--- a/cdi-owb/pom.xml
+++ b/cdi-owb/pom.xml
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
- <version>4.18</version>
+ <version>4.20</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -109,6 +109,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm9-shaded</artifactId>
+ <version>4.20</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
</dependency>
diff --git a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OSGiDefiningClassService.java b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OSGiDefiningClassService.java
index 57c6444..9dd31bb 100644
--- a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OSGiDefiningClassService.java
+++ b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OSGiDefiningClassService.java
@@ -50,7 +50,7 @@
if (classLoader != classloaders.bundleLoader) {
// todo: log a warning?
}
- return UnsafeFacade.INSTANCE.defineAndLoadClass(classLoader, name, bytes);
+ return UnsafeFacade.INSTANCE.defineAndLoadClass(classLoader, name, bytes, proxied);
}
return (Class<T>) classloaders.loader.getOrRegister(name, bytes, proxied.getPackage(), proxied.getProtectionDomain());
}
