ARIES-2068 Don't log an error just if the config admin isn't available yet
Signed-off-by: Raymond Augé <rotty3000@apache.org>
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index eddc243..12c0ac8 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.23,2.0.24)',\
- openwebbeans-spi;version='[2.0.23,2.0.24)',\
+ openwebbeans-impl;version='[2.0.25,2.0.26)',\
+ openwebbeans-spi;version='[2.0.25,2.0.26)',\
org.apache.aries.cdi.extender;version='[1.1.5,1.1.6)',\
org.apache.aries.cdi.extension.spi;version='[1.1.5,1.1.6)',\
org.apache.aries.cdi.owb;version='[1.1.5,1.1.6)',\
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index e62b5d9..d77a64b 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -30,9 +30,9 @@
junit-platform-commons;version='[1.8.0,1.8.1)',\
junit-platform-engine;version='[1.8.0,1.8.1)',\
junit-platform-launcher;version='[1.8.0,1.8.1)',\
- 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)',\
+ openwebbeans-impl;version='[2.0.25,2.0.26)',\
+ openwebbeans-spi;version='[2.0.25,2.0.26)',\
+ openwebbeans-web;version='[2.0.25,2.0.26)',\
org.apache.aries.cdi.extender;version='[1.1.5,1.1.6)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.5,1.1.6)',\
org.apache.aries.cdi.extension.jndi;version='[1.1.5,1.1.6)',\
diff --git a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
index 7249246..60a0513 100644
--- a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
+++ b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,8 +31,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.se.SeContainer;
@@ -176,7 +179,23 @@
if (added) {
return;
}
- extensions.forEach((k, v) -> addExtension(k));
+ try {
+ Method method = ExtensionLoader.class.getDeclaredMethod("addExtensions", List.class);
+ method.invoke(this, extensions.keySet().stream().collect(Collectors.toList()));
+ }
+ catch (ReflectiveOperationException nsme1) {
+ try {
+ Method method = ExtensionLoader.class.getDeclaredMethod("addExtension", Extension.class);
+ for (Entry<Extension, Map<String, Object>> entry : extensions.entrySet()) {
+ method.invoke(this, entry.getKey());
+ }
+ }
+ catch (ReflectiveOperationException nsme2) {
+ throw new RuntimeException(
+ "Could not locate either addExtensions(List) or addExtension(Extension) on " +
+ ExtensionLoader.class.getName());
+ }
+ }
added = true;
}
};
diff --git a/pom.xml b/pom.xml
index 7c515f6..a5ef30d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<mp.jwt.auth.version>1.2.1</mp.jwt.auth.version>
<mp.metrics.version>1.1.1</mp.metrics.version>
<osgi.test.version>1.0.1</osgi.test.version>
- <owb.version>2.0.23</owb.version>
+ <owb.version>2.0.25</owb.version>
<slf4j.version>1.7.32</slf4j.version>
<surefire.version>2.12</surefire.version>
<weld.version>3.1.8.Final</weld.version>
