Console Output

+ git merge --ff origin/appng-1.18.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 Jenkinsfile                                        |   5 +-
 .../src/main/java/org/appng/api/ScheduledJob.java  |  13 ++
 .../java/org/appng/api/ScheduledJobResult.java     |  70 +++++++++
 .../org/appng/api/support/SiteClassLoader.java     |   7 +-
 appng-application-bom/pom.xml                      |   6 +-
 .../java/org/appng/appngizer/controller/Home.java  |   4 +-
 .../test/resources/xml/database-init-managed.xml   |  69 ++++-----
 .../src/test/resources/xml/database-init.xml       |  69 ++++-----
 .../test/resources/xml/database-root-update.xml    |  28 ++--
 .../appng/cli/commands/heartbeat/HeartBeat.java    |   2 +-
 .../java/org/appng/core/controller/Controller.java |  22 ++-
 .../appng/core/controller/RepositoryWatcher.java   |  12 +-
 .../core/controller/rest/RestDataSourceBase.java   |  38 ++++-
 .../org/appng/core/service/InitializerService.java |  52 +++++--
 .../hsql/V4_0_0__add_job_execution_record.sql      |  15 ++
 .../mssql/V4_0_0__add_job_execution_record.sql     |  15 ++
 .../mysql/V4_0_0__add_job_execution_record.sql     |  15 ++
 .../appng/core/service/DatabaseServiceTest.java    |   6 +-
 .../core/service/SiteClassLoaderBuilderTest.java   |  44 ++++++
 .../src/test/resources/rest/datasource-result.json |   3 +-
 .../src/main/asciidoc/developerguide.adoc          |   6 +-
 .../src/main/asciidoc/parts/actions.adoc           |   4 +-
 .../src/main/asciidoc/parts/api.adoc               |   4 +-
 .../src/main/asciidoc/parts/application.adoc       |  36 +++--
 .../src/main/asciidoc/parts/jpa.adoc               | 167 ++++++++++++++-------
 appng-tools/pom.xml                                |   4 +-
 .../java/org/appng/tools/file/MagicByteCheck.java  |  14 +-
 .../org/appng/tools/file/MagicByteCheckTest.java   |   4 +-
 pom.xml                                            |   6 +-
 29 files changed, 530 insertions(+), 210 deletions(-)
 create mode 100644 appng-api/src/main/java/org/appng/api/ScheduledJobResult.java
 create mode 100644 appng-core/src/main/resources/db/migration/hsql/V4_0_0__add_job_execution_record.sql
 create mode 100644 appng-core/src/main/resources/db/migration/mssql/V4_0_0__add_job_execution_record.sql
 create mode 100644 appng-core/src/main/resources/db/migration/mysql/V4_0_0__add_job_execution_record.sql
 create mode 100644 appng-core/src/test/java/org/appng/core/service/SiteClassLoaderBuilderTest.java