diff --git a/pom.xml b/pom.xml index ea8e5bffe..71373c651 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ net.openhft lang - 6.4.19-SNAPSHOT + 6.4.18 @@ -165,6 +165,9 @@ net.openhft.chronicle.hash.serialization.internal + net.openhft.xstreem.converters + net.openhft.chronicle.hash.serialization.internal + diff --git a/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java b/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java index 369899cf2..9813cdaae 100644 --- a/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java +++ b/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java @@ -20,10 +20,10 @@ package net.openhft.chronicle.map; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver; -import net.openhft.xstreem.convertors.ByteBufferConverter; -import net.openhft.xstreem.convertors.DataValueConverter; -import net.openhft.xstreem.convertors.StatelessChronicleMapConverter; -import net.openhft.xstreem.convertors.VanillaChronicleMapConverter; +import net.openhft.xstreem.converters.ByteBufferConverter; +import net.openhft.xstreem.converters.DataValueConverter; +import net.openhft.xstreem.converters.StatelessChronicleMapConverter; +import net.openhft.xstreem.converters.VanillaChronicleMapConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/openhft/xstreem/convertors/AbstractChronicleMapConverter.java b/src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java similarity index 99% rename from src/main/java/net/openhft/xstreem/convertors/AbstractChronicleMapConverter.java rename to src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java index 596945d28..17869e922 100644 --- a/src/main/java/net/openhft/xstreem/convertors/AbstractChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.convertors; +package net.openhft.xstreem.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/src/main/java/net/openhft/xstreem/convertors/ByteBufferConverter.java b/src/main/java/net/openhft/xstreem/converters/ByteBufferConverter.java similarity index 99% rename from src/main/java/net/openhft/xstreem/convertors/ByteBufferConverter.java rename to src/main/java/net/openhft/xstreem/converters/ByteBufferConverter.java index c003cde8f..e300e57f0 100644 --- a/src/main/java/net/openhft/xstreem/convertors/ByteBufferConverter.java +++ b/src/main/java/net/openhft/xstreem/converters/ByteBufferConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.convertors; +package net.openhft.xstreem.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/src/main/java/net/openhft/xstreem/convertors/DataValueConverter.java b/src/main/java/net/openhft/xstreem/converters/DataValueConverter.java similarity index 99% rename from src/main/java/net/openhft/xstreem/convertors/DataValueConverter.java rename to src/main/java/net/openhft/xstreem/converters/DataValueConverter.java index 9948140a4..e2fa27cd2 100644 --- a/src/main/java/net/openhft/xstreem/convertors/DataValueConverter.java +++ b/src/main/java/net/openhft/xstreem/converters/DataValueConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.convertors; +package net.openhft.xstreem.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/src/main/java/net/openhft/xstreem/convertors/StatelessChronicleMapConverter.java b/src/main/java/net/openhft/xstreem/converters/StatelessChronicleMapConverter.java similarity index 98% rename from src/main/java/net/openhft/xstreem/convertors/StatelessChronicleMapConverter.java rename to src/main/java/net/openhft/xstreem/converters/StatelessChronicleMapConverter.java index 72aa1e7e3..de6c414b1 100644 --- a/src/main/java/net/openhft/xstreem/convertors/StatelessChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstreem/converters/StatelessChronicleMapConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.convertors; +package net.openhft.xstreem.converters; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.MarshallingContext; diff --git a/src/main/java/net/openhft/xstreem/convertors/VanillaChronicleMapConverter.java b/src/main/java/net/openhft/xstreem/converters/VanillaChronicleMapConverter.java similarity index 97% rename from src/main/java/net/openhft/xstreem/convertors/VanillaChronicleMapConverter.java rename to src/main/java/net/openhft/xstreem/converters/VanillaChronicleMapConverter.java index d1cefaea2..11842ab59 100644 --- a/src/main/java/net/openhft/xstreem/convertors/VanillaChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstreem/converters/VanillaChronicleMapConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.openhft.xstreem.convertors; +package net.openhft.xstreem.converters; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamWriter;