Merge branch 'develop'

stefanseifert · stefanseifert · commit cedf6baf2dbd · 2020-05-19T17:55:22.000+02:00
diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -23,10 +23,22 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.2.4" date="2020-05-19">
+      <action type="update" dev="sseifert">
+        Update to global-parent 33.
+      </action>
+    </release>
+
     <release version="1.2.2" date="2020-04-14">
       <action type="update" dev="sseifert">
         Update to global-parent 32.
       </action>
+      <action type="fix" dev="sseifert">
+        Update to reflow-maven-skin 1.0.12 and reflow-velocity-tools 1.0.2 to fix broken links in changes report.
+      </action>
+      <action type="fix" dev="sseifert">
+        maven-changes-plugin: Do not generate links to teamlist reports.
+      </action>
     </release>
 
     <release version="1.2.0" date="2020-01-09">
diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>32</version>
+    <version>33</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.4</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -211,12 +211,23 @@
       </plugin>
 
       <!-- GitFlow settings only for this POM -->
+      <plugin>
+        <groupId>com.amashchenko.maven.plugin</groupId>
+        <artifactId>gitflow-maven-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <gitFlowConfig>
+            <releaseBranchPrefix>release/${project.artifactId}-</releaseBranchPrefix>
+            <hotfixBranchPrefix>hotfix/${project.artifactId}-</hotfixBranchPrefix>
+            <versionTagPrefix>${project.artifactId}-</versionTagPrefix>
+          </gitFlowConfig>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>external.atlassian.jgitflow</groupId>
         <artifactId>jgitflow-maven-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <!-- Prefix release numbers with artifactId for GIT repo with more than one released artifact -->
           <flowInitContext>
             <releaseBranchPrefix>release/${project.artifactId}-</releaseBranchPrefix>
             <hotfixBranchPrefix>hotfix/${project.artifactId}-</hotfixBranchPrefix>
@@ -233,7 +244,7 @@
           <dependency>
             <groupId>io.wcm.maven.skins</groupId>
             <artifactId>reflow-velocity-tools</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.2</version>
           </dependency>
           <!-- Reflow skin requires Velocity >= 1.7  -->
           <dependency>
@@ -330,6 +341,8 @@
         <configuration>
           <!-- Allow HTML markup in CDATA sections in changes reports -->
           <escapeHTML>false</escapeHTML>
+          <!-- Do not generate links to teamlist reports -->
+          <teamlist>none</teamlist>
         </configuration>
       </plugin>
 
diff --git a/parent_toplevel/src/site/site.xml b/parent_toplevel/src/site/site.xml
@@ -35,7 +35,7 @@
   <skin>
     <groupId>io.wcm.maven.skins</groupId>
     <artifactId>reflow-maven-skin</artifactId>
-    <version>1.0.10</version>
+    <version>1.0.12</version>
   </skin>
   <custom>
     <reflowSkin>
@@ -117,6 +117,7 @@
       <item name="GitHub project" href="http://github.com/wcm-io-devops" />
       <item name="Subprojects" href="https://wcm.io/subprojects.html" />
       <item name="License" href="https://devops.wcm.io/license.html" />
+      <item name="Commercial Support" href="https://wcm.io/commercial-support.html" />
       <item name="Imprint" href="https://wcm.io/imprint.html" />
     </menu>
     <menu name="Categories" inherit="top">
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.4</version>
     <relativePath>parent_toplevel/pom.xml</relativePath>
   </parent>
 
diff --git a/public_site/pom.xml b/public_site/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.4</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 
