Console Output
+ git merge --ff appng-1.24.5-SNAPSHOT --strategy-option theirs
Updating 02529427..8ac5cba9
Fast-forward
README.adoc | 4 +-
appng-api/pom.xml | 2 +-
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 2 +-
appng-application-camunda/README.adoc | 4 +-
appng-application-camunda/pom.xml | 2 +-
appng-application-parent/pom.xml | 2 +-
appng-application/README.adoc | 4 +-
appng-application/pom.xml | 2 +-
appng-appngizer-jaxb/pom.xml | 2 +-
appng-appngizer-maven-plugin/pom.xml | 2 +-
appng-appngizer/pom.xml | 2 +-
appng-archetype-application/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
appng-camunda/pom.xml | 2 +-
appng-cli/pom.xml | 2 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
appng-core/pom.xml | 2 +-
.../org/appng/core/domain/JobExecutionRecord.java | 32 ++++-----------
.../main/java/org/appng/core/domain/JobRecord.java | 27 ++++++++++++
.../java/org/appng/core/domain/JobRecordBase.java | 48 ++++++++++++++++++++++
.../appng/core/repository/JobRecordRepository.java | 34 +++++++++++++++
.../JobExecutionRecordRepositoryTest.java | 11 +++++
.../appng/core/service/AppNGTestDataProvider.java | 1 +
.../src/test/resources/META-INF/persistence.xml | 4 ++
appng-documentation/pom.xml | 2 +-
.../src/main/asciidoc/listing/dependencies.txt | 8 ++--
appng-forms/pom.xml | 2 +-
appng-formtags/pom.xml | 2 +-
appng-mail/pom.xml | 2 +-
appng-maven-plugin/README.adoc | 4 +-
appng-maven-plugin/pom.xml | 2 +-
appng-persistence/pom.xml | 2 +-
appng-rest-api/pom.xml | 2 +-
appng-search/pom.xml | 2 +-
appng-taglib/pom.xml | 2 +-
appng-template-assembly/pom.xml | 2 +-
appng-template-parent/pom.xml | 2 +-
appng-testsupport/pom.xml | 2 +-
appng-tools/pom.xml | 2 +-
appng-upngizr/README.adoc | 4 +-
appng-xmlapi/pom.xml | 2 +-
pom.xml | 8 +++-
43 files changed, 183 insertions(+), 67 deletions(-)
create mode 100644 appng-core/src/main/java/org/appng/core/domain/JobRecord.java
create mode 100644 appng-core/src/main/java/org/appng/core/domain/JobRecordBase.java
create mode 100644 appng-core/src/main/java/org/appng/core/repository/JobRecordRepository.java