From 638e85e79f6bc953de2944dc6209fe6a8c4a7777 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Wed, 27 May 2015 11:21:59 +0100 Subject: [PATCH] attempting to fix build issues --- pom.xml | 10 ++++++---- .../chronicle/map/AbstractChannelReplicator.java | 2 +- .../net/openhft/chronicle/map/MapStatelessClient.java | 4 +++- .../openhft/chronicle/map/StatelessChronicleMap.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c6a4bfc61..dba327a95 100755 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,14 @@ ~ limitations under the License. --> - + net.openhft java-parent-pom 1.1.2 - + 4.0.0 @@ -64,7 +65,8 @@ - + + net.openhft chronicle-core @@ -274,7 +276,7 @@ maven-bundle-plugin true - + ${project.groupId}.${project.artifactId} OpenHFT :: ${project.artifactId} ${project.version} diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java index d32422017..61010ae63 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.hash.impl.util.CloseablesManager; +import net.openhft.chronicle.core.util.CloseablesManager; import net.openhft.chronicle.hash.replication.HashReplicableEntry; import net.openhft.chronicle.hash.replication.ThrottlingConfig; import net.openhft.lang.io.ByteBufferBytes; diff --git a/src/main/java/net/openhft/chronicle/map/MapStatelessClient.java b/src/main/java/net/openhft/chronicle/map/MapStatelessClient.java index b6908e323..6b0a2e450 100644 --- a/src/main/java/net/openhft/chronicle/map/MapStatelessClient.java +++ b/src/main/java/net/openhft/chronicle/map/MapStatelessClient.java @@ -1,6 +1,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.engine.client.ClientWiredStatelessTcpConnectionHub; + +import net.openhft.chronicle.network.connection.AbstactStatelessClient; +import net.openhft.chronicle.network.connection.ClientWiredStatelessTcpConnectionHub; import net.openhft.chronicle.wire.CoreFields; import net.openhft.chronicle.wire.ParameterizeWireKey; import net.openhft.chronicle.wire.ValueIn; diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index a98287b10..b925f6f08 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -19,10 +19,10 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.bytes.IORuntimeException; +import net.openhft.chronicle.core.util.CloseablesManager; import net.openhft.chronicle.hash.RemoteCallTimeoutException; import net.openhft.chronicle.hash.function.SerializableFunction; import net.openhft.chronicle.hash.impl.util.BuildVersion; -import net.openhft.chronicle.hash.impl.util.CloseablesManager; import net.openhft.chronicle.hash.serialization.BytesReader; import net.openhft.chronicle.hash.serialization.internal.ReaderWithSize; import net.openhft.chronicle.hash.serialization.internal.SerializationBuilder;