Skip to content

Console Output

[appng] Running shell script
+ git merge --ff appng-1.14.x
Updating 86a8dc5..1af5e9f
Fast-forward
 .gitignore                                         |    1 +
 CODE_OF_CONDUCT.adoc                               |   71 +
 CONTRIBUTING.adoc                                  |    1 +
 README.adoc                                        |  261 ++++
 appng-api/pom.xml                                  |   31 +-
 appng-application-assembly/pom.xml                 |    2 +-
 .../main/resources/assemblies/assembly-local.xml   |    3 +-
 .../src/main/resources/assemblies/assembly.xml     |    6 +-
 appng-application-bom/pom.xml                      | 1429 ++++++++++++++++++++
 appng-application-bom/readme.txt                   |    9 +
 appng-application-parent/pom.xml                   |   18 +-
 appng-application/pom.xml                          |   40 +-
 .../conf/examples/appNG-example-mssql.properties   |    2 +-
 appng-appngizer-jaxb/pom.xml                       |    4 +-
 appng-appngizer-maven-plugin/pom.xml               |    8 +-
 appng-appngizer/pom.xml                            |   52 +-
 .../appngizer-platform-installation-guide.adoc     |    2 +-
 .../src/main/asciidoc/appngizer-setup-guide.adoc   |    8 +-
 .../src/main/asciidoc/appngizer-user-manual.adoc   |    2 +-
 appng-archetype-application/pom.xml                |    2 +-
 appng-archetype-application/readme.txt             |    2 +-
 .../src/main/resources/archetype-resources/pom.xml |   82 +-
 .../src/test/resources/log4j.properties            |    2 +-
 .../xml/PersonDataSourceTest-testPersons.xml       |    2 +-
 appng-cli/pom.xml                                  |   33 +-
 .../cli/commands/template/InstallTemplate.java     |    4 +
 .../appng/cli/commands/AbstractCommandTest.java    |    2 +-
 .../application/CommandInstallApplicationTest.java |   44 +
 .../repository/CommandCreateRepositoryTest.java    |    2 +-
 .../template/CommandInstallTemplateTest.java       |   41 +
 .../resources/localrepo/appng-template-0.8.0.zip   |  Bin 0 -> 4044 bytes
 .../demo-application-1.5.4-2017-04-10-1046.zip     |  Bin 0 -> 5456 bytes
 appng-cli/src/test/resources/log4j.properties      |   34 +-
 appng-core/pom.xml                                 |   32 +-
 .../mssql/V2_9_1__add_global_admin_role.sql        |    3 +-
 .../appng/core/service/DatabaseServiceTest.java    |    5 +
 .../src/test/resources/conf/log4j.properties       |   20 -
 appng-core/src/test/resources/log4j.properties     |   42 +-
 appng-documentation/pom.xml                        |    2 +-
 .../src/main/asciidoc/listing/dependencies.txt     |    8 +-
 appng-forms/pom.xml                                |   31 +-
 appng-formtags/pom.xml                             |   28 +-
 appng-mail/pom.xml                                 |   31 +-
 appng-persistence/pom.xml                          |   28 +-
 appng-search/pom.xml                               |   39 +-
 appng-standalone/pom.xml                           |   20 +-
 .../org/appng/standalone/ApplicationStartup.java   |    7 +-
 appng-taglib/pom.xml                               |   30 +-
 .../main/java/org/appng/taglib/search/Search.java  |    2 +-
 appng-template-assembly/pom.xml                    |    2 +-
 appng-template-parent/pom.xml                      |   10 +-
 appng-testsupport/pom.xml                          |   31 +-
 appng-tomcat7/pom.xml                              |    4 +-
 appng-tomcat8/pom.xml                              |    2 +-
 appng-tools/pom.xml                                |   28 +-
 appng-xmlapi/pom.xml                               |   28 +-
 pom.xml                                            |  135 +-
 readme.adoc                                        |  157 ---
 58 files changed, 2501 insertions(+), 424 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.adoc
 create mode 100644 CONTRIBUTING.adoc
 create mode 100644 README.adoc
 create mode 100644 appng-application-bom/pom.xml
 create mode 100644 appng-application-bom/readme.txt
 create mode 100644 appng-cli/src/test/java/org/appng/cli/commands/application/CommandInstallApplicationTest.java
 create mode 100644 appng-cli/src/test/java/org/appng/cli/commands/template/CommandInstallTemplateTest.java
 create mode 100644 appng-cli/src/test/resources/localrepo/appng-template-0.8.0.zip
 create mode 100644 appng-cli/src/test/resources/localrepo/demo-application-1.5.4-2017-04-10-1046.zip
 delete mode 100644 appng-core/src/test/resources/conf/log4j.properties
 delete mode 100644 readme.adoc