Console Output
+ git merge --ff appng-1.20.x --strategy-option theirs
Updating aae02de8..a66e6965
Fast-forward
README.adoc | 4 +-
appng-api/pom.xml | 2 +-
.../java/org/appng/api/support/OptionsBuilder.java | 6 +-
.../api/support/environment/AttributeWrapper.java | 16 +-
.../api/support/field/DateFieldConverter.java | 101 +++--
.../validation/DefaultValidationProvider.java | 6 +-
.../appng/api/support/SelectionBuilderTest.java | 15 +-
.../appng/api/support/ValidationProviderTest.java | 39 ++
.../support/environment/AttributeWrapperTest.java | 40 ++
...ava => DateFieldConverterJodaDateTimeTest.java} | 14 +-
.../field/DateFieldConverterJodaLocalDateTest.java | 64 +++
.../DateFieldConverterJodaLocalDateTimeTest.java | 40 ++
.../field/DateFieldConverterLocalDateTest.java | 64 +++
.../field/DateFieldConverterLocalDateTimeTest.java | 39 ++
.../DateFieldConverterOffsetDateTimeTest.java | 39 ++
.../api/support/field/DateFieldConverterTest.java | 14 +-
.../field/DateFieldConverterZonedDateTimeTest.java | 45 ++
...ValidationMetaDataParametrizedParent-before.xml | 5 +
...testAddValidationMetaDataParametrizedParent.xml | 14 +
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 479 ++++++++++-----------
appng-application-bom/readme.txt | 2 +-
appng-application-camunda/pom.xml | 6 +-
appng-application-parent/pom.xml | 10 +-
appng-application/pom.xml | 2 +-
appng-appngizer-jaxb/pom.xml | 4 +-
appng-appngizer-maven-plugin/pom.xml | 2 +-
appng-appngizer/pom.xml | 2 +-
.../test/resources/xml/database-init-managed.xml | 2 +-
.../src/test/resources/xml/database-init.xml | 2 +-
.../test/resources/xml/database-root-update.xml | 2 +-
.../src/test/resources/xml/database.xml | 2 +-
appng-archetype-application/pom.xml | 2 +-
appng-archetype-application/readme.txt | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 6 +-
appng-camunda/pom.xml | 4 +-
appng-cli/pom.xml | 2 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
appng-core/pom.xml | 20 +-
.../core/controller/filter/RedirectFilter.java | 28 +-
.../org/appng/core/domain/JobExecutionRecord.java | 40 ++
.../core/repository/ApplicationRepository.java | 2 -
.../repository/DatabaseConnectionRepository.java | 2 -
.../org/appng/core/repository/GroupRepository.java | 2 -
.../repository/JobExecutionRecordRepository.java | 34 ++
.../core/repository/PermissionRepository.java | 2 -
.../appng/core/repository/PropertyRepository.java | 2 -
.../org/appng/core/repository/RepoRepository.java | 2 -
.../appng/core/repository/ResourceRepository.java | 2 -
.../org/appng/core/repository/RoleRepository.java | 6 +-
.../core/repository/SiteApplicationRepository.java | 2 -
.../org/appng/core/repository/SiteRepository.java | 2 -
.../appng/core/repository/SubjectRepository.java | 2 -
.../org/appng/core/repository/package-info.java | 4 +-
.../appng/core/controller/PlatformConfigTest.java | 2 +-
.../core/controller/filter/RedirectFilterTest.java | 84 ++--
.../JobExecutionRecordRepositoryTest.java | 50 +++
.../core/security/BCryptPasswordHandlerTest.java | 2 +-
.../core/security/Sha1PasswordHandlerTest.java | 2 +-
.../src/test/resources/META-INF/persistence.xml | 4 +
appng-documentation/pom.xml | 10 +-
.../src/main/asciidoc/listing/dependencies.txt | 83 ++--
.../src/main/asciidoc/parts/datasources.adoc | 12 +-
appng-forms/pom.xml | 2 +-
appng-formtags/pom.xml | 2 +-
appng-mail/pom.xml | 2 +-
appng-maven-plugin/pom.xml | 4 +-
appng-persistence/pom.xml | 6 +-
.../appng/persistence/repository/SearchQuery.java | 298 +++++++++----
.../persistence/repository/SearchQueryTest.java | 14 +
.../repository/TestEntitySearchQuery.java | 49 +++
appng-rest-api/pom.xml | 10 +-
appng-search/pom.xml | 10 +-
.../org/appng/search/indexer/DocumentIndexer.java | 6 +-
.../appng/search/searcher/StandardSearcher.java | 2 +-
.../src/test/resources/search_result_de.html | 8 +-
appng-standalone/pom.xml | 14 +-
appng-taglib/pom.xml | 2 +-
.../java/org/appng/taglib/search/SearchTest.java | 2 +-
appng-template-assembly/pom.xml | 2 +-
appng-template-parent/pom.xml | 8 +-
appng-testsupport/pom.xml | 2 +-
appng-tools/pom.xml | 2 +-
appng-upngizr/README.adoc | 2 +-
appng-upngizr/pom.xml | 4 +-
appng-xmlapi/pom.xml | 2 +-
appng-xmlapi/src/test/resources/xsl/include-1.xsl | 4 +-
appng-xmlapi/src/test/resources/xsl/include-2.xsl | 4 +-
appng-xmlapi/src/test/resources/xsl/include-3.xsl | 4 +-
appng-xmlapi/src/test/resources/xsl/platform.xsl | 4 +-
appng-xmlapi/src/test/resources/xsl/result.xsl | 2 +-
changelog.txt | 12 +
pom.xml | 186 ++++----
93 files changed, 1500 insertions(+), 671 deletions(-)
create mode 100644 appng-api/src/test/java/org/appng/api/support/environment/AttributeWrapperTest.java
rename appng-api/src/test/java/org/appng/api/support/field/{DateFieldConverterDateTimeTest.java => DateFieldConverterJodaDateTimeTest.java} (76%)
create mode 100644 appng-api/src/test/java/org/appng/api/support/field/DateFieldConverterJodaLocalDateTest.java
create mode 100644 appng-api/src/test/java/org/appng/api/support/field/DateFieldConverterJodaLocalDateTimeTest.java
create mode 100644 appng-api/src/test/java/org/appng/api/support/field/DateFieldConverterLocalDateTest.java
create mode 100644 appng-api/src/test/java/org/appng/api/support/field/DateFieldConverterLocalDateTimeTest.java
create mode 100644 appng-api/src/test/java/org/appng/api/support/field/DateFieldConverterOffsetDateTimeTest.java
create mode 100644 appng-api/src/test/java/org/appng/api/support/field/DateFieldConverterZonedDateTimeTest.java
create mode 100644 appng-api/src/test/resources/xml/ValidationProviderTest-testAddValidationMetaDataParametrizedParent-before.xml
create mode 100644 appng-api/src/test/resources/xml/ValidationProviderTest-testAddValidationMetaDataParametrizedParent.xml
create mode 100644 appng-core/src/main/java/org/appng/core/domain/JobExecutionRecord.java
create mode 100644 appng-core/src/main/java/org/appng/core/repository/JobExecutionRecordRepository.java
create mode 100644 appng-core/src/test/java/org/appng/core/repository/JobExecutionRecordRepositoryTest.java
create mode 100644 appng-persistence/src/test/java/org/appng/persistence/repository/TestEntitySearchQuery.java
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
