Merge pull request #14 from 3dwardch3ng/develop

update maven settings
2024-08-29 12:07:02 +10:00
parent be787a59d3 33d4f29b28
commit cbeec9d79d
2 changed files with 6 additions and 6 deletions
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -48,12 +48,6 @@
                    <layout>default</layout>
                </pluginRepository>
            </pluginRepositories>
-            <configuration>
-                <gitFlowConfig>
-                    <productionBranch>main</productionBranch>
-                    <developmentBranch>develop</developmentBranch>
-                </gitFlowConfig>
-            </configuration>
        </profile>
    </profiles>
    <servers>
--- a/pom.xml
+++ b/pom.xml
@@ -234,6 +234,12 @@
                    <groupId>com.amashchenko.maven.plugin</groupId>
                    <artifactId>gitflow-maven-plugin</artifactId>
                    <version>${gitflow-maven-plugin.version}</version>
+                    <configuration>
+                        <gitFlowConfig>
+                            <productionBranch>main</productionBranch>
+                            <developmentBranch>develop</developmentBranch>
+                        </gitFlowConfig>
+                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>