Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
vegegoku committed Sep 11, 2023
2 parents 31b2d35 + 4caf67b commit 1928275
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,15 @@
since everything set in the file can't be overwritten via command line -->
<versionDigitToIncrement>${bump.digit}</versionDigitToIncrement>

<!-- Execute mvn verify before release -->
<preReleaseGoals>verify</preReleaseGoals>
<preHotfixGoals>verify</preHotfixGoals>

<!-- Configure branches -->
<gitFlowConfig>
<productionBranch>master</productionBranch>
<!-- default is develop, but we use development -->
<developmentBranch>development</developmentBranch>
<developmentBranch>2.0-development</developmentBranch>
</gitFlowConfig>
</configuration>
</plugin>
Expand Down

0 comments on commit 1928275

Please sign in to comment.