switch to aQute.bnd.exceptions from aQute.lib.exceptions

Signed-off-by: Stefan Bischof <[email protected]>
aQute-os · Sep 2, 2024 · 1d1ec25 · 1d1ec25
1 parent a570b7e
commit 1d1ec25
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 18 deletions.
diff --git a/biz.aQute.dtos.provider/src/main/java/biz/aQute/dtos/provider/DTOsProvider.java b/biz.aQute.dtos.provider/src/main/java/biz/aQute/dtos/provider/DTOsProvider.java
@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.json.Decoder;
 import aQute.lib.json.Encoder;
 import aQute.lib.json.JSONCodec;

diff --git a/...foreign.python.provider/src/test/java/biz/aQute/foreign/python/provider/ExchangeTest.java b/...foreign.python.provider/src/test/java/biz/aQute/foreign/python/provider/ExchangeTest.java
@@ -9,7 +9,7 @@
 
 import org.junit.Test;
 
-import aQute.lib.exceptions.RunnableWithException;
+import aQute.bnd.exceptions.RunnableWithException;
 import aQute.lib.io.IO;
 
 public class ExchangeTest {

diff --git a/...go.commands.provider/src/main/java/biz/aQute/gogo/commands/dtoformatter/DTOFormatter.java b/...go.commands.provider/src/main/java/biz/aQute/gogo/commands/dtoformatter/DTOFormatter.java
@@ -23,7 +23,7 @@
 
 import org.osgi.dto.DTO;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.libg.glob.Glob;
 import aQute.libg.parameters.Attributes;
 import aQute.libg.parameters.ParameterMap;

diff --git a/...Qute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Activator.java b/...Qute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Activator.java
@@ -23,7 +23,7 @@
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.io.IO;
 import biz.aQute.gogo.commands.dtoformatter.DTOFormatter;
 

diff --git a/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Help.java b/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Help.java
@@ -43,7 +43,7 @@
 import org.osgi.framework.ServiceReference;
 
 import aQute.lib.converter.Converter;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.justif.Justif;
 import aQute.libg.glob.Glob;
 import biz.aQute.gogo.commands.dtoformatter.DTOFormatter;

diff --git a/biz.aQute.jpm/src/main/java/aQute/jpm/lib/JustAnotherPackageManager.java b/biz.aQute.jpm/src/main/java/aQute/jpm/lib/JustAnotherPackageManager.java
@@ -50,7 +50,7 @@
 import aQute.jpm.platform.PlatformImpl;
 import aQute.lib.base64.Base64;
 import aQute.lib.converter.Converter;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.filter.Filter;
 import aQute.lib.io.IO;
 import aQute.lib.json.JSONCodec;

diff --git a/biz.aQute.jpm/src/main/java/aQute/jpm/lib/MavenAccess.java b/biz.aQute.jpm/src/main/java/aQute/jpm/lib/MavenAccess.java
@@ -10,7 +10,7 @@
 import org.osgi.util.promise.PromiseFactory;
 
 import aQute.bnd.http.HttpClient;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.io.IO;
 import aQute.maven.api.Archive;
 import aQute.maven.api.Program;

diff --git a/biz.aQute.jpm/src/main/java/aQute/jpm/main/Main.java b/biz.aQute.jpm/src/main/java/aQute/jpm/main/Main.java
@@ -33,7 +33,7 @@
 import aQute.jpm.lib.JustAnotherPackageManager;
 import aQute.jpm.platform.PlatformImpl;
 import aQute.lib.collections.ExtList;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.getopt.Arguments;
 import aQute.lib.getopt.CommandLine;
 import aQute.lib.getopt.Description;

diff --git a/biz.aQute.modbus.library/src/main/java/biz/aQute/modbus/api/PDU.java b/biz.aQute.modbus.library/src/main/java/biz/aQute/modbus/api/PDU.java
@@ -11,7 +11,7 @@
 import java.util.Formatter;
 
 import aQute.lib.converter.Converter;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 
 public class PDU {
 

diff --git a/biz.aQute.mqtt.paho.client/src/main/java/biz/aQute/mqtt/paho/client/BrokerImpl.java b/biz.aQute.mqtt.paho.client/src/main/java/biz/aQute/mqtt/paho/client/BrokerImpl.java
@@ -15,7 +15,7 @@
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.util.promise.Promise;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import biz.aQute.broker.api.Broker;
 import biz.aQute.broker.api.Subscriber;
 import biz.aQute.broker.api.Topic;

diff --git a/biz.aQute.mqtt.paho.client/src/main/java/biz/aQute/mqtt/paho/client/MqttCentral.java b/biz.aQute.mqtt.paho.client/src/main/java/biz/aQute/mqtt/paho/client/MqttCentral.java
@@ -21,7 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.io.IO;
 import aQute.lib.json.JSONCodec;
 import biz.aQute.broker.api.Subscriber;

diff --git a/biz.aQute.mqtt.paho.client/src/main/java/biz/aQute/mqtt/paho/client/TopicImpl.java b/biz.aQute.mqtt.paho.client/src/main/java/biz/aQute/mqtt/paho/client/TopicImpl.java
@@ -3,7 +3,7 @@
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.io.ByteBufferOutputStream;
 import biz.aQute.broker.api.Topic;
 

diff --git a/biz.aQute.mqtt.test/basic.bndrun b/biz.aQute.mqtt.test/basic.bndrun
@@ -10,9 +10,10 @@
 	biz.aQute.api.broker;version=snapshot,\
 	biz.aQute.mqtt.moquette.server;version=snapshot,\
 	biz.aQute.mqtt.paho.client;version=snapshot,\
-	org.osgi.util.function;version='[1.1.0,1.1.1)',\
-	org.osgi.util.promise;version='[1.1.1,1.1.2)',\
 	org.apache.felix.configadmin;version='[1.9.12,1.9.13)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-	com.h2database;version='[1.4.198,1.4.199)'
+	com.h2database;version='[1.4.198,1.4.199)',\
+	aQute.libg;version='[6.4.1,6.4.2)',\
+	org.osgi.util.function;version='[1.2.0,1.2.1)',\
+	org.osgi.util.promise;version='[1.3.0,1.3.1)'
 -resolve: auto
diff --git a/biz.aQute.osgi.configuration.util/bnd.bnd b/biz.aQute.osgi.configuration.util/bnd.bnd
@@ -10,7 +10,9 @@ Export-Package: \
 	biz.aQute.osgi.configuration.util,\
 	org.osgi.service.metatype.annotations
 
--conditionalpackage: aQute.lib*
+-conditionalpackage: \
+					aQute.lib*,\
+					aQute.bnd.exceptions
 
 -includeresource: {readme.md}
 

diff --git a/biz.aQute.osgi.diverse.util/src/test/java/biz/aQute/osgi/concurrency/util/InitCloseTest.java b/biz.aQute.osgi.diverse.util/src/test/java/biz/aQute/osgi/concurrency/util/InitCloseTest.java
@@ -12,7 +12,7 @@
 import org.junit.AfterClass;
 import org.junit.Test;
 
-import aQute.lib.exceptions.RunnableWithException;
+import aQute.bnd.exceptions.RunnableWithException;
 import biz.aQute.osgi.concurrency.util.InitClose.State;
 
 public class InitCloseTest {

diff --git a/biz.aQute.trace/src/main/java/biz/aQute/trace/gui/TraceMonitor.java b/biz.aQute.trace/src/main/java/biz/aQute/trace/gui/TraceMonitor.java
@@ -13,7 +13,7 @@
 import org.apache.felix.service.command.annotations.GogoCommand;
 import org.osgi.service.component.annotations.Component;
 
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
 import aQute.lib.io.IO;
 import aQute.lib.json.JSONCodec;
 import aQute.lib.justif.Justif;