Updated version guidance on Java docs

Eric Harmeling · Eric Harmeling · commit af72ea67032d · 2020-08-12T11:50:07.000-04:00
diff --git a/_includes/v19.2/app/BasicExample.java b/_includes/v19.2/app/BasicExample.java
@@ -39,6 +39,7 @@ public static void main(String[] args) {
         ds.setPassword(null);
         ds.setSsl(true);
         ds.setSslMode("require");
+        ds.setSslRootCert("certs/client.root.crt");
         ds.setSslCert("certs/client.maxroach.crt");
         ds.setSslKey("certs/client.maxroach.key.pk8");
         ds.setReWriteBatchedInserts(true); // add `rewriteBatchedInserts=true` to pg connection string
diff --git a/_includes/v19.2/app/java-version-note.md b/_includes/v19.2/app/java-version-note.md
@@ -0,0 +1,3 @@
+{{site.data.alerts.callout_info}}
+We recommend using Java versions 8+ with CockroachDB.
+{{site.data.alerts.end}}
diff --git a/_includes/v19.2/app/jdbc-version-note.md b/_includes/v19.2/app/jdbc-version-note.md
@@ -0,0 +1 @@
+We recommend using the latest PostgreSQL JDBC 4.2 driver. All 4.2 versions of the driver are compatible with Java versions 8+.
diff --git a/_includes/v20.1/app/BasicExample.java b/_includes/v20.1/app/BasicExample.java
@@ -39,6 +39,7 @@ public static void main(String[] args) {
         ds.setPassword(null);
         ds.setSsl(true);
         ds.setSslMode("require");
+        ds.setSslRootCert("certs/client.root.crt");
         ds.setSslCert("certs/client.maxroach.crt");
         ds.setSslKey("certs/client.maxroach.key.pk8");
         ds.setReWriteBatchedInserts(true); // add `rewriteBatchedInserts=true` to pg connection string
diff --git a/_includes/v20.1/app/java-version-note.md b/_includes/v20.1/app/java-version-note.md
@@ -0,0 +1,3 @@
+{{site.data.alerts.callout_info}}
+We recommend using Java versions 8+ with CockroachDB.
+{{site.data.alerts.end}}
diff --git a/_includes/v20.1/app/jdbc-version-note.md b/_includes/v20.1/app/jdbc-version-note.md
@@ -0,0 +1 @@
+We recommend using the latest PostgreSQL JDBC 4.2 driver. All 4.2 versions of the driver are compatible with Java versions 8+.
diff --git a/_includes/v20.2/app/BasicExample.java b/_includes/v20.2/app/BasicExample.java
@@ -39,6 +39,7 @@ public static void main(String[] args) {
         ds.setPassword(null);
         ds.setSsl(true);
         ds.setSslMode("require");
+        ds.setSslRootCert("certs/client.root.crt");
         ds.setSslCert("certs/client.maxroach.crt");
         ds.setSslKey("certs/client.maxroach.key.pk8");
         ds.setReWriteBatchedInserts(true); // add `rewriteBatchedInserts=true` to pg connection string
diff --git a/_includes/v20.2/app/java-version-note.md b/_includes/v20.2/app/java-version-note.md
@@ -0,0 +1,3 @@
+{{site.data.alerts.callout_info}}
+We recommend using Java versions 8+ with CockroachDB.
+{{site.data.alerts.end}}
diff --git a/_includes/v20.2/app/jdbc-version-note.md b/_includes/v20.2/app/jdbc-version-note.md
@@ -0,0 +1 @@
+We recommend using the latest PostgreSQL JDBC 4.2 driver. All 4.2 versions of the driver are compatible with Java versions 8+.
diff --git a/v19.2/build-a-java-app-with-cockroachdb-hibernate.md b/v19.2/build-a-java-app-with-cockroachdb-hibernate.md
@@ -13,6 +13,8 @@ twitter: false
 
 This tutorial shows you how build a simple Java application with CockroachDB and the Hibernate ORM.
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For another use of Hibernate with CockroachDB, see our [`examples-orms`](https://github.com/cockroachdb/examples-orms) repository.
 {{site.data.alerts.end}}
@@ -21,10 +23,6 @@ For another use of Hibernate with CockroachDB, see our [`examples-orms`](https:/
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
 
-{{site.data.alerts.callout_danger}}
-The examples on this page assume you are using a Java version <= 9. They do not work with Java 10.
-{{site.data.alerts.end}}
-
 ## Step 1. Install the Gradle build tool
 
 This tutorial uses the [Gradle build tool](https://gradle.org/) to get all dependencies for your application, including Hibernate.
diff --git a/v19.2/build-a-java-app-with-cockroachdb-jooq.md b/v19.2/build-a-java-app-with-cockroachdb-jooq.md
@@ -15,6 +15,8 @@ This tutorial shows you how build a simple Java application with CockroachDB and
 
 CockroachDB is supported in jOOQ [Professional and Enterprise editions](https://www.jooq.org/download/#databases).
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For another use of jOOQ with CockroachDB, see our [`examples-orms`](https://github.com/cockroachdb/examples-orms) repository.
 {{site.data.alerts.end}}
@@ -47,10 +49,6 @@ For other ways to install Maven, see [its official documentation](https://maven.
 
 Download the free trial of jOOQ Professional or Enterprise edition from [jOOQ's website](https://www.jooq.org/download), and unzip the file.
 
-{{site.data.alerts.callout_info}}
-If you have Java 6, Java 8, or Java 11, go to [Download your jOOQ version](https://www.jooq.org/download/versions#trial), and download the free trial of jOOQ for your version of Java.
-{{site.data.alerts.end}}
-
 To install jOOQ to your machine's local Maven repository, run the `maven-install.sh` script included in the jOOQ install folder:
 
 {% include copy-clipboard.html %}
diff --git a/v19.2/build-a-java-app-with-cockroachdb.md b/v19.2/build-a-java-app-with-cockroachdb.md
@@ -13,18 +13,18 @@ twitter: false
 
 This tutorial shows you how to build a simple Java application with CockroachDB and the Java JDBC driver.
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 ## Before you begin
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
 
-{{site.data.alerts.callout_danger}}
-The examples on this page assume you are using a Java version <= 9. They do not work with Java 10.
-{{site.data.alerts.end}}
-
 ## Step 1. Install the Java JDBC driver
 
 Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
 
+{% include {{page.version.version}}/app/jdbc-version-note.md %}
+
 <section class="filter-content" markdown="1" data-scope="secure">
 
 ## Step 2. Create the `maxroach` user and `bank` database
@@ -35,7 +35,7 @@ Download and set up the Java JDBC driver as described in the [official documenta
 
 Create a certificate and key for the `maxroach` user by running the following command. The code samples will run as this user.
 
-<span class="version-tag">New in v19.1</span>: You can pass the [`--also-generate-pkcs8-key` flag](cockroach-cert.html#flag-pkcs8) to generate a key in [PKCS#8 format](https://tools.ietf.org/html/rfc5208), which is the standard key encoding format in Java. In this case, the generated PKCS8 key will be named `client.maxroach.key.pk8`.
+You can pass the [`--also-generate-pkcs8-key` flag](cockroach-cert.html#flag-pkcs8) to generate a key in [PKCS#8 format](https://tools.ietf.org/html/rfc5208), which is the standard key encoding format in Java. In this case, the generated PKCS8 key will be named `client.maxroach.key.pk8`.
 
 {% include copy-clipboard.html %}
 ~~~ shell
@@ -64,7 +64,7 @@ It does all of the above using the practices we recommend for using JDBC with Co
 
 To run it:
 
-1. Download [`BasicExample.java`](https://github.com/raw/cockroachdb/docs/master/_includes/v19.1/app/BasicExample.java), or create the file yourself and copy the code below.
+1. Download [`BasicExample.java`](https://github.com/raw/cockroachdb/docs/master/_includes/{{page.version.version}}/app/BasicExample.java), or create the file yourself and copy the code below.
 2. Compile and run the code (adding the PostgreSQL JDBC driver to your classpath):
 
     {% include copy-clipboard.html %}
@@ -83,7 +83,7 @@ To clone a version of the code below that connects to insecure clusters, run the
 `git clone https://github.com/cockroachlabs/hello-world-java-jdbc/`
 {{site.data.alerts.end}}
 
-The contents of [`BasicExample.java`](https://github.com/raw/cockroachdb/docs/master/_includes/v19.1/app/BasicExample.java):
+The contents of [`BasicExample.java`](https://github.com/raw/cockroachdb/docs/master/_includes/{{page.version.version}}/app/BasicExample.java):
 
 {% include copy-clipboard.html %}
 ~~~ java
@@ -138,7 +138,7 @@ To run it:
     $ java -classpath .:/path/to/postgresql.jar BasicExample
     ~~~
 
-The contents of [`BasicExample.java`](https://github.com/raw/cockroachdb/docs/master/_includes/v19.1/app/insecure/BasicExample.java):
+The contents of [`BasicExample.java`](https://github.com/raw/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/BasicExample.java):
 
 {% include copy-clipboard.html %}
 ~~~ java
diff --git a/v19.2/install-client-drivers.md b/v19.2/install-client-drivers.md
@@ -129,6 +129,8 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
 
 <section class="filter-content" markdown="1" data-scope="java">
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 ## Drivers
 
 ### JDBC
@@ -137,6 +139,8 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
 
 Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
 
+{% include {{page.version.version}}/app/jdbc-version-note.md %}
+
 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).
 
 ## ORMs
diff --git a/v20.1/build-a-java-app-with-cockroachdb-hibernate.md b/v20.1/build-a-java-app-with-cockroachdb-hibernate.md
@@ -14,24 +14,18 @@ twitter: false
 
 This tutorial shows you how build a simple Java application with CockroachDB and the Hibernate ORM.
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For a sample app and tutorial that uses Spring Data JPA (Hibernate) and CockroachDB, see [Build a Spring App with CockroachDB and JPA](build-a-spring-app-with-cockroachdb-jpa.html).
 
 For another use of Hibernate with CockroachDB, see our [`examples-orms`](https://github.com/cockroachdb/examples-orms) repository.
 {{site.data.alerts.end}}
 
-{{site.data.alerts.callout_info}}
-For Java applications that use the Spring framework, see the applications listed under [Java/Spring](build-a-spring-app-with-cockroachdb-mybatis.html).
-{{site.data.alerts.end}}
-
 ## Before you begin
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
 
-{{site.data.alerts.callout_danger}}
-The examples on this page assume you are using a Java version <= 9. They do not work with Java 10.
-{{site.data.alerts.end}}
-
 ## Step 1. Install the Gradle build tool
 
 This tutorial uses the [Gradle build tool](https://gradle.org/) to get all dependencies for your application, including Hibernate.
diff --git a/v20.1/build-a-java-app-with-cockroachdb-jooq.md b/v20.1/build-a-java-app-with-cockroachdb-jooq.md
@@ -16,14 +16,12 @@ This tutorial shows you how build a simple Java application with CockroachDB and
 
 CockroachDB is supported in jOOQ [Professional and Enterprise editions](https://www.jooq.org/download/#databases).
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For another use of jOOQ with CockroachDB, see our [`examples-orms`](https://github.com/cockroachdb/examples-orms) repository.
 {{site.data.alerts.end}}
 
-{{site.data.alerts.callout_info}}
-For Java applications that use the Spring framework, see the applications listed under [Java/Spring](build-a-spring-app-with-cockroachdb-mybatis.html).
-{{site.data.alerts.end}}
-
 ## Before you begin
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
@@ -52,10 +50,6 @@ For other ways to install Maven, see [its official documentation](https://maven.
 
 Download the free trial of jOOQ Professional or Enterprise edition from [jOOQ's website](https://www.jooq.org/download), and unzip the file.
 
-{{site.data.alerts.callout_info}}
-If you have Java 6, Java 8, or Java 11, go to [Download your jOOQ version](https://www.jooq.org/download/versions#trial), and download the free trial of jOOQ for your version of Java.
-{{site.data.alerts.end}}
-
 To install jOOQ to your machine's local Maven repository, run the `maven-install.sh` script included in the jOOQ install folder:
 
 {% include copy-clipboard.html %}
diff --git a/v20.1/build-a-java-app-with-cockroachdb.md b/v20.1/build-a-java-app-with-cockroachdb.md
@@ -14,6 +14,8 @@ twitter: false
 
 This tutorial shows you how to build a simple Java application with CockroachDB and the Java JDBC driver.
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For a sample app and tutorial that uses Spring Data JDBC and CockroachDB, see [Build a Spring App with CockroachDB and JDBC](build-a-spring-app-with-cockroachdb-jdbc.html).
 {{site.data.alerts.end}}
@@ -22,14 +24,12 @@ For a sample app and tutorial that uses Spring Data JDBC and CockroachDB, see [B
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
 
-{{site.data.alerts.callout_danger}}
-The examples on this page assume you are using a Java version <= 9. They do not work with Java 10.
-{{site.data.alerts.end}}
-
 ## Step 1. Install the Java JDBC driver
 
 Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
 
+{% include {{page.version.version}}/app/jdbc-version-note.md %}
+
 <section class="filter-content" markdown="1" data-scope="secure">
 
 ## Step 2. Create the `maxroach` user and `bank` database
diff --git a/v20.1/install-client-drivers.md b/v20.1/install-client-drivers.md
@@ -130,12 +130,16 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
 
 ## Drivers
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 ### JDBC
 
 **Support level:** Full
 
 Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
 
+{% include {{page.version.version}}/app/jdbc-version-note.md %}
+
 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).
 
 ## ORMs
diff --git a/v20.2/build-a-java-app-with-cockroachdb-hibernate.md b/v20.2/build-a-java-app-with-cockroachdb-hibernate.md
@@ -14,6 +14,8 @@ twitter: false
 
 This tutorial shows you how build a simple Java application with CockroachDB and the Hibernate ORM.
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For a sample app and tutorial that uses Spring Data JPA (Hibernate) and CockroachDB, see [Build a Spring App with CockroachDB and JPA](build-a-spring-app-with-cockroachdb-jpa.html).
 
@@ -24,10 +26,6 @@ For another use of Hibernate with CockroachDB, see our [`examples-orms`](https:/
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
 
-{{site.data.alerts.callout_danger}}
-The examples on this page assume you are using a Java version <= 9. They do not work with Java 10.
-{{site.data.alerts.end}}
-
 ## Step 1. Install the Gradle build tool
 
 This tutorial uses the [Gradle build tool](https://gradle.org/) to get all dependencies for your application, including Hibernate.
diff --git a/v20.2/build-a-java-app-with-cockroachdb-jooq.md b/v20.2/build-a-java-app-with-cockroachdb-jooq.md
@@ -16,6 +16,8 @@ This tutorial shows you how build a simple Java application with CockroachDB and
 
 CockroachDB is supported in jOOQ [Professional and Enterprise editions](https://www.jooq.org/download/#databases).
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For another use of jOOQ with CockroachDB, see our [`examples-orms`](https://github.com/cockroachdb/examples-orms) repository.
 {{site.data.alerts.end}}
@@ -48,10 +50,6 @@ For other ways to install Maven, see [its official documentation](https://maven.
 
 Download the free trial of jOOQ Professional or Enterprise edition from [jOOQ's website](https://www.jooq.org/download), and unzip the file.
 
-{{site.data.alerts.callout_info}}
-If you have Java 6, Java 8, or Java 11, go to [Download your jOOQ version](https://www.jooq.org/download/versions#trial), and download the free trial of jOOQ for your version of Java.
-{{site.data.alerts.end}}
-
 To install jOOQ to your machine's local Maven repository, run the `maven-install.sh` script included in the jOOQ install folder:
 
 {% include copy-clipboard.html %}
diff --git a/v20.2/build-a-java-app-with-cockroachdb.md b/v20.2/build-a-java-app-with-cockroachdb.md
@@ -14,6 +14,8 @@ twitter: false
 
 This tutorial shows you how to build a simple Java application with CockroachDB and the Java JDBC driver.
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 {{site.data.alerts.callout_success}}
 For a sample app and tutorial that uses Spring Data JDBC and CockroachDB, see [Build a Spring App with CockroachDB and JDBC](build-a-spring-app-with-cockroachdb-jdbc.html).
 {{site.data.alerts.end}}
@@ -22,14 +24,12 @@ For a sample app and tutorial that uses Spring Data JDBC and CockroachDB, see [B
 
 {% include {{page.version.version}}/app/before-you-begin.md %}
 
-{{site.data.alerts.callout_danger}}
-The examples on this page assume you are using a Java version <= 9. They do not work with Java 10.
-{{site.data.alerts.end}}
-
 ## Step 1. Install the Java JDBC driver
 
 Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
 
+{% include {{page.version.version}}/app/jdbc-version-note.md %}
+
 <section class="filter-content" markdown="1" data-scope="secure">
 
 ## Step 2. Create the `maxroach` user and `bank` database
diff --git a/v20.2/install-client-drivers.md b/v20.2/install-client-drivers.md
@@ -128,6 +128,8 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
 
 <section class="filter-content" markdown="1" data-scope="java">
 
+{% include {{page.version.version}}/app/java-version-note.md %}
+
 ## Drivers
 
 ### JDBC
@@ -136,6 +138,8 @@ For instructions on using peewee with CockroachDB, see the [CockroachDatabase pe
 
 Download and set up the Java JDBC driver as described in the [official documentation](https://jdbc.postgresql.org/documentation/head/setup.html).
 
+{% include {{page.version.version}}/app/jdbc-version-note.md %}
+
 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).
 
 ## ORMs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{{site.data.alerts.callout_info}}`
	`2`	`+We recommend using Java versions 8+ with CockroachDB.`
	`3`	`+{{site.data.alerts.end}}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+We recommend using the latest PostgreSQL JDBC 4.2 driver. All 4.2 versions of the driver are compatible with Java versions 8+.`