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:56 UTC
[incubator-training] branch master updated (18a21d0 -> 64af9a6)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git.
from 18a21d0 TRAINING-26: Select english language for jetty run. (#61)
add c8ea1b8 - Refactored the template configuration to a common parent - Moved template static resources to a resource module - Changed the original template into a maven archetype
add f61071e Merge branches 'feature/2019-09-12-master-pom' and 'master' of github.com:apache/incubator-training into feature/2019-09-12-master-pom
add e63740f - Added missing Apache header to the logo SVG
add a17c523 - Ensured the binary presentations located in the website are excluded from the RAT check.
add e8648ca - Bumped things to the latest versions and handled any problems that now occurred.
add 62c4129 - Ensured the resources are built before the pom project.
add c64539d - Added some documentation to the poms - Made the archetype generate war projects
add 9236d14 - Bumped some of the versions to newer versions -- AsciidoctorJ from 2.1.0 to 2.2.0 -- AsciidoctorJ-Diagram from 1.5.18 to 2.0.0 -- Asciidoctor RevealJS from 2.0.1 to 3.0.0
new 64af9a6 Merge branch 'feature/2019-09-12-master-pom'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
create mode 100644 tools/content-archetype/README.md
create mode 100644 tools/content-archetype/pom.xml
create mode 100644 tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/README.md (100%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/install-deps-centos.sh (100%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/install-deps-mac.sh (100%)
create mode 100644 tools/content-archetype/src/main/resources/archetype-resources/pom.xml
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/src/main/asciidoc/_settings.adoc (100%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/src/main/asciidoc/diagrams/mermaid-flowchart-test.mmd (100%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/src/main/asciidoc/index.adoc (89%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/src/main/asciidoc/subdir/_b.adoc (100%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/src/main/asciidoc/subdir/_c.adoc (100%)
rename tools/{maven-revealjs-asciidoctor-template/src/main/java/example => content-archetype/src/main/resources/archetype-resources/src/main/java}/StringUtils.java (90%)
rename tools/{maven-revealjs-asciidoctor-template => content-archetype/src/main/resources/archetype-resources}/src/main/resources/images/toddy.jpg (100%)
create mode 100644 tools/content-archetype/src/test/resources/projects/basic/archetype.properties
copy tools/{.gitkeep => content-archetype/src/test/resources/projects/basic/goal.txt} (100%)
rename tools/{maven-revealjs-asciidoctor-template => content-parent-pom}/pom.xml (68%)
copy tools/{ => content-parent-resources}/pom.xml (55%)
rename tools/{maven-revealjs-asciidoctor-template/src/main/theme => content-parent-resources/src/main/resources}/apache.css (100%)
rename tools/{maven-revealjs-asciidoctor-template/libs/docinfo-hack => content-parent-resources/src/main/resources}/document.html.slim (100%)
rename tools/{maven-revealjs-asciidoctor-template/src/main/resources/images => content-parent-resources/src/main/resources}/logo-apache.png (100%)
delete mode 100644 tools/maven-revealjs-asciidoctor-template/Jenkinsfile
[incubator-training] 01/01: Merge branch
'feature/2019-09-12-master-pom'
Posted by cd...@apache.org.
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(-)