Update to global-parent 33.

stefanseifert · stefanseifert · commit a85d9eccd255 · 2020-05-13T19:53:27.000+02:00
add configuration for gitlfow-maven-plugin (similar to jgitflow-maven-plugin)
diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -23,6 +23,12 @@
     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="not released">
+      <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.
diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>32</version>
+    <version>33-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -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>
