Merge pull request #16 from 3dwardch3ng/develop

release

.github/workflows/build-and-publish-release.yml

@@ -27,6 +27,11 @@ jobs:
           git config --global user.name "3dwardch3ng"
           git config --global core.autocrlf input
       - name: Start release
+        env:
+          NEXUS_USERNAME: 'edward'
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+          SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
+          RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
         run: |
           mvn gitflow:release-start -B -DpushRemote=true -DallowSnapshots=true \
             -P homelab \
@@ -37,7 +42,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           NEXUS_USERNAME: 'edward'
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-          DEPLOYMENT_REPOSITORY_ID: ${{ secrets.DEPLOYMENT_REPOSITORY_ID }}
           SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
           RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
         run: |
@@ -45,10 +49,14 @@ jobs:
             -P homelab \
             --settings=${{ github.workspace }}/.mvn/settings.xml
       - name: Finish release
+        env:
+          GITHUB_ACTOR: 3dwardch3ng
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          NEXUS_USERNAME: 'edward'
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+          SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
+          RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
         run: |
           mvn gitflow:release-finish -B -DpushRemote=true -DallowSnapshots=true \
             -P homelab \
             --settings=${{ github.workspace }}/.mvn/settings.xml
-        env:
-          GITHUB_ACTOR: 3dwardch3ng
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/build-and-publish-snapshot.yml

@@ -23,11 +23,8 @@ jobs:
           java-version: 17
       - name: Maven Publish
         env:
-          GITHUB_ACTOR: '3dwardch3ng'
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           NEXUS_USERNAME: 'edward'
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-          DEPLOYMENT_REPOSITORY_ID: ${{ secrets.DEPLOYMENT_REPOSITORY_ID }}
           SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
           RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
         run: |

.mvn/settings.xml

@@ -36,18 +36,6 @@
                     <layout>default</layout>
                 </repository>
             </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>nexus-central</id>
-                    <name>Home Lab Nexus Maven Central</name>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>warn</checksumPolicy>
-                    </releases>
-                    <url>${env.NEXUS_CENTRAL_REPOSITORY_URL}</url>
-                    <layout>default</layout>
-                </pluginRepository>
-            </pluginRepositories>
         </profile>
     </profiles>
     <servers>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>sydney.cheng</groupId>
     <artifactId>ec-super-pom</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ec-super-pom</name>
 
@@ -238,9 +238,22 @@
                         <gitFlowConfig>
                             <productionBranch>main</productionBranch>
                             <developmentBranch>develop</developmentBranch>
+                            <featureBranchPrefix>feature/</featureBranchPrefix>
+                            <releaseBranchPrefix>release/</releaseBranchPrefix>
+                            <hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
                         </gitFlowConfig>
+                        <commitMessages>
+                            <releaseFinishMergeMessage>[RELEASE] @{version}</releaseFinishMergeMessage>
+                            <hotfixFinishMessage>Update for next development version [skip ci]</hotfixFinishMessage>
+                            <releaseFinishMessage>Update for next development version [skip ci]</releaseFinishMessage>
+                            <releaseVersionUpdateMessage>Update for next development version [skip ci]</releaseVersionUpdateMessage>
+                        </commitMessages>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>