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 index 146e5bab..7147bbe7 100644 --- 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/biz.aQute.foreign.python.provider/src/test/java/biz/aQute/foreign/python/provider/ExchangeTest.java b/biz.aQute.foreign.python.provider/src/test/java/biz/aQute/foreign/python/provider/ExchangeTest.java index 98ecdaed..02d14a43 100644 --- a/biz.aQute.foreign.python.provider/src/test/java/biz/aQute/foreign/python/provider/ExchangeTest.java +++ b/biz.aQute.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/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/dtoformatter/DTOFormatter.java b/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/dtoformatter/DTOFormatter.java index c546e6ae..4a684824 100644 --- a/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/dtoformatter/DTOFormatter.java +++ b/biz.aQute.gogo.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/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Activator.java b/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Activator.java index bf1cb4f9..09272cc1 100644 --- a/biz.aQute.gogo.commands.provider/src/main/java/biz/aQute/gogo/commands/provider/Activator.java +++ b/biz.aQute.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 index 16f44416..d4241868 100644 --- 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 index 76a71fe7..8c94e42f 100644 --- 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 index eaa4070b..13219479 100644 --- 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 index 386bd62c..a232f5bb 100644 --- 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 index 6166e7a1..56311d2d 100644 --- 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 index 3e41ab38..0e656141 100644 --- 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 index 714e4700..65e80e5b 100644 --- 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 index 631b2026..25d21e6e 100644 --- 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.osgi.configuration.util/bnd.bnd b/biz.aQute.osgi.configuration.util/bnd.bnd index ea19ac3e..c75f1f83 100644 --- 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 index 5814a0a6..2e60d53e 100644 --- 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 index eb648531..d3cc896b 100644 --- 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;