Skip to content

Commit 9f6ff9d

Browse files
author
Eric Harmeling
committed
rafiss feedback
1 parent af72ea6 commit 9f6ff9d

12 files changed

+25
-21
lines changed

‎_includes/v19.2/app/java-tls-note.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{site.data.alerts.callout_danger}}
2+
CockroachDB versions v20.1 and lower require TLS 1.2. By default, Java 8 uses TLS 1.2, but applications running on Java 9+ must be configured to run TLS 1.2. For example, when starting your app: `$ java -Djdk.tls.client.protocols=TLSv1.2 appName`
3+
{{site.data.alerts.end}}

‎_includes/v19.2/app/jdbc-version-note.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_includes/v20.1/app/java-tls-note.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{site.data.alerts.callout_danger}}
2+
CockroachDB versions v20.1 and lower require TLS 1.2. By default, Java 8 uses TLS 1.2, but applications running on Java 9+ must be configured to run TLS 1.2. For example, when starting your app: `$ java -Djdk.tls.client.protocols=TLSv1.2 appName`
3+
{{site.data.alerts.end}}

‎_includes/v20.1/app/jdbc-version-note.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_includes/v20.2/app/java-tls-note.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{{site.data.alerts.callout_danger}}
2+
CockroachDB versions v20.2 and higher support TLS 1.2 and 1.3, and use 1.3 by default.
3+
4+
A bug in the TLS 1.3 implementation in Java 11 versions lower than 11.0.7 and Java 13 versions lower than 13.0.3 makes the versions incompatible with CockroachDB. For applications running Java 11 or 13, make sure that you have version 11.0.7 or higher, or 13.0.3 or higher.
5+
6+
If you cannot upgrade to a version higher than 11.0.7 or 13.0.3, you must configure the application to use TLS 1.2. For example, when starting your app: `$ java -Djdk.tls.client.protocols=TLSv1.2 appName`
7+
{{site.data.alerts.end}}

‎_includes/v20.2/app/jdbc-version-note.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎v19.2/build-a-java-app-with-cockroachdb.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ This tutorial shows you how to build a simple Java application with CockroachDB
2121

2222
## Step 1. Install the Java JDBC driver
2323

24-
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
25-
26-
{% include {{page.version.version}}/app/jdbc-version-note.md %}
24+
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html). We recommend using the latest PostgreSQL JDBC 42.2.x driver.
2725

2826
<section class="filter-content" markdown="1" data-scope="secure">
2927

‎v19.2/install-client-drivers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
131131

132132
{% include {{page.version.version}}/app/java-version-note.md %}
133133

134+
{% include {{page.version.version}}/app/java-tls-note.md %}
135+
134136
## Drivers
135137

136138
### JDBC
137139

138140
**Support level:** Full
139141

140-
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
141-
142-
{% include {{page.version.version}}/app/jdbc-version-note.md %}
142+
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html). We recommend using the latest PostgreSQL JDBC 42.2.x driver.
143143

144144
For a simple but complete "Hello World" example app, see [Build a Java App with CockroachDB and JDBC](build-a-java-app-with-cockroachdb.html).
145145

‎v20.1/build-a-java-app-with-cockroachdb.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ For a sample app and tutorial that uses Spring Data JDBC and CockroachDB, see [B
2626

2727
## Step 1. Install the Java JDBC driver
2828

29-
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
30-
31-
{% include {{page.version.version}}/app/jdbc-version-note.md %}
29+
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html). We recommend using the latest PostgreSQL JDBC 42.2.x driver.
3230

3331
<section class="filter-content" markdown="1" data-scope="secure">
3432

‎v20.1/install-client-drivers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
132132

133133
{% include {{page.version.version}}/app/java-version-note.md %}
134134

135+
{% include {{page.version.version}}/app/java-tls-note.md %}
136+
135137
### JDBC
136138

137139
**Support level:** Full
138140

139-
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
140-
141-
{% include {{page.version.version}}/app/jdbc-version-note.md %}
141+
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html). We recommend using the latest PostgreSQL JDBC 42.2.x driver.
142142

143143
For a simple but complete "Hello World" example app, see [Build a Java App with CockroachDB and JDBC](build-a-java-app-with-cockroachdb.html).
144144

‎v20.2/build-a-java-app-with-cockroachdb.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ For a sample app and tutorial that uses Spring Data JDBC and CockroachDB, see [B
2626

2727
## Step 1. Install the Java JDBC driver
2828

29-
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
30-
31-
{% include {{page.version.version}}/app/jdbc-version-note.md %}
29+
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html). We recommend using the latest PostgreSQL JDBC 42.2.x driver.
3230

3331
<section class="filter-content" markdown="1" data-scope="secure">
3432

‎v20.2/install-client-drivers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
130130

131131
{% include {{page.version.version}}/app/java-version-note.md %}
132132

133+
{% include {{page.version.version}}/app/java-tls-note.md %}
134+
133135
## Drivers
134136

135137
### JDBC
136138

137139
**Support level:** Full
138140

139-
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
140-
141-
{% include {{page.version.version}}/app/jdbc-version-note.md %}
141+
Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html). We recommend using the latest PostgreSQL JDBC 42.2.x driver.
142142

143143
For a simple but complete "Hello World" example app, see [Build a Java App with CockroachDB and JDBC](build-a-java-app-with-cockroachdb.html).
144144

0 commit comments

Comments
 (0)