training-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [incubator-training] 01/01: - Refactored the template configuration to a common parent - Moved template static resources to a resource module - Changed the original template into a maven archetype
Date Thu, 12 Sep 2019 19:51:43 GMT
This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/2019-09-12-master-pom
in repository https://gitbox.apache.org/repos/asf/incubator-training.git

commit c8ea1b8663acd46e5474132419b4f338c820f59b
Author: Christofer Dutz <christofer.dutz@c-ware.de>
AuthorDate: Thu Sep 12 12:51:25 2019 -0700

    - Refactored the template configuration to a common parent
    - Moved template static resources to a resource module
    - Changed the original template into a maven archetype
---
 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 |  38 ++++++
 .../src/main/asciidoc/_settings.adoc               |   0
 .../asciidoc/diagrams/mermaid-flowchart-test.mmd   |   0
 .../src/main/asciidoc/index.adoc                   |   9 +-
 .../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                                        |  92 ++++++++++----
 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 +-
 23 files changed, 214 insertions(+), 181 deletions(-)

diff --git a/tools/content-archetype/README.md b/tools/content-archetype/README.md
new file mode 100644
index 0000000..23cbc55
--- /dev/null
+++ b/tools/content-archetype/README.md
@@ -0,0 +1,4 @@
+
+# Usage
+
+    mvn archetype:generate -DarchetypeGroupId=org.apache.training -DarchetypeArtifactId=content-archetype
-DarchetypeVersion=1.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/tools/content-archetype/pom.xml b/tools/content-archetype/pom.xml
new file mode 100644
index 0000000..76a3a28
--- /dev/null
+++ b/tools/content-archetype/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+    <artifactId>apache</artifactId>
+    <version>21</version>
+
+    <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
+    <relativePath></relativePath>
+  </parent>
+
+  <groupId>org.apache.training</groupId>
+  <artifactId>content-archetype</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>maven-archetype</packaging>
+
+  <name>Training: Tools: Content Archetype</name>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>3.0.1</version>
+      </extension>
+    </extensions>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>3.0.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 0000000..99b5975
--- /dev/null
+++ b/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="presentation-template"
+    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <fileSets>
+    <fileSet filtered="true" packaged="true" encoding="UTF-8">
+      <directory>src/main/java</directory>
+      <includes>
+        <include>**/*.java</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" encoding="UTF-8">
+      <directory>src/main/asciidoc</directory>
+      <includes>
+        <include>**/*.mmd</include>
+        <include>**/*.adoc</include>
+      </includes>
+    </fileSet>
+    <fileSet encoding="UTF-8">
+      <directory>src/main/resources</directory>
+      <includes>
+        <include>**/*.jpg</include>
+      </includes>
+    </fileSet>
+    <fileSet encoding="UTF-8">
+      <directory></directory>
+      <includes>
+        <include>install-deps-centos.sh</include>
+        <include>install-deps-mac.sh</include>
+        <include>README.md</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</archetype-descriptor>
diff --git a/tools/maven-revealjs-asciidoctor-template/README.md b/tools/content-archetype/src/main/resources/archetype-resources/README.md
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/README.md
rename to tools/content-archetype/src/main/resources/archetype-resources/README.md
diff --git a/tools/maven-revealjs-asciidoctor-template/install-deps-centos.sh b/tools/content-archetype/src/main/resources/archetype-resources/install-deps-centos.sh
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/install-deps-centos.sh
rename to tools/content-archetype/src/main/resources/archetype-resources/install-deps-centos.sh
diff --git a/tools/maven-revealjs-asciidoctor-template/install-deps-mac.sh b/tools/content-archetype/src/main/resources/archetype-resources/install-deps-mac.sh
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/install-deps-mac.sh
rename to tools/content-archetype/src/main/resources/archetype-resources/install-deps-mac.sh
diff --git a/tools/content-archetype/src/main/resources/archetype-resources/pom.xml b/tools/content-archetype/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 0000000..9100975
--- /dev/null
+++ b/tools/content-archetype/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,38 @@
+<?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-master-pom</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+
+        <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
+    </parent>
+
+    <artifactId>${artifactId}</artifactId>
+
+    <groupId>${groupId}</groupId>
+    <version>${version}</version>
+
+    <name>Training: Tools: Slide Template: Asciidoc to reveal.js Maven ${package}</name>
+    <description>An ${package} project that demonstrates how to integrate convert Asciidoc
to a reveal.js presentation with the Asciidoctor Maven plugin.</description>
+
+</project>
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/_settings.adoc b/tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/_settings.adoc
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/_settings.adoc
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/_settings.adoc
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/diagrams/mermaid-flowchart-test.mmd
b/tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/diagrams/mermaid-flowchart-test.mmd
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/diagrams/mermaid-flowchart-test.mmd
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/diagrams/mermaid-flowchart-test.mmd
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/index.adoc b/tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/index.adoc
similarity index 98%
rename from tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/index.adoc
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/index.adoc
index 4e9d6a5..2f3d8ca 100644
--- a/tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/index.adoc
+++ b/tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/index.adoc
@@ -131,7 +131,7 @@ Nest lists, by duplicating the list-char
 [source,java]
 .Java code from project
 ----
-include::{sourcedir}/example/StringUtils.java[tags=contains,indent=0]
+include::{sourcedir}/${packageInPathFormat}/StringUtils.java[tags=contains,indent=0]
 ----
 
 == Two columns
@@ -442,12 +442,11 @@ gantt
 
 [svgbob,svgbob-circuit-diagram-test,svg]
 ....
-+10-15V           ___0,047R
+     +10-15V           ___0,047R
       *------o------o-|___|-o--o---------o----o-------.
              |      |       |  |         |    |       |
             ---     |       | .+.        |    |       |
-      470uF ###     |       | | | 2k2    |    |       |
-             | +    |       | | |        |    |      .+.
+      470uF  | +    |       | | |        |    |      .+.
       *------o      '--.    | '+'       .+.   |      '-'
              |         |6   |7 |8    1k | |   |       |
             GND      .-+----+--+--.     | |   |       |
@@ -464,7 +463,7 @@ gantt
                      |            |2                  |     |    |
                      |            |--o                C|    |    |
                      |            | GND         30uH  C|    |   --- 470
-                     |            |3      1nF         C|    |   ###  uF
+                     |            |3      1nF         C|    |
                      |            |-------||--.       |     |    | +
                      '-----+----+-'           |      GND    |   GND
                           5|   4|             |             |
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/subdir/_b.adoc b/tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/subdir/_b.adoc
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/subdir/_b.adoc
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/subdir/_b.adoc
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/subdir/_c.adoc b/tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/subdir/_c.adoc
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/asciidoc/subdir/_c.adoc
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/asciidoc/subdir/_c.adoc
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/java/example/StringUtils.java
b/tools/content-archetype/src/main/resources/archetype-resources/src/main/java/StringUtils.java
similarity index 90%
rename from tools/maven-revealjs-asciidoctor-template/src/main/java/example/StringUtils.java
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/java/StringUtils.java
index 6b41228..6c250d5 100644
--- a/tools/maven-revealjs-asciidoctor-template/src/main/java/example/StringUtils.java
+++ b/tools/content-archetype/src/main/resources/archetype-resources/src/main/java/StringUtils.java
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 /*
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -16,7 +19,7 @@
   specific language governing permissions and limitations
   under the License.
 */
-package example;
+package ${package};
 
 public class StringUtils {
     // tag::contains[]
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/resources/images/toddy.jpg
b/tools/content-archetype/src/main/resources/archetype-resources/src/main/resources/images/toddy.jpg
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/resources/images/toddy.jpg
rename to tools/content-archetype/src/main/resources/archetype-resources/src/main/resources/images/toddy.jpg
diff --git a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
new file mode 100644
index 0000000..550e0da
--- /dev/null
+++ b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
@@ -0,0 +1,5 @@
+#Thu Sep 12 11:45:55 PDT 2019
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=basic
diff --git a/tools/content-archetype/src/test/resources/projects/basic/goal.txt b/tools/content-archetype/src/test/resources/projects/basic/goal.txt
new file mode 100644
index 0000000..e69de29
diff --git a/tools/maven-revealjs-asciidoctor-template/pom.xml b/tools/content-parent-pom/pom.xml
similarity index 80%
rename from tools/maven-revealjs-asciidoctor-template/pom.xml
rename to tools/content-parent-pom/pom.xml
index 18ff438..6dec754 100644
--- a/tools/maven-revealjs-asciidoctor-template/pom.xml
+++ b/tools/content-parent-pom/pom.xml
@@ -31,12 +31,12 @@
     </parent>
 
     <groupId>org.apache.training</groupId>
-    <artifactId>presentation-template</artifactId>
+    <artifactId>content-master-pom</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>pom</packaging>
 
-    <name>Training: Tools: Slide Template: Asciidoc to reveal.js Maven example</name>
-    <description>An example project that demonstrates how to integrate convert Asciidoc
to a reveal.js presentation with the Asciidoctor Maven plugin.</description>
+    <name>Training: Tools: Content Master Pom</name>
+    <description>Parent pom containing all the configuration for building presentations
with the training template.</description>
 
     <properties>
         <project.main.contentfile>index</project.main.contentfile>
@@ -196,17 +196,77 @@
                                     <filtering>true</filtering>
                                     <targetPath>${project.slides.directory}/reveal.js-${revealjs.version}/css/theme</targetPath>
                                 </resource>
-                                <!-- Patch one of the "slim" files as the 'docinfo' integration
doesn't seem to work -->
-                                <resource>
-                                    <directory>libs/docinfo-hack</directory>
-                                    <targetPath>${project.build.directory}/asciidoctor-reveal.js-${asciidoctor-revealjs.version}/templates</targetPath>
-                                </resource>
                             </resources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-training-asciidoc-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.training</groupId>
+                                    <artifactId>content-master-resources</artifactId>
+                                    <version>1.0.0-SNAPSHOT</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/asciidoctor-reveal.js-${asciidoctor-revealjs.version}/templates</outputDirectory>
+                                    <includes>*.slim</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-training-presentation-themes</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.training</groupId>
+                                    <artifactId>content-master-resources</artifactId>
+                                    <version>1.0.0-SNAPSHOT</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.slides.directory}/reveal.js-${revealjs.version}/css/theme</outputDirectory>
+                                    <includes>*.css</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-training-presentation-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.training</groupId>
+                                    <artifactId>content-master-resources</artifactId>
+                                    <version>1.0.0-SNAPSHOT</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.slides.directory}/images</outputDirectory>
+                                    <excludes>*.slim,*.css,META-INF/**</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
                 <version>${asciidoctor.maven.plugin.version}</version>
@@ -274,20 +334,6 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warSourceDirectory>${project.build.directory}/generated-slides</warSourceDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty-maven-plugin.version}</version>
-            </plugin>
-            <plugin>
                 <groupId>com.coderplus.maven.plugins</groupId>
                 <artifactId>copy-rename-maven-plugin</artifactId>
                 <version>${copy-rename-maven-plugin.version}</version>
diff --git a/tools/pom.xml b/tools/content-parent-resources/pom.xml
similarity index 55%
copy from tools/pom.xml
copy to tools/content-parent-resources/pom.xml
index 51fd849..85044f5 100644
--- a/tools/pom.xml
+++ b/tools/content-parent-resources/pom.xml
@@ -17,20 +17,24 @@
   limitations under the License.
 
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<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>
 
-  <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>21</version>
 
-  <groupId>org.apache.training</groupId>
-  <artifactId>training-tools</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+        <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
+        <relativePath></relativePath>
+    </parent>
 
-  <name>Training: Tools</name>
+    <groupId>org.apache.training</groupId>
+    <artifactId>content-master-resources</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
 
-  <modules>
-    <module>maven-revealjs-asciidoctor-template</module>
-  </modules>
+    <name>Training: Tools: Content Master Resources</name>
+    <description>Parent resources module containing all the static resources for building
presentations with the training template.</description>
 
 </project>
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/theme/apache.css b/tools/content-parent-resources/src/main/resources/apache.css
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/theme/apache.css
rename to tools/content-parent-resources/src/main/resources/apache.css
diff --git a/tools/maven-revealjs-asciidoctor-template/libs/docinfo-hack/document.html.slim
b/tools/content-parent-resources/src/main/resources/document.html.slim
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/libs/docinfo-hack/document.html.slim
rename to tools/content-parent-resources/src/main/resources/document.html.slim
diff --git a/tools/maven-revealjs-asciidoctor-template/src/main/resources/images/logo-apache.png
b/tools/content-parent-resources/src/main/resources/logo-apache.png
similarity index 100%
rename from tools/maven-revealjs-asciidoctor-template/src/main/resources/images/logo-apache.png
rename to tools/content-parent-resources/src/main/resources/logo-apache.png
diff --git a/tools/maven-revealjs-asciidoctor-template/Jenkinsfile b/tools/maven-revealjs-asciidoctor-template/Jenkinsfile
deleted file mode 100644
index 0a683e9..0000000
--- a/tools/maven-revealjs-asciidoctor-template/Jenkinsfile
+++ /dev/null
@@ -1,141 +0,0 @@
-#!groovy
-
-/*
- *
- *  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.
- *
- */
-pipeline {
-
-    agent {
-        node {
-            label 'ubuntu'
-        }
-    }
-
-    tools {
-        maven 'Maven 3 (latest)'
-        jdk 'JDK 1.8 (latest)'
-    }
-
-    options {
-        // Kill this job after one hour.
-        timeout(time: 1, unit: 'HOURS')
-        // When we have test-fails e.g. we don't need to run the remaining steps
-        skipStagesAfterUnstable()
-        buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3'))
-    }
-
-    stages {
-        stage('Initialization') {
-            when {
-                changeset "tools/maven-revealjs-asciidoctor-template/**"
-            }
-            steps {
-                echo 'Building Branch: ' + env.BRANCH_NAME
-                echo 'Using PATH = ' + env.PATH
-            }
-        }
-
-        stage('Cleanup') {
-            when {
-                changeset "tools/maven-revealjs-asciidoctor-template/**"
-            }
-            steps {
-                echo 'Cleaning up the workspace'
-                deleteDir()
-            }
-        }
-
-        stage('Checkout') {
-            when {
-                changeset "tools/maven-revealjs-asciidoctor-template/**"
-            }
-            steps {
-                echo 'Checking out branch ' + env.BRANCH_NAME
-                checkout scm
-            }
-        }
-
-        stage('Build') {
-            when {
-                changeset "tools/maven-revealjs-asciidoctor-template/**"
-            }
-            steps {
-                echo 'Building'
-                sh 'mvn -f tools/maven-revealjs-asciidoctor-template/pom.xml package'
-            }
-        }
-    }
-
-    // Send out notifications on unsuccessful builds.
-    post {
-        // If this build failed, send an email to the list.
-        failure {
-            script {
-                if(env.BRANCH_NAME == "master") {
-                    emailext(
-                        subject: "[Template][BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}]
[${env.BUILD_NUMBER}]'",
-                        body: """
-BUILD-FAILURE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
-
-Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}]
[${env.BUILD_NUMBER}]</a>"
-""",
-                        to: "dev@training.apache.org"
-                    )
-                }
-            }
-        }
-
-        // If this build didn't fail, but there were failing tests, send an email to the
list.
-        unstable {
-            script {
-                if(env.BRANCH_NAME == "master") {
-                    emailext(
-                        subject: "[Template][BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}]
[${env.BUILD_NUMBER}]'",
-                        body: """
-BUILD-UNSTABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
-
-Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}]
[${env.BUILD_NUMBER}]</a>"
-""",
-                        to: "dev@training.apache.org"
-                    )
-                }
-            }
-        }
-
-        // Send an email, if the last build was not successful and this one is.
-        success {
-            // Cleanup the build directory if the build was successful
-            // (in this cae we probably don't have to do any post-build analysis)
-            deleteDir()
-            script {
-                if ((env.BRANCH_NAME == "master") && (currentBuild.previousBuild
!= null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
-                    emailext (
-                        subject: "[Template][BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}]
[${env.BUILD_NUMBER}]'",
-                        body: """
-BUILD-STABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]':
-
-Is back to normal.
-""",
-                        to: "dev@training.apache.org"
-                    )
-                }
-            }
-        }
-    }
-
-}
diff --git a/tools/pom.xml b/tools/pom.xml
index 51fd849..cb7dbc0 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -30,7 +30,9 @@
   <name>Training: Tools</name>
 
   <modules>
-    <module>maven-revealjs-asciidoctor-template</module>
+    <module>content-archetype</module>
+    <module>content-parent-pom</module>
+    <module>content-parent-resources</module>
   </modules>
 
 </project>


Mime
View raw message