diff --git a/README.md b/README.md index 3752fb8d3a0..6e9c6888951 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Datastax Java Driver for Apache Cassandra -[![Build Status](https://travis-ci.org/datastax/java-driver.svg?branch=3.0)](https://travis-ci.org/datastax/java-driver) +[![Build Status](https://travis-ci.org/datastax/java-driver.svg?branch=3.1)](https://travis-ci.org/datastax/java-driver) *If you're reading this on github.com, please note that this is the readme for the development version and that some features described here might @@ -51,8 +51,6 @@ The driver contains the following modules: driver releases and important announcements (low frequency). [@DataStaxEng](https://twitter.com/datastaxeng) has more news including other drivers, Cassandra, and DSE. -- DOCS: the [manual](http://docs.datastax.com/en/developer/java-driver/3.1/manual/) has quick - start material and technical details about the driver and its features. - API: http://www.datastax.com/drivers/java/3.1 - [changelog](changelog/) - [binary tarball](http://downloads.datastax.com/java-driver/cassandra-java-driver-3.1.4.tar.gz) @@ -102,18 +100,18 @@ is available for download. ## Compatibility -The Java client driver 3.1.4 ([branch 3.1](https://github.com/datastax/java-driver/tree/3.1)) is compatible with Apache +The Java client driver 3.1.4 ([branch 3.1.x](https://github.com/datastax/java-driver/tree/3.1.x)) is compatible with Apache Cassandra 1.2, 2.0, 2.1, 2.2 and 3.0 (see [this page](http://datastax.github.io/java-driver/manual/native_protocol) for the most up-to-date compatibility information). UDT and tuple support is available only when using Apache Cassandra 2.1 or higher (see [CQL improvements in Cassandra 2.1](http://www.datastax.com/dev/blog/cql-in-2-1)). Other features are available only when using Apache Cassandra 2.0 or higher (e.g. result set paging, -[BatchStatement](https://github.com/datastax/java-driver/blob/3.0/driver-core/src/main/java/com/datastax/driver/core/BatchStatement.java), +[BatchStatement](https://github.com/datastax/java-driver/blob/3.1.x/driver-core/src/main/java/com/datastax/driver/core/BatchStatement.java), [lightweight transactions](http://www.datastax.com/documentation/cql/3.1/cql/cql_using/use_ltweight_transaction_t.html) -- see [What's new in Cassandra 2.0](http://www.datastax.com/documentation/cassandra/2.0/cassandra/features/features_key_c.html)). Trying to use these with a cluster running Cassandra 1.2 will result in -an [UnsupportedFeatureException](https://github.com/datastax/java-driver/blob/3.0/driver-core/src/main/java/com/datastax/driver/core/exceptions/UnsupportedFeatureException.java) being thrown. +an [UnsupportedFeatureException](https://github.com/datastax/java-driver/blob/3.1.x/driver-core/src/main/java/com/datastax/driver/core/exceptions/UnsupportedFeatureException.java) being thrown. ## Upgrading from previous versions diff --git a/faq/osgi/README.md b/faq/osgi/README.md index cfdb54ab11d..b9bd3952a96 100644 --- a/faq/osgi/README.md +++ b/faq/osgi/README.md @@ -192,7 +192,7 @@ it is also normal to see the following log lines when starting the driver: [Felix]:https://cwiki.apache.org/confluence/display/FELIX/Index [JAVA-1203]:https://datastax-oss.atlassian.net/browse/JAVA-1203 [JAVA-1127]:https://datastax-oss.atlassian.net/browse/JAVA-1127 -[BND]:http://www.aqute.biz/Bnd +[BND]:http://bnd.bndtools.org/ [Maven bundle plugin]:https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Maven+Bundle+Plugin+%28BND%29 [OSGi examples repository]:https://github.com/datastax/java-driver-examples-osgi [without metrics]:http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/Cluster.Builder.html#withoutMetrics-- diff --git a/manual/README.md b/manual/README.md index cd17e62389c..92e305dff53 100644 --- a/manual/README.md +++ b/manual/README.md @@ -283,7 +283,7 @@ for (ColumnDefinitions.Definition definition : row.getColumnDefinitions()) { If you're reading this from the [generated HTML documentation on github.io](http://datastax.github.io/java-driver/), use the "Contents" menu on the left hand side to navigate sub-sections. If you're [browsing the source files on -github.com](https://github.com/datastax/java-driver/tree/3.0/manual), +github.com](https://github.com/datastax/java-driver/tree/3.1.x/manual), simply navigate to each sub-directory. [Cluster]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/Cluster.html diff --git a/manual/custom_codecs/README.md b/manual/custom_codecs/README.md index b4e0d3ef040..f645610291f 100644 --- a/manual/custom_codecs/README.md +++ b/manual/custom_codecs/README.md @@ -456,14 +456,14 @@ consider using prepared statements all the time. [accepts]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/TypeCodec.html#accepts-com.datastax.driver.core.DataType- [CodecRegistry]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/CodecRegistry.html [CodecNotFoundException]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/exceptions/CodecNotFoundException.html -[Jackson]: http://wiki.fasterxml.com/JacksonHome +[Jackson]: https://github.com/FasterXML/jackson [AbstractType]: https://github.com/apache/cassandra/blob/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java [UserType]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/UserType.html [UDTValue]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/UDTValue.html [TupleType]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/TupleType.html [TupleValue]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/TupleValue.html [CustomType]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/DataType.CustomType.html -[TypeToken]: http://docs.guava-libraries.googlecode.com/git/javadoc/com/google/common/reflect/TypeToken.html +[TypeToken]: https://google.github.io/guava/releases/19.0/api/docs/com/google/common/reflect/TypeToken.html [SimpleStatement]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/SimpleStatement.html [BuiltStatement]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/querybuilder/BuiltStatement.html [setList]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/SettableByIndexData.html#setList-int-java.util.List- diff --git a/manual/custom_codecs/extras/README.md b/manual/custom_codecs/extras/README.md index 118ea13b3bb..bb46448e5fc 100644 --- a/manual/custom_codecs/extras/README.md +++ b/manual/custom_codecs/extras/README.md @@ -130,7 +130,7 @@ Time can also be expressed as simple durations: * [SimpleDateCodec] maps `date` to a primitive Java `int` representing the number of days since the Epoch. There is no extra codec for `time`, because by default the driver already maps that type to a `long` representing the -number of milliseconds since midnight. +number of nanoseconds since midnight. [SimpleTimestampCodec]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/extras/codecs/date/SimpleTimestampCodec.html [SimpleDateCodec]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/extras/codecs/date/SimpleDateCodec.html @@ -218,7 +218,7 @@ session.execute("insert into example (id, owner) values (1, ?)", ``` [JacksonJsonCodec]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/extras/codecs/json/JacksonJsonCodec.html -[Jackson]: http://wiki.fasterxml.com/JacksonHome +[Jackson]: https://github.com/FasterXML/jackson #### JSR 353 @@ -311,7 +311,7 @@ often. [OptionalCodec]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/extras/codecs/jdk8/OptionalCodec.html [Optional]: https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html -[TypeToken]: http://docs.guava-libraries.googlecode.com/git/javadoc/com/google/common/reflect/TypeToken.html +[TypeToken]: http://google.github.io/guava/releases/19.0/api/docs/com/google/common/reflect/TypeToken.html #### Guava @@ -354,7 +354,7 @@ session.execute(pst.bind() See the JDK8 Optional section above for explanations about [TypeToken]. [OptionalCodec_guava]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/extras/codecs/guava/OptionalCodec.html -[Optional_guava]: http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/com/google/common/base/Optional.html +[Optional_guava]: http://google.github.io/guava/releases/19.0/api/docs/com/google/common/base/Optional.html ### Arrays diff --git a/manual/retries/README.md b/manual/retries/README.md index ed33ffd6713..8f9de6e0044 100644 --- a/manual/retries/README.md +++ b/manual/retries/README.md @@ -158,7 +158,7 @@ implementations to handle idempotence (the new behavior is equivalent to what yo [onReadTimeout]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onReadTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-boolean-int- [onWriteTimeout]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onWriteTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.WriteType-int-int-int- [onUnavailable]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onUnavailable-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-int- -[onRequestError]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/policies/ExtendedRetryPolicy.html#onRequestError-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-java.lang.Exception-int- +[onRequestError]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onRequestError-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-java.lang.Exception-int- [UnavailableException]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/exceptions/UnavailableException.html [ReadTimeoutException]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/exceptions/ReadTimeoutException.html [WriteTimeoutException]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/exceptions/WriteTimeoutException.html