diff options
14 files changed, 25 insertions, 14 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index facc9707f..18d1eb92f 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -68,7 +68,12 @@ </dependency> <dependency> <groupId>io.fd.honeycomb</groupId> - <artifactId>minimal-distribution-core</artifactId> + <artifactId>translate-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.fd.honeycomb</groupId> + <artifactId>binding-init</artifactId> <version>${project.version}</version> </dependency> diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java index b3caa0e9c..be8c48894 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.acl; import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.VppBaseCallException; import io.fd.vpp.jvpp.acl.JVppAclImpl; diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 5a9d2466d..e1f8ce243 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -117,7 +117,7 @@ </dependency> <dependency> <groupId>io.fd.honeycomb</groupId> - <artifactId>minimal-distribution-core</artifactId> + <artifactId>binding-init</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java index fa4d20004..0ffc8dd94 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl; import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java index bd560a762..a8ae2dc70 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl; import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java index 697cd1255..caf098e2d 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl; import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 7e2f6b9b3..7a16ca0e7 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -60,7 +60,7 @@ <!-- Honeycomb infrastructure--> <dependency> <groupId>io.fd.honeycomb</groupId> - <artifactId>minimal-distribution-core</artifactId> + <artifactId>binding-init</artifactId> <version>${honeycomb.infra.version}</version> </dependency> @@ -78,6 +78,12 @@ <dependency> <groupId>io.fd.honeycomb</groupId> + <artifactId>translate-impl</artifactId> + <version>${honeycomb.infra.version}</version> + </dependency> + + <dependency> + <groupId>io.fd.honeycomb</groupId> <artifactId>cfg-init</artifactId> <version>${honeycomb.infra.version}</version> </dependency> diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java index c16bcbaab..e5a1b3f4d 100755 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.jvpp; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.snat.JVppSnatImpl; import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 1bc00d047..33c79936b 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -108,7 +108,7 @@ </dependency> <dependency> <groupId>io.fd.honeycomb</groupId> - <artifactId>minimal-distribution-core</artifactId> + <artifactId>binding-init</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java index bc0924197..c520b2d97 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.vppnsh.impl.util; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.nsh.JVppNshImpl; import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 7ba7d6359..a2547df0b 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -60,7 +60,7 @@ <dependencies> <dependency> <groupId>io.fd.honeycomb</groupId> - <artifactId>minimal-distribution-core</artifactId> + <artifactId>minimal-distribution</artifactId> <version>${honeycomb.min.distro.version}</version> </dependency> <dependency> diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java index 9b581ebd3..2e62e0770 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/ContextsReaderFactoryProvider.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.common.integration; import com.google.inject.Inject; import com.google.inject.name.Named; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.hc2vpp.common.context.ContextsReaderFactory; diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java index f180bc408..4945bb98e 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.common.integration; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.io.IOException; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.core.JVppCoreImpl; diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java index ccd31ef01..8837b7fe8 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.common.integration; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.hc2vpp.common.translate.util.VppStatusListener; import java.io.IOException; import io.fd.vpp.jvpp.JVppRegistry; |