diff --git a/CHANGES.txt b/CHANGES.txt index a153adc42a..e1b0a445fa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.10 + * Remove clientutil jar (CASSANDRA-11635) * Fix compaction throughput throttle (CASSANDRA-12366) * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358) * Cassandra stress should dump all setting on startup (CASSANDRA-11914) diff --git a/NEWS.txt b/NEWS.txt index f28c6f2f5c..a14283f997 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -65,6 +65,11 @@ Upgrading - Logs written to stdout are now consistent with logs written to files. Time is now local (it was UTC on the console and local in files). Date, thread, file and line info where added to stdout. (see CASSANDRA-12004) + - The 'clientutil' jar, which has been somewhat broken on the 3.x branch, is not longer provided. + The features provided by that jar are provided by any good java driver and we advise relying on drivers rather on + that jar, but if you need that jar for backward compatiblity until you do so, you should use the version provided + on previous Cassandra branch, like the 3.0 branch (by design, the functionality provided by that jar are stable + accross versions so using the 3.0 jar for a client connecting to 3.x should work without issues). 3.8 === diff --git a/build.xml b/build.xml index 6a319a9fb5..df6d46914b 100644 --- a/build.xml +++ b/build.xml @@ -639,17 +639,6 @@ - - - - - - - @@ -943,31 +930,11 @@ + value="${ant.project.name}-thrift-${version}.jar" /> - - - - - - - - - - - - - - - - - - - - @@ -1008,18 +975,6 @@ - - - - - - - - - - - @@ -1042,14 +997,6 @@ - - - - - - - - @@ -1065,7 +1012,6 @@ - @@ -1310,44 +1256,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1584,7 +1492,7 @@ @@ -1983,16 +1891,6 @@ file="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" classifier="javadoc"/> - - - - - @@ -2037,15 +1935,6 @@ file="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" classifier="javadoc"/> - - - - diff --git a/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java b/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java deleted file mode 100644 index 563d6cb625..0000000000 --- a/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.apache.cassandra.serializers; -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.sql.Date; -import java.util.UUID; - -import org.apache.cassandra.utils.UUIDGen; -import org.junit.Test; - -public class ClientUtilsTest -{ - /** Exercises the classes in the clientutil jar to expose missing dependencies. */ - @Test - public void test() - { - AsciiSerializer.instance.deserialize(AsciiSerializer.instance.serialize("string")); - BooleanSerializer.instance.deserialize(BooleanSerializer.instance.serialize(true)); - BytesSerializer.instance.deserialize(BytesSerializer.instance.serialize(ByteBuffer.wrap("string".getBytes()))); - - Date date = new Date(System.currentTimeMillis()); - ByteBuffer dateBB = TimestampSerializer.instance.serialize(date); - TimestampSerializer.instance.deserialize(dateBB); - - DecimalSerializer.instance.deserialize(DecimalSerializer.instance.serialize(new BigDecimal(1))); - DoubleSerializer.instance.deserialize(DoubleSerializer.instance.serialize(new Double(1.0d))); - FloatSerializer.instance.deserialize(FloatSerializer.instance.serialize(new Float(1.0f))); - Int32Serializer.instance.deserialize(Int32Serializer.instance.serialize(1)); - IntegerSerializer.instance.deserialize(IntegerSerializer.instance.serialize(new BigInteger("1"))); - LongSerializer.instance.deserialize(LongSerializer.instance.serialize(1L)); - UTF8Serializer.instance.deserialize(UTF8Serializer.instance.serialize("string")); - - // UUIDGen - UUID uuid = UUIDGen.getTimeUUID(); - UUIDSerializer.instance.deserialize(UUIDSerializer.instance.serialize(uuid)); - } -}