0005140: Upgrade to gradle version 6.9.1

asciidoc plugin upgrade

symmetric-assemble/asciidoc.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'org.asciidoctor.gradle.asciidoctor'
+apply plugin: 'org.asciidoctor.jvm.convert'
 apply plugin: 'docbook-reference'
 
 configurations{ 
@@ -249,9 +249,12 @@ task publishDoc {
 }
 
 asciidoctor { (1)
-    backends = docFormat.split ","
+	baseDirFollowsSourceDir()
     sourceDir = file(symAssembleDir + '/src/asciidoc')
-    outputDir = file("$buildDir/src/asciidoc")
+    outputDir = file("$buildDir/src/asciidoc/" + docFormat)
+	outputOptions {
+        backends docFormat
+    }
     options = [
         doctype: 'book',
         sourceDocumentNames: [
@@ -260,12 +263,12 @@ asciidoctor { (1)
             symAssembleDir + 'tutorials/tutorials.ad',
             symAssembleDir + 'operations/operations.ad']
     ]    
-    attributes = [
+    attributes \
         'source-highlighter':'coderay',
         'data-uri':'true'
-    ]
+
     if (project.properties.containsKey('pro')) {
-       attributes['pro'] = 'true'  
+       attributes 'pro':'true'
     }     
 }
 

symmetric-assemble/build.gradle

@@ -5,8 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
-        classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
+        classpath 'org.asciidoctor:asciidoctorj-pdf:1.6.2'
         classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
         classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
 		classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.14.2'
@@ -17,6 +16,7 @@ plugins {
     id "org.sonarqube" version "3.3"
 	id "com.github.hierynomus.license" version "0.15.0"
 	id 'com.vaadin' version '0.14.6.0' apply false
+	id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
 }
 
 apply plugin: 'java-library'

symmetric-assemble/src/asciidoc/advanced/offline.ad

@@ -6,7 +6,7 @@ Configuring a node as offline will still allow changes to be captured and batche
 
 ifdef::pro[]
 .Configure the offline jobs to run
-image::advanced/offline-start-jobs.png[]
+image::images/advanced/offline-start-jobs.png[]
 endif::pro[]
 
 ifndef::pro[]
@@ -26,7 +26,7 @@ endif::pro[]
 
 ifdef::pro[]
 .Configure the offline parameter for the node that will be offline
-image::advanced/offline-node-parameter.png[]
+image::images/advanced/offline-node-parameter.png[]
 endif::pro[]
 
 ifndef::pro[]
@@ -42,11 +42,11 @@ endif::pro[]
 
 * At the offline store node, the parameter immediately affects the behavior of the push and pull jobs, so outgoing batches intended for CORP are now written as files. Other nodes are unaffected. All outstanding batches for CORP are immediately written to files. As new changes occur going forward, any batches for CORP will also be written as files. In this example, two batches of data are written.
 
-image::advanced/offline_sync_node1_before.png[]
+image::images/advanced/offline_sync_node1_before.png[]
 
 * Finally, move the batch files to their respective incoming folder. After moving the files, the folders will contain the files depicted below.
 
-image::advanced/offline_sync.png[]
+image::images/advanced/offline_sync.png[]
 
 ==== Turn offline node online again
 

symmetric-assemble/src/asciidoc/appendix.ad

@@ -8,14 +8,14 @@ SymmetricDS configuration is entered by the user into the data model to control
 synchronized to which nodes.
 
 .Configuration Data Model
-image::data-model-config.gif[]
+image::images/data-model-config.gif[]
 
 At runtime, the configuration is used to capture data changes and route them to nodes. The data changes are placed 
 together in a single unit called a batch that can be loaded by another node. Outgoing batches are delivered to nodes 
 and acknowledged. Incoming batches are received and loaded. History is recorded for batch status changes and statistics.
 
 .Runtime Data Model
-image::data-model-runtime.gif[]
+image::images/data-model-runtime.gif[]
 
 include::generated/schema.ad[]
 
@@ -96,7 +96,7 @@ IMPORTANT: Stop SymmetricDS and close the SymmetricDS Pro Control Center before
 [.float-group]
 --
 [.left.text-left]
-image::install/install1.png[]
+image::images/install/install1.png[]
 
 The first screen shows the SymmetricDS Pro software version.
 The setup program will ask a series of questions before writing files to disk.
@@ -108,7 +108,7 @@ To begin selecting options, click *Next*.
 [.float-group]
 --
 [.left.text-left]
-image::install/install2.png[]
+image::images/install/install2.png[]
 
 Carefully read the SymmetricDS Pro License Agreement.
 
@@ -119,7 +119,7 @@ If you accept, select *I accept the terms of this license agreement* and click *
 [.float-group]
 --
 [.left.text-left]
-image::upgrade/upgrade-1.png[]
+image::images/upgrade/upgrade-1.png[]
 
 Specify *Upgrade existing software* to upgrade an existing version of SymmetricDS to a newer version.
 
@@ -132,7 +132,7 @@ Click *Next* to continue.
 [.float-group]
 --
 [.left.text-left]
-image::upgrade/upgrade-2.png[]
+image::images/upgrade/upgrade-2.png[]
 
 Provide the directory of the existing installation.
 The directory will be verified as a valid installation of SymmetricDS
@@ -145,7 +145,7 @@ Choose the directory path, then click *Next* to continue.
 [.float-group]
 --
 [.left.text-left]
-image::install/install5.png[]
+image::images/install/install5.png[]
 
 Select the packages you want to upgrade and verify disk space requirements are met.
 By default, all packages are selected.
@@ -159,7 +159,7 @@ After selecting packages, click *Next*.
 [.float-group]
 --
 [.left.text-left]
-image::install/install10.png[]
+image::images/install/install10.png[]
 
 Confirm your upgrade settings look correct.
 
@@ -170,7 +170,7 @@ Click *Next* to begin upgrading and installing files.
 [.float-group]
 --
 [.left.text-left]
-image::install/install11.png[]
+image::images/install/install11.png[]
 
 The packages you selected are upgraded or installed to disk.
 For some upgrades, it may add or adjust settings in the "conf" subdirectory to accommodate the new version.
@@ -182,7 +182,7 @@ After it finishes, click *Next*.
 [.float-group]
 --
 [.left.text-left]
-image::upgrade/upgrade-3.png[]
+image::images/upgrade/upgrade-3.png[]
 
 During the finish step, it will upgrade the module system 
 (optional packages that were installed outside of the setup program) and perform any cleanup. 
@@ -194,7 +194,7 @@ After it finishes, click *Next*.
 [.float-group]
 --
 [.left.text-left]
-image::install/install13.png[]
+image::images/install/install13.png[]
 
 The upgrade is now complete.  Choose if you want to open the SymmetricDS Pro Control Center where
 you can view the server status and open a web console.
@@ -206,7 +206,7 @@ Click *Done* to exit the setup program.
 [.float-group]
 --
 [.left.text-left]
-image::install/install14.png[]
+image::images/install/install14.png[]
 
 From the SymmetricDS Pro Control Center, you can start the server again.
 On the first startup after an upgrade, the server will make any required alterations

symmetric-assemble/src/asciidoc/appendix/bigquery.ad

@@ -10,12 +10,12 @@ Send changes from your relational database to Google's BigQuery.
 
 ==== Setup
 
-BigQuery is only supported as a load only node in SymmetricDS.  See <<Load Only Node >> for details on setting up a load only node in SymmetricDS.
+BigQuery is only supported as a load only node in SymmetricDS.  See <<Load Only Node>> for details on setting up a load only node in SymmetricDS.
 
 ifdef::pro[]
 Setup the BigQuery node by using the <<Add Node>> wizard and selecting BigQuery as the type.  
 
-image::appendix/bigquery-database-settings.png[]
+image::images/appendix/bigquery-database-settings.png[]
 
 After hitting next you can setup advanced options for your Snowflake node.
 
@@ -67,7 +67,7 @@ Provide this file path on the advanced settings while setting up a BigQuery node
 NOTE: You will need to use your Google BigQuery dataset name in the target schema of the router that is used to route data to BigQuery.
 ====
 
-image::appendix/bigquery-advanced-settings.png[]
+image::images/appendix/bigquery-advanced-settings.png[]
 endif::pro[]
 ifndef::pro[] 
 [source, properties]

symmetric-assemble/src/asciidoc/appendix/databases.ad

@@ -7,7 +7,7 @@ by database.
 
 .Support by Database
 [cols="15,13,^12,^12,^12,^12,^12,^12,^12,^12", options="header"]
-|====
+|===
 |Database
 |Versions
 |Transaction Identifier
@@ -328,7 +328,7 @@ by database.
 | 
 |
 
-|====
+|===
 
 Database *:: Asterisk (*) next to database indicates the database support is available in https://www.jumpmind.com/products/symmetricds/symmetricds-overview[SymmetricDS Pro] only.
 
@@ -533,32 +533,32 @@ When locating a table, SymmetricDS uses the default catalog and schema unless th
 |select sys_context('USERENV', 'CURRENT_SCHEMA') from dual
 
 |===
-include::bigquery.ad[]
-include::db2.ad[]
-include::derby.ad[]
-include::elasticsearch.ad[]
-include::firebird.ad[]
-include::greenplum.ad[]
-include::h2.ad[]
-include::hbase.ad[]
-include::hsqldb.ad[]
-include::ignite.ad[]
-include::informix.ad[]
-include::ingres.ad[]
-include::interbase.ad[]
-include::kafka.ad[]
-include::mariadb.ad[]
-include::mongodb.ad[]
-include::mssqlserver.ad[]
-include::mysql.ad[]
-include::opensearch.ad[]
-include::oracle.ad[]
-include::postgresql.ad[]
-include::redshift.ad[]
-include::snowflake.ad[]
-include::sqlite.ad[]
-include::sybase-ase.ad[]
-include::sybase-sqlanywhere.ad[]
-include::S3.ad[]
-include::teradata.ad[]
-include::tibero.ad[]
+include::{includedir}/appendix/bigquery.ad[]
+include::{includedir}/appendix/db2.ad[]
+include::{includedir}/appendix/derby.ad[]
+include::{includedir}/appendix/elasticsearch.ad[]
+include::{includedir}/appendix/firebird.ad[]
+include::{includedir}/appendix/greenplum.ad[]
+include::{includedir}/appendix/h2.ad[]
+include::{includedir}/appendix/hbase.ad[]
+include::{includedir}/appendix/hsqldb.ad[]
+include::{includedir}/appendix/ignite.ad[]
+include::{includedir}/appendix/informix.ad[]
+include::{includedir}/appendix/ingres.ad[]
+include::{includedir}/appendix/interbase.ad[]
+include::{includedir}/appendix/kafka.ad[]
+include::{includedir}/appendix/mariadb.ad[]
+include::{includedir}/appendix/mongodb.ad[]
+include::{includedir}/appendix/mssqlserver.ad[]
+include::{includedir}/appendix/mysql.ad[]
+include::{includedir}/appendix/opensearch.ad[]
+include::{includedir}/appendix/oracle.ad[]
+include::{includedir}/appendix/postgresql.ad[]
+include::{includedir}/appendix/redshift.ad[]
+include::{includedir}/appendix/snowflake.ad[]
+include::{includedir}/appendix/sqlite.ad[]
+include::{includedir}/appendix/sybase-ase.ad[]
+include::{includedir}/appendix/sybase-sqlanywhere.ad[]
+include::{includedir}/appendix/S3.ad[]
+include::{includedir}/appendix/teradata.ad[]
+include::{includedir}/appendix/tibero.ad[]

symmetric-assemble/src/asciidoc/appendix/dataformat.ad

@@ -85,6 +85,6 @@ catalog,
 table, item_selling_price
 update, 55, 0.75, 0.65, 55
 commit, 100
-----      
+----
 ====
 

symmetric-assemble/src/asciidoc/appendix/dbcompare.ad

@@ -6,11 +6,11 @@ ifdef::pro[]
 The dbcompare wizard is accessible for multi-homed nodes from the explore tab of the pro console.  
 The pop-up window asks for source and target engines for the comparison as well as the the tables to be compared.  
 
-image::appendix/dbcompare/dbcompare-tab.png[width=600]
+image::images/appendix/dbcompare/dbcompare-tab.png[width=600]
 
 The next window allows specific tables to be selected for comparison.
 
-image::appendix/dbcompare/dbcompare-table-select.png[width=600]
+image::images/appendix/dbcompare/dbcompare-table-select.png[width=600]
 
 The results of the compare can be presented in four ways:
 
@@ -21,11 +21,11 @@ The results of the compare can be presented in four ways:
 
 The *Show Report* option will open a new tab in the SQL editor showing the results of the compare.
 
-image::appendix/dbcompare/dbcompare-results-table.png[]
+image::images/appendix/dbcompare/dbcompare-results-table.png[]
 
 The *Write Differences to SQL Editor* option will write all the required SQL to get the tables in sync and copy it to the current instance of the SQL editor.
 
-image::appendix/dbcompare/dbcompare-write-sql.png[]
+image::images/appendix/dbcompare/dbcompare-write-sql.png[]
 
 The *Write Differences to File* option will write the required SQL to get the tables in sync to the file system.
 
@@ -50,7 +50,7 @@ Possible options include:
 
 ** Example of config properties file:
 
-image::appendix/dbcompare/dbcompare-config.png[width=1000]
+image::images/appendix/dbcompare/dbcompare-config.png[width=1000]
 
 - *--date-time-format <arg>*: The format to be used when comparing date time values. For example, using the format 'yyyy-MM-dd HH:mm:ss' would convert date time values into yyyy-MM-dd HH:mm:ss and then compare.
 - *--exclude <arg>* : A comma-separated list of table names to exclude from comparison.
@@ -63,7 +63,7 @@ image::appendix/dbcompare/dbcompare-config.png[width=1000]
 
 An example DbCompare results table is shown below:
 
-image::appendix/dbcompare/dbcompare-results.png[width=1000]
+image::images/appendix/dbcompare/dbcompare-results.png[width=1000]
 
 The results table gives info from the compare as table columns.  The data includes the number of rows *Matched*, *Different*, *Missing*, and *Extra* between the two source and target tables.