You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@training.apache.org by cd...@apache.org on 2020/01/07 09:43:57 UTC
[incubator-training] 01/01: Merge branch
'feature/2019-09-12-master-pom'
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
commit 64af9a61242137202290d6b8cc433cf027abfa27
Merge: 18a21d0 9236d14
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Jan 7 10:42:38 2020 +0100
Merge branch 'feature/2019-09-12-master-pom'
site/pom.xml | 3 +
site/src/site/resources/images/training-logo.svg | 18 +++
tools/content-archetype/README.md | 4 +
tools/content-archetype/pom.xml | 39 +++++
.../META-INF/maven/archetype-metadata.xml | 34 ++++
.../main/resources/archetype-resources}/README.md | 0
.../archetype-resources}/install-deps-centos.sh | 0
.../archetype-resources}/install-deps-mac.sh | 0
.../src/main/resources/archetype-resources/pom.xml | 39 +++++
.../src/main/asciidoc/_settings.adoc | 0
.../asciidoc/diagrams/mermaid-flowchart-test.mmd | 0
.../src/main/asciidoc/index.adoc | 99 +-----------
.../src/main/asciidoc/subdir/_b.adoc | 0
.../src/main/asciidoc/subdir/_c.adoc | 0
.../src/main/java}/StringUtils.java | 5 +-
.../src/main/resources/images/toddy.jpg | Bin
.../resources/projects/basic/archetype.properties | 5 +
.../src/test/resources/projects/basic/goal.txt | 0
.../pom.xml | 180 ++++++++++++++++-----
tools/{ => content-parent-resources}/pom.xml | 24 +--
.../src/main/resources}/apache.css | 0
.../src/main/resources}/document.html.slim | 0
.../src/main/resources}/logo-apache.png | Bin
.../Jenkinsfile | 141 ----------------
tools/pom.xml | 4 +-
25 files changed, 307 insertions(+), 288 deletions(-)