... and drop an extraneous CORBA import!
Change-Id: I9062d07f9b9af3eb35c99bb0c4697b8e6fac33eb
Signed-off-by: Stephen Kitt <skitt@redhat.com>
12 files changed:
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.omg.CORBA.Object;
import org.opendaylight.netvirt.bgpmanager.BgpConfigurationManager;
import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_afi;
import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_safi;
import org.opendaylight.netvirt.bgpmanager.BgpConfigurationManager;
import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_afi;
import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_safi;
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.coe</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.coe</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Ensure that annotation dependencies are optional throughout -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-net</groupId>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.genius</groupId>