You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2022/04/03 02:43:16 UTC
[aries-cdi] 03/07: update to bnd 6.2.0
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 50c52d2b0ede49049137ccd663291119e2c15ece
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Apr 1 22:17:26 2022 -0400
update to bnd 6.2.0
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/base.bndrun | 2 ++
cdi-extender/pom.xml | 2 +-
.../aries/cdi/container/internal/container/ContainerBootstrap.java | 2 +-
.../org/apache/aries/cdi/container/internal/container/Discovery.java | 5 +++--
cdi-itests/base-itest.bndrun | 2 ++
pom.xml | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cdi-executable/base.bndrun b/cdi-executable/base.bndrun
index ddc61f0..b94c0b6 100644
--- a/cdi-executable/base.bndrun
+++ b/cdi-executable/base.bndrun
@@ -21,6 +21,8 @@
org.osgi.service.http.port=8080,\
osgi.console=
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
-runpath: \
diff --git a/cdi-extender/pom.xml b/cdi-extender/pom.xml
index c51eccc..53b74c0 100644
--- a/cdi-extender/pom.xml
+++ b/cdi-extender/pom.xml
@@ -53,7 +53,7 @@
<bnd><![CDATA[
-cdiannotations:
-conditionalpackage: \
- aQute.lib.exceptions,\
+ aQute.bnd.exceptions,\
org.apache.felix.utils.extender
]]></bnd>
</configuration>
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
index fa2db8c..2872760 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
@@ -14,7 +14,7 @@
package org.apache.aries.cdi.container.internal.container;
-import static aQute.lib.exceptions.FunctionWithException.asFunction;
+import static aQute.bnd.exceptions.FunctionWithException.asFunction;
import static java.util.Objects.requireNonNull;
import static java.util.Optional.ofNullable;
import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
index 4202f5f..42a0572 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
@@ -14,6 +14,7 @@
package org.apache.aries.cdi.container.internal.container;
+import static aQute.bnd.exceptions.Exceptions.duck;
import static java.util.stream.Collectors.toList;
import java.io.InputStream;
@@ -88,7 +89,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
public class Discovery {
@@ -109,7 +110,7 @@ public class Discovery {
trimExpression = xPath.compile("boolean(/beans/trim)");
excludeExpression = xPath.compile("/beans/scan/exclude");
} catch (Throwable t) {
- throw Exceptions.duck(t);
+ throw duck(t);
}
}
}
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
index 15c3dca..a52610b 100644
--- a/cdi-itests/base-itest.bndrun
+++ b/cdi-itests/base-itest.bndrun
@@ -24,6 +24,8 @@
test.property.b=,\
org.apache.felix.http.host=localhost
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
-runpath: \
diff --git a/pom.xml b/pom.xml
index 65e3dfe..c4de927 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<project.build.outputTimestamp>1</project.build.outputTimestamp>
<!-- Versions -->
- <bnd.version>5.3.0</bnd.version>
+ <bnd.version>6.2.0</bnd.version>
<byte.buddy.version>1.12.8</byte.buddy.version>
<jax.rs.whiteboard.version>2.0.0</jax.rs.whiteboard.version>
<jaxb.api.version>2.3.2</jaxb.api.version>