training-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [incubator-training] branch develop updated: Pulled some changes from the 1.0.0 RC1 back to develop
Date Wed, 09 Sep 2020 11:09:32 GMT
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 c1fdad8  Pulled some changes from the 1.0.0 RC1 back to develop
c1fdad8 is described below

commit c1fdad865cf2d107b0eeff28c6927b8b9d17af95
Author: Christofer Dutz <christofer.dutz@c-ware.de>
AuthorDate: Wed Sep 9 13:09:17 2020 +0200

    Pulled some changes from the 1.0.0 RC1 back to develop
---
 .../site/asciidoc/developers/releasing-tools.adoc  | 128 ++++++++++++
 site/src/site/site.xml                             |   1 +
 tools/DISCLAIMER                                   |   8 +
 tools/LICENSE                                      | 230 +++++++++++++++++++++
 tools/NOTICE                                       |   5 +
 tools/content-archetype/pom.xml                    |  13 +-
 .../META-INF/maven/archetype-metadata.xml          |  18 ++
 .../resources/projects/basic/archetype.properties  |  20 +-
 tools/content-parent-pom/pom.xml                   |  19 +-
 tools/content-parent-resources/README.md           |   2 -
 tools/content-parent-resources/pom.xml             |  28 ++-
 tools/pom.xml                                      |  35 +++-
 12 files changed, 463 insertions(+), 44 deletions(-)

diff --git a/site/src/site/asciidoc/developers/releasing-tools.adoc b/site/src/site/asciidoc/developers/releasing-tools.adoc
new file mode 100644
index 0000000..792a4c3
--- /dev/null
+++ b/site/src/site/asciidoc/developers/releasing-tools.adoc
@@ -0,0 +1,128 @@
+//
+//  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.
+//
+
+== Releasing the tools
+
+The tools contain all the parts we need to actually build our presentations.
+
+They currently consist of 3 parts:
+
+1. The `content-parent-resources` which contain all the static resources we need to build
the presentations.
+2. The `content-parent-pom` which is pom, when used as parent for a presentation, will make
sure all is configured correcty, dramatically reducing the amount of configuration needed.
+3. The `content-archetype` which is a maven archetype which can be used to generate a new
presentation module based on the current `content-parent-pom`.
+
+As the parts listed later on in this module listing require the previous ones in the build,
we can't release them all in one go, but have to release them one after the other.
+
+This makes releasing this a little trickier, but in the end it's a lot simpler for our users.
+
+=== Creating a release branch
+
+First we need to create a release branch.
+
+Do this the following way:
+
+  mvn release:branch -DbranchName=releases/tools/1.0
+
+NOTE: We're not using the full version here, as this branch should also contain the bugfix
releases and the tags will have the name using the full version. If we used that for the branch
itself we would get name collisions during the release.
+
+After this command is done, we will still be on the `develop` branch.
+In order to actually start the release, we need to switch to the release branch which was
previously created.
+
+  git checkout releases/tools/1.0
+
+=== Doing the release
+
+The release itself is done via the `maven-release-plugin`.
+
+  mvn release:prepare
+
+The plugin will ask some questions.
+
+- For the new-release version, just hit `[Enter]` and use the default.
+- For the release tag use: releases/tools/1.0.0 (Or the version used in the question before)
+- For the next development version, again just hit `[Enter]` and use the default.
+
+The plugin will now:
+
+- Check if there are any uncommitted files in the release and abort if it finds any.
+- Then it will update the versions of all artifacts in the reactor to the release version.
+- Then check if now any SNAPSHOT version is used and ask to resolve them to release versions
if it finds any (If it finds any, this should be addressed as it should not happen)
+- Then it does a build including tests in order to see if it builds with the new version.
+- If this build is ok, it commits the changed poms with the new versions.
+- Then it tags this version
+- Then it changes the versions to the next version
+- Then it commits these changes too
+- Then it pushes the changes
+
+The next step now uses the release tag created in the previous step and builds the release
artifacts.
+
+  mvn release:perform
+
+This now will:
+
+- Checkout the tag into the "target/checkout" directory
+- Run a `mvn deploy` build in this clean checkout with enabled `apache-release` profile
+- In this build - due to the `apache-release` profile - will also build `source` jars, `javadoc`
jars, create a source distribution
+- Create md5 hashes for all artifacts
+- Sign all artifacts with your GPG Keys
+- Deploy everything to the `Apache Nexus` Staging repository
+
+Last thing you need to do after a successful execution of the release:perform step, is:
+
+- To log in to Apache's Nexus at: https://repository.apache.org/#welcome (using your apache
credentials)
+- Select `Staging Repositories` in the `Build Promotion` menu on the left-hand side (If you
can't see it, you've probably not logged in)
+- Use the search box of the `Staging Repositories` tab and search for "training" (It will
probably have only one)
+- Select the entry.
+- Click on the `Close` button.
+- Enter a meaningful message and click `Confirm`
+- Hit the `Refresh` button in the tab untill the column `Status` changes from `open` to `closed`
+- Copy the `URL` displayed in the details tab for the selected staging repo (In my case:
https://repository.apache.org/content/repositories/orgapachetraining-1000)
+
+We're now done with the preparation of the RC from a Maven perspective.
+
+Next we need to stage the source bundle we will be voting on.
+
+=== Staging the Release Candidate
+
+What we've staged in Nexus is the `convenience binaries` part of the release, the official
release will be the source bundle located in SVN.
+
+These will be located under:
+https://dist.apache.org/repos/dist/dev/incubator/training/
+
+In our case the tools will be located in a sub-directory `tools`, so the final path to the
`RC1` of version `1.0.0` will be: https://dist.apache.org/repos/dist/dev/incubator/training/tools/1.0.0/rc1
+
+I usually prepare a local directory containing all parts and then just import them into SVN
in one go.
+
+The local structure for this is then:
+
+  /tools/1.0.0/rc1/training-tools-1.0.0-source-release.zip
+  /tools/1.0.0/rc1/training-tools-1.0.0-source-release.zip.asc
+  /tools/1.0.0/rc1/training-tools-1.0.0-source-release.zip.sha512
+
+NOTE: Be sure to not take the files form the `target` directory directly, but that you use
the `target/checkout/tools/target` versions instead!
+
+Then I just import the 1.0.0 directory using the following command
+
+  svn import tools/1.0.0 https://dist.apache.org/repos/dist/dev/incubator/training/tools/1.0.0
-m"Staged RC1 of version 1.0.0 Apache Training tools"
+
+If this is the first time you are releasing something for the Apache Training (incubating)
project, be sure to add your PGP key to the `KEYS` file at: https://dist.apache.org/repos/dist/dev/incubator/training/KEYS
+
+=== Sending out the VOTE email
+
+Next step is to actually start the vote by sending out the VOTE email.
+
+Here a template for that:
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
index b6ec630..2b47018 100644
--- a/site/src/site/site.xml
+++ b/site/src/site/site.xml
@@ -110,6 +110,7 @@
       <item name="Decision Making" href="developers/decisions.html"/>
       <!--item name="Maturity" href="developers/maturity.html"/>
       <item name="Releasing" href="developers/release.html"/-->
+      <item name="Releasing (tools)" href="developers/releasing-tools.html"/>
       <item name="Team" href="developers/team.html"/>
       <item name="Website" href="developers/website.html"/>
       <item name="Wiki" href="developers/wiki.html"/>
diff --git a/tools/DISCLAIMER b/tools/DISCLAIMER
new file mode 100644
index 0000000..d295639
--- /dev/null
+++ b/tools/DISCLAIMER
@@ -0,0 +1,8 @@
+Apache Training is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator. Incubation is required
+of all newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of
+the code, it does indicate that the project has yet to be fully endorsed by
+the ASF.
diff --git a/tools/LICENSE b/tools/LICENSE
new file mode 100644
index 0000000..df87df2
--- /dev/null
+++ b/tools/LICENSE
@@ -0,0 +1,230 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+----------------------------------------------
+
+This product includes a modified version of this file:
+content-parent-resources/src/main/resources/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/tools/NOTICE b/tools/NOTICE
new file mode 100644
index 0000000..fac3f46
--- /dev/null
+++ b/tools/NOTICE
@@ -0,0 +1,5 @@
+Apache Training (incubating)
+Copyright 2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/tools/content-archetype/pom.xml b/tools/content-archetype/pom.xml
index b7bfd6a..9a5c67d 100644
--- a/tools/content-archetype/pom.xml
+++ b/tools/content-archetype/pom.xml
@@ -17,20 +17,15 @@
   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">
+<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>23</version>
-
-    <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
-    <relativePath></relativePath>
+    <groupId>org.apache.training</groupId>
+    <artifactId>training-tools</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.training</groupId>
   <artifactId>content-archetype</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
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
index 99b5975..29fbfa4 100644
--- 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
@@ -1,4 +1,22 @@
 <?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.
+
+-->
 <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">
diff --git a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
index 550e0da..e76dca7 100644
--- a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,22 @@
-#Thu Sep 12 11:45:55 PDT 2019
+# ----------------------------------------------------------------------------
+# 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.
+# ----------------------------------------------------------------------------
+
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
diff --git a/tools/content-parent-pom/pom.xml b/tools/content-parent-pom/pom.xml
index 9955cdf..6a3216e 100644
--- a/tools/content-parent-pom/pom.xml
+++ b/tools/content-parent-pom/pom.xml
@@ -17,26 +17,23 @@
   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">
+<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>23</version>
-
-    <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
-    <relativePath></relativePath>
+    <groupId>org.apache.training</groupId>
+    <artifactId>training-tools</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.training</groupId>
   <artifactId>content-parent-pom</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Training: Tools: Content Master Pom</name>
-  <description>Parent pom containing all the configuration for building presentations
with the training template.
+  <description>
+    Parent pom containing all the configuration for building presentations
+    with the training template.
   </description>
 
   <properties>
@@ -56,7 +53,7 @@
     <asciidoctor-revealjs.version>3.1.0</asciidoctor-revealjs.version>
 
     <copy-rename-maven-plugin.version>1.0.1</copy-rename-maven-plugin.version>
-    <download-maven-plugin.version>1.4.2</download-maven-plugin.version>
+    <download-maven-plugin.version>1.6.0</download-maven-plugin.version>
     <jetty-maven-plugin.version>9.4.30.v20200611</jetty-maven-plugin.version>
     <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
     <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
diff --git a/tools/content-parent-resources/README.md b/tools/content-parent-resources/README.md
index 8432240..84f7c36 100644
--- a/tools/content-parent-resources/README.md
+++ b/tools/content-parent-resources/README.md
@@ -1,7 +1,5 @@
 REMARKS:
 
-
-
 the file: src/main/resources/document.html.slim contains a copy oif the original version
of the file in the asciidoctor-reveal.js-{version}/templates directory.
 
 However we add two sets of divs in order to position logos.
diff --git a/tools/content-parent-resources/pom.xml b/tools/content-parent-resources/pom.xml
index d84c98e..2febde9 100644
--- a/tools/content-parent-resources/pom.xml
+++ b/tools/content-parent-resources/pom.xml
@@ -17,24 +17,22 @@
   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</groupId>
-        <artifactId>apache</artifactId>
-        <version>23</version>
-
-        <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
-        <relativePath></relativePath>
-    </parent>
+<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-resources</artifactId>
+    <artifactId>training-tools</artifactId>
     <version>1.1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>content-parent-resources</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
 
-    <name>Training: Tools: Content Master Resources</name>
-    <description>Parent resources module containing all the static resources for building
presentations with the training template.</description>
+  <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/pom.xml b/tools/pom.xml
index d4e8753..e957c6c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -17,27 +17,50 @@
   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">
+<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>training</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>23</version>
+
+    <!-- Required in our case as per http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent
-->
+    <relativePath />
   </parent>
 
+  <groupId>org.apache.training</groupId>
   <artifactId>training-tools</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Training: Tools</name>
 
+  <scm>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-training.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-training.git</developerConnection>
+    <url>https://github.com/apache/incubator-training</url>
+    <tag>HEAD</tag>
+  </scm>
+
   <modules>
     <module>content-archetype</module>
     <module>content-parent-pom</module>
     <module>content-parent-resources</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <!-- Tell the plugin to always release all modules using the same version -->
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>


Mime
View raw message