This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/develop by this push:
new 0163e29 chore(presentation/comdev/apache): Added a new presentation
on Apache
0163e29 is described below
commit 0163e2928fe75f40bb2a2d2acde22e3f6ed06732
Author: christoferdutz <[email protected]>
AuthorDate: Tue Mar 21 20:05:58 2023 +0100
chore(presentation/comdev/apache): Added a new presentation on Apache
---
LICENSE | 28 --
content/Apache/ComDev/ApacheIntro/README.md | 66 ++++
content/Apache/ComDev/ApacheIntro/pom.xml | 37 ++
.../src/main/asciidoc/_settings.adoc} | 46 +--
.../ApacheIntro/src/main/asciidoc/index.adoc | 426 +++++++++++++++++++++
.../src/main/resources/images/ApacheLogo.png | Bin 0 -> 82055 bytes
.../src/main/resources/images/apache_8.png | Bin 0 -> 3852727 bytes
.../src/main/resources/images/asf_logo.png | Bin 0 -> 21243 bytes
.../main/resources/images/commits-over-time.png | Bin 0 -> 37704 bytes
.../resources/images/language-distribution.png | Bin 0 -> 60304 bytes
.../main/resources/images/project-categories.png | Bin 0 -> 81377 bytes
.../resources/images/project-number-over-time.png | Bin 0 -> 63977 bytes
content/Apache/ComDev/pom.xml | 1 +
site/pom.xml | 7 +
site/src/site/site.xml | 1 +
tools/content-parent-pom/pom.xml | 10 +-
.../libs/third-party/erd | 1 -
tools/pom.xml | 4 +-
18 files changed, 565 insertions(+), 62 deletions(-)
diff --git a/LICENSE b/LICENSE
index dcc4b8a..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,31 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-----------------------------------------------
-
-This product includes a modified version of this file:
-tools/maven-revealjs-asciidoctor-template/libs/docinfo-hack/document.html.slim
-developed at https://github.com/asciidoctor/asciidoctor-reveal.js
-
-Available under an MIT license:
-
-The MIT License
-Copyright (C) 2012-2019 Olivier Bilodeau, Charles Moulliard, Dan Allen and the
Asciidoctor Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/content/Apache/ComDev/ApacheIntro/README.md
b/content/Apache/ComDev/ApacheIntro/README.md
new file mode 100644
index 0000000..1845bc1
--- /dev/null
+++ b/content/Apache/ComDev/ApacheIntro/README.md
@@ -0,0 +1,66 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+# Presentation with Reveal.JS and AsciiDoctor
+
+Remarks:
+- Currently it seems as if the system can't detect the 'docinfo' files, so we
have to replace the `document.html.slim` file from `asciidoctor-reveal.js` with
an updated one, that adds some additional js and css references. This template
is located in `libs/docinfo-hack`.
+- In order to use the preview of the IntelliJ asciidoctor plugin, you need to
set an attribute in the plugin settings: `imagesdir` = `../resources/images`
+- Even if it is possible to run the presentation directly from the
`generated-slides` directory, some JavaScript extensions don't work in this
case. Therefore it is required to run the presentation from a local webserver.
+- In order to generate the diagrams, GraphVIS needs to be installed locally.
Get it from: http://www.graphviz.org/
+- The template is adjusted to use the codecentric font `Panton`, so be sure to
have that installed on your presentation machine.
+- Any css adjustments can go to `src/main/theme/cc.css` as this is
automatically embedded into the themes directory.
+
+## Building the presentation
+
+By running the following command, you can generate the presentation:
+
+ mvn clean package
+
+## Running the presentation
+
+In order to start a local web server serving the presentation, execute the
following command:
+
+ mvn jetty:run-exploded
+
+As soon as that's done, just point your browser to:
+
+ http://localhost:8080/
+
+## Generating PDF versions
+
+In order to generate a PDF version of the presentation just add `?print-pdf`
to the url. (Keep in mind, that you have to add it before any `#blahblah`)
+
+The following link should do the trick:
+
+ http://localhost:8080/?print-pdf
+
+As soon as that's loaded, just use the normal `print` functionality of the
browser and `print as PDF`.
+
+## Installing third party software:
+
+### Mermaid
+
+ npm install mermaid.cli
+
+This will install mermaid under `node_modules/.bin/mmdc`.
+
+### PhantomJS
+
+https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip
diff --git a/content/Apache/ComDev/ApacheIntro/pom.xml
b/content/Apache/ComDev/ApacheIntro/pom.xml
new file mode 100644
index 0000000..52f0aa7
--- /dev/null
+++ b/content/Apache/ComDev/ApacheIntro/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+--><project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.training</groupId>
+ <artifactId>content-parent-pom</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+
<relativePath>../../../../tools/content-parent-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.training.content</groupId>
+ <artifactId>training-content-apache-comdev-apache-intro</artifactId>
+ <version>1.0.0.SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>Training: Content: Apache: ComDev: Apache Intro</name>
+ <description>A short 30 minute introduction talk about what The Apache
Software Foundation is.</description>
+
+</project>
diff --git a/content/Apache/ComDev/pom.xml
b/content/Apache/ComDev/ApacheIntro/src/main/asciidoc/_settings.adoc
similarity index 51%
copy from content/Apache/ComDev/pom.xml
copy to content/Apache/ComDev/ApacheIntro/src/main/asciidoc/_settings.adoc
index ff47353..261a396 100644
--- a/content/Apache/ComDev/pom.xml
+++ b/content/Apache/ComDev/ApacheIntro/src/main/asciidoc/_settings.adoc
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+////
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,27 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.training</groupId>
- <artifactId>content-parent-pom</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <groupId>org.apache.training.content</groupId>
- <artifactId>training-content-apache-comdev</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Training: Content: Apache: ComDev</name>
-
- <modules>
- <module>ComDevIntro</module>
- </modules>
-
-</project>
+////
+
+:goto:
+:menu:
+:navigation:
+:status:
+:arrows:
+:revealjs_theme: cc_black
+:revealjs_progress: true
+:revealjs_slidenumber: true
+:pdf-page-size: A4
+:revealjs_center: false
+:revealjs_history: true
+:icons: font
+:imagesdir: images
+:sourcedir: ../java
+:title-slide-background-image: background-dark-orig.jpg
+:idprefix:
+:idseparator: -
diff --git a/content/Apache/ComDev/ApacheIntro/src/main/asciidoc/index.adoc
b/content/Apache/ComDev/ApacheIntro/src/main/asciidoc/index.adoc
new file mode 100644
index 0000000..40d6a24
--- /dev/null
+++ b/content/Apache/ComDev/ApacheIntro/src/main/asciidoc/index.adoc
@@ -0,0 +1,426 @@
+////
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+////
+
+include::_settings.adoc[]
+:presenter_name: Your Name
+:presenter_company: Your Company
+:description: A short 30 minute introduction talk about what Apache Community
Development is
+:keywords: ComDev, Community Development
+:author: Christofer Dutz
+:email: [email protected]
+:position: Board member
+
+== What is the ASF?
+
+image::ApacheLogo.png[]
+
+== Who am I?
+{author} +
+{position} +
+{email} +
+
+[NOTE.speaker]
+--
+Please add your own details here
+--
+
+== What am I going to cover?
+
+image::asf_logo.png[]
+
+* What is the ASF?
+* How is an ASF project structured?
+* How is the ASF structured?
+* How does all of this work?
+
+== What is the ASF?
+
+* ASF = The Apache Software Foundation
+* *US 501(c)3 charity* (Non-profit charity)
+* Community of volunteers
+* Virtual, world-wide organisation
+* Provides organisational, legal and financial support for a large number of
open-source projects
+
+== The Apache Group
+
+image::apache_8.png[250,250,float="right",align="center"]
+
+* Before there was the ASF, there was the "Apache Group"
+* Informal corporate structure
+* 8 members
+* Formed in Feb. 1995
+* Continued the work on the NCSA httpd
+* Chose a very promiscuous license
+
+== Growth
+
+[cols="2"]
+|===
+
+| Then (1999)
+| Now (03.2023)
+
+.^a|* 21 Members
+* 2 Projects
+* All servers and services donated
+.^a| * 743 Members
+* 362 Projects (Managed by 207 PMCs)
+* 8833 Committers
+//* 689584 Contributors
+* Cloud infrastructure
+
+|===
+
+[NOTE.speaker]
+--
+// Source:
+// https://whimsy.apache.org/roster/
+* ICLA: Individual Contributor License Agreement
+* CCLA: Corporate Contributor License Agreement
+* 31 Incubator Podlings
+* 5 Special Committees: Infrastructure, Travel Assistance, Security Team,
Legal Affairs and Brand Management
+--
+
+== Number of projects over time
+
+image::project-number-over-time.png[]
+// Source https://projects.apache.org/
+
+== Commits over time
+
+image::commits-over-time.png[]
+// Source: https://projects.apache.org/statistics.html
+
+== Language distribution
+
+image::language-distribution.png[]
+// Source https://projects.apache.org/
+== Project categories
+
+image::project-categories.png[]
+// Source https://projects.apache.org/
+
+== The mission
+
+* *Provide software for the public good*
+* Protect the trademark: *Apache* and her software products against misuse by
other organisations
+* Provide the technical and legal infrastructure for open-source development
+* Provide all means to protect every volunteer from persecution as long as
this persecution is aimed at a project of the foundation
+
+[NOTE.speaker]
+--
+* legal infrastructure = Apache license, ICLA, CCLA, ...
+* legal umbrella: If someone initiates legal action against an Apache
committer for things related to the ASF, the ASF takes the place of the accused.
+--
+
+== The vision
+
+The Apache Software Foundation provides support for the Apache community of
open-source software projects. The Apache projects are characterized by a
*collaborative*, *consensus based* development process, an *open* and pragmatic
software license, and a desire to create *high quality* software that leads the
way in its field. We consider ourselves not simply a group of projects sharing
a server, but rather a *community of developers and users*.
+
+== Projects
+
+* Heart of the ASF are the *projects*
+* Also named "Top Level Project" (TLP)
+* ASF provides services:
+** Mailinglists, code-repositories (SVN, Git, ...)
+** Bug & Issue trackers (Jira, ...), Wiki (Confluence, ...)
+** CI Server (Jenkins, ...), Webservers for project websites
+** ...
+
+[NOTE.speaker]
+--
+* Currently, there is a trend to use GitHub Issues, GitHub Discussions, GitHub
Actions (CI)
+* The ASF provides tooling to integrate these
+--
+
+== Structure of a project
+
+[ditaa,project-structure]
+....
+ +-----------+
+ |cDFA |
+ | PMC Chair |
+ | |
+ +----+-----------+----+
+ |c6A1 |
+ | Project PMC |
+ | |
+ +----+---------------------+----+
+ |cF71 |
+ | Project Committers | Total: 8833
+ | |
+ +----+-------------------------------+----+
+ |c7CE |
+ | Project Contributors | Total: 689584
+ | |
++----+-----------------------------------------+----+
+|cDDB |
+| Project Users | Total: billions
+| |
++---------------------------------------------------+
+....
+// Numbers (03.2023)
+
+[NOTE.speaker]
+--
+* Contributors: People who have contributed anything to a project
+* Users: Almost every phone, tv, has at least some Apache software in it
+--
+
+== Lifecycle of a project
+
+[ditaa,project-lifecycle]
+....
++---------------------------------------------------+
+|cDFA |
+| Outside of Apache |
+| |
++---------------------------------------------------+
+ |
+ |
+ V
++---------------------------------------------------+
+|c6A1 |
+| Apache Incubator |--->
+| |
++---------------------------------------------------+
+ |
+ |
+ V
++---------------------------------------------------+
+|cF71 |
+| Apache TLP |--->
+| |
++---------------------------------------------------+
+ |
+ |
+ V
++---------------------------------------------------+
+|c7CE |
+| Apache Attic |
+| |
++---------------------------------------------------+
+....
+
+[NOTE.speaker]
+--
+* Projects don't start at Apache
+* Projects can also leave any time
+** Might need to re-brand
+--
+
+== How is the ASF structured?
+
+* *Member* based - only individuals can join (no companies)
+* Members nominate and elect new members
+* Members elect *board* (9 *directors*)
+* Annual members meeting via IRC
+* Monthly board meeting
+* Every project elects a *Chair* as interface to the board
+
+[NOTE.speaker]
+--
+* Projects don't start at Apache
+* Projects can also leave any time
+** Might need to re-brand
+--
+
+== Structure of the ASF
+
+[ditaa,asf-structure]
+....
+Technical Oversight
+
++--------------------+ +--------------------+
+|cDFA | |c6A1 |
+| Committers +--------------->| PMCs |
+| (8833) | | (207) |
++--------------------+ +---+----------------+
+ Report| ^
+ quarterly| |
+ | |
+------------------------------------------|------------|-----------------
+ | |
+Organizational Oversight | | Create & update
+ V | upon PMC request
++--------------------+ +----------------+---+
+|c7CE | |cF71 |
+| Members +--------------->| Board of Directors |
+| (743) +--+ | (9) |
++--------------------+ | +---+----------------+
+ ^ | Appoint| ^
+ | | Officers| |
+ +-------------+ | |Report
+ Nominate, elect V |monthly
+ new members +----------------+---+
+ |cDDB |
+ | Officers |
+ | (10) |
+ +--------------------+
+
+
+
+
+....
+
+== How does this all work?
+
+* The Apache Way
+** A method to develop software
+** A method to run communities
+** A method to run an organisation
+
+== On which principles is it based?
+
+* Meritocracy: Advancement through action & commitment
+* Transparency: Nothing happens in secret
+* Community: Together we are strong
+
+== Ways to be committed
+
+* Documentation, Tutorials, Examples
+* Talks (at conferences & meetups)
+* User groups
+* Helping others (On mailing lists)
+* Filing bug reports
+* Testing and helping fix bugs & issues
+* Bugfixes
+* New features
+* Mentoring, involvement in the foundation itself
+
+== Path of merit
+
+[ditaa,merit-path]
+....
+
+Project | Foundation
+ |
++------------------------+ |
+|c883 | | nominated |
+| User | | by members |
+| | | |
++-----------+------------+ | |
+ | Contributes | |
+ | | |
+ v | |
++------------------------+ | nominated |
+|cD92 | | by members |
+| Bugreporter/-fixer +---------------------------+ |
+| | | | |
++-----------+------------+ | | |
+ | elected | | |
+ | by PMC | | |
+ v | | |
++------------------------+ | nominated | |
+|cDDB | | by members | |
+| Project Committer +------------------+ | |
+| | | | | |
++-----------+------------+ | | | |
+ | elected | | | |
+ | by PMC | | | |
+ v | V V V
++------------------------+ | +-----------------------+
+|c7CE | | |cDFA |
+| Project PMC Member +-------------->| ASF Memeber |
+| | nominated | |
++-----------+------------+ by members +-----------+-----------+
+ | elected | | elected
+ | by PMC | | by members
+ v | V
++------------------------+ | +-----------------------+
+|cF71 | | |c6A1 |
+| Project Chair | | | Board Member |
+| | | | |
++------------------------+ | +-----------------------+
+ |
+....
+
+== If it didn't happen on the list, it didn't happen
+
+* If something isn't documented on any of the mailing lists, it didn't happen
+** Every discussion and decision needs to be documented
+* All discussions should happen in the public
+* Off-list discussions can happen, but important information needs to be
forwarded to the mailing list
+* Others are need to be able to participate
+
+[NOTE.speaker]
+--
+* Discussions on meetups or at conferences
+* Many things (like votes) require 72 hour periods
+* Private lists: Discussing security issues, voting on new committers and PMC
members
+--
+
+== Community over Code
+
+* We're (all) volunteers, life happens and our availability and our interests
change
+* A vital community encourages new community members
+* It's normal, that members (temporarily) leave the community
+* *Poisonous people* scare others and must be fought
+* Result of a healthy community -> better code, long-lasting projects
+
+== Consensus-based decisions
+
+* PMC members have *binding votes*
+* Non-PMC members have *non-binding votes*
+* Formally only binding votes count
+* *But* non-binding votes usually are still respected
+* Something is considered decided if:
+** At least 3 binding votes
+** More `+1` as `-1` votes
+
+[NOTE.speaker]
+--
+* Valid votes are `+1` (pro), `0`, `-1` (contra)
+* `-1` votes should be constructive
+--
+
+== Collaborative development
+
+* Code should be developed in community with others
+** Large code-drops are bad
+* Development should happen on-line (Git/SVN, Email, ...)
+* Votes ensure that at least 3 developers are still active
+* In order to allow anyone to participate, votes usually last at least 72 hours
+* Discussions and votes happen only on the mailing-list
+
+[NOTE.speaker]
+--
+* 72h = at least one working day, no matter where on earth you live
+--
+
+== The result
+
+* Vendor neutrality
+* Diversity
+* Trust
+* Safety
+* Security
+
+== How can companies help?
+
+* Companies can allow their employees to contribute during working hours
+* Companies can directly support the ASF financially (Sponsoring)
+* Companies can donate code, so everyone can profit from it
+* Companies can't directly fund development in projects
+* Companies can donate funds towards projects (Targeted donations)
+
+[NOTE.speaker]
+--
+* Targeted donations: Licenses, Hardware costs, Membership fees, ...
+--
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/ApacheLogo.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/ApacheLogo.png
new file mode 100644
index 0000000..61bc612
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/ApacheLogo.png
differ
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/apache_8.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/apache_8.png
new file mode 100755
index 0000000..ee8941a
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/apache_8.png
differ
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/asf_logo.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/asf_logo.png
new file mode 100755
index 0000000..b20bb7f
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/asf_logo.png
differ
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/commits-over-time.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/commits-over-time.png
new file mode 100644
index 0000000..1c82d8e
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/commits-over-time.png
differ
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/language-distribution.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/language-distribution.png
new file mode 100644
index 0000000..785c14c
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/language-distribution.png
differ
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/project-categories.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/project-categories.png
new file mode 100644
index 0000000..ea1e7bd
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/project-categories.png
differ
diff --git
a/content/Apache/ComDev/ApacheIntro/src/main/resources/images/project-number-over-time.png
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/project-number-over-time.png
new file mode 100644
index 0000000..234f7bd
Binary files /dev/null and
b/content/Apache/ComDev/ApacheIntro/src/main/resources/images/project-number-over-time.png
differ
diff --git a/content/Apache/ComDev/pom.xml b/content/Apache/ComDev/pom.xml
index ff47353..5b3af20 100644
--- a/content/Apache/ComDev/pom.xml
+++ b/content/Apache/ComDev/pom.xml
@@ -36,6 +36,7 @@
<name>Training: Content: Apache: ComDev</name>
<modules>
+ <module>ApacheIntro</module>
<module>ComDevIntro</module>
</modules>
diff --git a/site/pom.xml b/site/pom.xml
index 19dd298..6666b68 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -228,6 +228,13 @@
<type>war</type>
<outputDirectory>${project.build.directory}/site/presentations/airflow</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.training.content</groupId>
+
<artifactId>training-content-apache-comdev-apache-intro</artifactId>
+ <version>1.0.0.SNAPSHOT</version>
+ <type>war</type>
+
<outputDirectory>${project.build.directory}/site/presentations/comdev/apache-intro</outputDirectory>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.training.content</groupId>
<artifactId>training-content-apache-comdev-comdev-intro</artifactId>
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
index 1512882..ad0509d 100644
--- a/site/src/site/site.xml
+++ b/site/src/site/site.xml
@@ -111,6 +111,7 @@
<menu name="Presentations">
<item name="Apache Airflow" href="presentations/airflow/index.html"
target="_blank"/>
<item name="Apache ComDev">
+ <item name="The ASF"
href="presentations/comdev/apache-intro/index.html" target="_blank"/>
<item name="Intro" href="presentations/comdev/comdev-intro/index.html"
target="_blank"/>
</item>
<item name="Apache Druid" href="presentations/druid/index.html"
target="_blank"/>
diff --git a/tools/content-parent-pom/pom.xml b/tools/content-parent-pom/pom.xml
index a54090c..59a5d6a 100644
--- a/tools/content-parent-pom/pom.xml
+++ b/tools/content-parent-pom/pom.xml
@@ -46,21 +46,21 @@
<java.version>1.8</java.version>
- <asciidoctorj.version>2.5.5</asciidoctorj.version>
+ <asciidoctorj.version>2.5.7</asciidoctorj.version>
<asciidoctorj-revealjs.version>5.0.0.rc1</asciidoctorj-revealjs.version>
- <asciidoctorj.diagram.version>2.2.3</asciidoctorj.diagram.version>
+ <asciidoctorj.diagram.version>2.2.4</asciidoctorj.diagram.version>
<!-- Reveal.JS 4.x doesn't seem to work yet -->
<revealjs.version>3.9.2</revealjs.version>
<!--revealjs.version>4.3.1</revealjs.version-->
-
<asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
+
<asciidoctor-maven-plugin.version>2.2.3</asciidoctor-maven-plugin.version>
<download-maven-plugin.version>1.6.8</download-maven-plugin.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
- <jetty-maven-plugin.version>11.0.12</jetty-maven-plugin.version>
+ <jetty-maven-plugin.version>11.0.14</jetty-maven-plugin.version>
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
+
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
</properties>
<dependencies>
diff --git a/tools/maven-revealjs-asciidoctor-templte/libs/third-party/erd
b/tools/maven-revealjs-asciidoctor-templte/libs/third-party/erd
deleted file mode 160000
index cdd59cd..0000000
--- a/tools/maven-revealjs-asciidoctor-templte/libs/third-party/erd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cdd59cd159a32563c2eb0aca5160821c61244512
diff --git a/tools/pom.xml b/tools/pom.xml
index ead66c1..513fe5a 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version>
+ <version>29</version>
<!-- Required in our case as per
http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent -->
<relativePath />
@@ -91,7 +91,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
<configuration>
<finalName>apache-training-incubating-tools-${project.version}</finalName>
</configuration>
