Console Output
[appng] Running shell script
+ git merge --ff appng-1.17.x --strategy-option theirs
Updating ff78552..0e39aac
Fast-forward
CONTRIBUTING.adoc | 2 +-
Jenkinsfile | 59 +++++++
README.adoc | 11 +-
appng-api/pom.xml | 2 +-
.../src/main/java/org/appng/api/Platform.java | 15 +-
appng-api/src/main/java/org/appng/api/Request.java | 8 +
.../src/main/java/org/appng/api/Webservice.java | 12 +-
.../java/org/appng/api/messaging/Messaging.java | 10 +-
.../java/org/appng/api/messaging/Serializer.java | 12 +-
.../api/support/ApplicationConfigProviderImpl.java | 30 +---
.../org/appng/api/support/ApplicationRequest.java | 12 +-
.../api/support/ApplicationResourceHolder.java | 24 +--
.../org/appng/api/support/HttpHeaderUtils.java | 135 ++++++++++++++-
.../java/org/appng/api/support/OptionImpl.java | 2 +-
.../java/org/appng/api/support/OptionImplTest.java | 9 +
.../org/appng/api/support/OptionsImplTest.java | 1 +
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 40 +++--
appng-application-camunda/README.adoc | 4 +-
appng-application-camunda/pom.xml | 2 +-
appng-application-parent/pom.xml | 12 +-
appng-application/README.adoc | 4 +-
appng-application/pom.xml | 2 +-
appng-appngizer-jaxb/pom.xml | 2 +-
appng-appngizer-maven-plugin/pom.xml | 12 +-
appng-appngizer/pom.xml | 5 +-
appng-appngizer/src/main/asciidoc/appng.css | 4 +-
.../src/main/webapp/WEB-INF/appNGizer-servlet.xml | 3 +-
.../controller/PlatformPropertyControllerTest.java | 8 +-
.../test/resources/xml/platform-property-list.xml | 6 +
appng-archetype-application/pom.xml | 2 +-
appng-archetype-application/readme.txt | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
appng-camunda/pom.xml | 2 +-
appng-cli/pom.xml | 2 +-
.../main/java/org/appng/cli/CliEventProvider.java | 7 +-
.../appng/cli/commands/site/CheckSiteRunning.java | 12 +-
.../appng/cli/commands/subject/CreateSubject.java | 56 ++++---
.../org/appng/cli/CliCoreDBNotInitializedTest.java | 5 +-
.../src/test/java/org/appng/cli/CliCoreTest.java | 5 +-
.../appng/cli/commands/AbstractCommandTest.java | 9 +-
.../property/CommandListPropertiesTest.java | 4 +-
.../commands/subject/CommandCreateSubjectTest.java | 100 +++++++++--
appng-cli/src/test/resources/cliContext-test.xml | 8 +-
appng-cli/src/test/resources/log4j.properties | 8 +-
appng-core/pom.xml | 2 +-
.../org/appng/core/controller/PlatformStartup.java | 16 +-
.../org/appng/core/controller/SessionListener.java | 7 +
.../core/controller/handler/ErrorPageHandler.java | 40 +++--
.../appng/core/controller/handler/RestService.java | 46 +++--
.../controller/handler/ServiceRequestHandler.java | 26 +--
.../core/controller/messaging/TribesSender.java | 6 +-
.../org/appng/core/domain/DatabaseConnection.java | 45 +++--
.../appng/core/domain/PlatformEventListener.java | 95 ++++++-----
.../java/org/appng/core/domain/ResourceImpl.java | 5 +-
.../main/java/org/appng/core/model/JarInfo.java | 15 +-
.../org/appng/core/model/RepositoryCacheSoap.java | 6 +-
.../org/appng/core/model/ThymeleafProcessor.java | 21 ++-
.../config/ApplicationPostProcessor.java | 17 +-
.../core/security/signing/CertChainValidator.java | 7 +-
.../org/appng/core/security/signing/CertTools.java | 7 +-
.../java/org/appng/core/service/CoreService.java | 22 +--
.../org/appng/core/service/DatabaseService.java | 15 +-
.../org/appng/core/service/InitializerService.java | 16 +-
.../org/appng/core/service/MigrationService.java | 5 +-
.../org/appng/core/service/PropertySupport.java | 10 +-
.../org/appng/core/service/TemplateService.java | 89 +++++-----
.../org/appng/core/platform-config.properties | 1 +
.../handler/ServiceRequestHandlerTest.java | 86 +++++++++-
.../org/appng/core/domain/ResourceImplTest.java | 43 +++++
.../appng/core/model/PlatformTransformerTest.java | 2 +-
.../appng/core/model/ThymeleafProcessorTest.java | 12 ++
.../core/repository/AbstractRepositoryTest.java | 9 +-
.../config/ApplicationPostProcessorTest.java | 60 +++++++
.../org/appng/core/service/CoreServiceTest.java | 5 +-
.../appng/core/service/DatabaseServiceTest.java | 34 +---
.../appng/core/service/InitializerServiceTest.java | 32 +---
.../appng/core/service/TemplateServiceTest.java | 16 +-
.../org/appng/core/service/TestInitializer.java | 5 +-
appng-core/src/test/resources/platformContext.xml | 11 +-
.../xml/ThymeleafProcessorTest-platform.xml | 14 +-
appng-documentation/pom.xml | 3 +-
appng-documentation/src/main/asciidoc/appng.css | 4 +-
.../src/main/asciidoc/listing/dependencies.txt | 8 +-
.../src/main/asciidoc/parts/api.adoc | 44 +++--
.../src/main/asciidoc/parts/jsp.adoc | 2 +-
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 +-
.../repository/EnversRepositoryConfiguration.java | 4 -
.../repository/EnversSearchRepositoryTest.java | 7 -
.../repository/QueryDslSearchRepositoryTest.java | 6 -
.../repository/RepositoryConfiguration.java | 35 ++--
.../persistence/repository/SearchQueryTest.java | 11 +-
.../repository/SearchRepositoryTest.java | 9 +-
.../src/test/resources/META-INF/persistence.xml | 3 +-
appng-search/pom.xml | 2 +-
.../org/appng/search/indexer/DocumentIndexer.java | 12 +-
.../appng/search/indexer/FileSystemProvider.java | 22 ++-
.../java/org/appng/search/indexer/ParseTags.java | 7 +-
appng-standalone/pom.xml | 2 +-
appng-taglib/pom.xml | 2 +-
.../main/java/org/appng/taglib/search/Search.java | 20 +--
appng-template-assembly/pom.xml | 2 +-
appng-template-parent/pom.xml | 14 +-
appng-testsupport/pom.xml | 2 +-
.../main/java/org/appng/testsupport/TestBase.java | 55 ++++++
.../java/org/appng/testsupport/TestBaseTest.java | 89 ++++++++++
appng-tomcat7/pom.xml | 2 +-
appng-tomcat8/pom.xml | 2 +-
appng-tools/pom.xml | 2 +-
.../appng/tools/file/PropertyConstantCreator.java | 58 ++++---
.../tools/file/PropertyConstantCreatorTest.java | 41 +++++
appng-tools/src/test/resources/Constants.java | 8 +
appng-tools/src/test/resources/props.properties | 1 +
appng-upngizr/README.adoc | 11 +-
appng-upngizr/pom.xml | 2 +-
.../java/org/appng/upngizr/controller/UpNGizr.java | 3 +-
.../java/org/appng/upngizr/controller/Updater.java | 156 ++++++++++++-----
appng-upngizr/src/main/resources/updater.html | 4 +-
.../org/appng/upngizr/controller/UpdaterTest.java | 165 ++++++++++++++++--
appng-upngizr/src/test/resources/startpage.html | 106 ++++++++++++
appng-xmlapi/pom.xml | 2 +-
.../xml/ApplicationPropertyConstantCreator.java | 48 +++++-
.../xml/transformation/StyleSheetProvider.java | 27 +--
.../src/test/resources/ApplicationProperty.java | 2 +
appng-xmlapi/src/test/resources/pom.xml | 9 +
.../src/test/resources/xml/application.xml | 5 +-
changelog.txt | 186 +++++++++++++++++++++
pom.xml | 23 ++-
133 files changed, 2012 insertions(+), 752 deletions(-)
create mode 100644 Jenkinsfile
create mode 100644 appng-core/src/test/java/org/appng/core/domain/ResourceImplTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/repository/config/ApplicationPostProcessorTest.java
create mode 100644 appng-testsupport/src/test/java/org/appng/testsupport/TestBaseTest.java
create mode 100644 appng-tools/src/test/java/org/appng/tools/file/PropertyConstantCreatorTest.java
create mode 100644 appng-tools/src/test/resources/Constants.java
create mode 100644 appng-tools/src/test/resources/props.properties
create mode 100644 appng-upngizr/src/test/resources/startpage.html
create mode 100644 appng-xmlapi/src/test/resources/pom.xml
create mode 100644 changelog.txt
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
