diff --git a/.github/workflows/build-and-publish-release.yml b/.github/workflows/build-and-publish-release.yml
index 3256b39..7e3a84d 100644
--- a/.github/workflows/build-and-publish-release.yml
+++ b/.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 }}
\ No newline at end of file
+ --settings=${{ github.workspace }}/.mvn/settings.xml
\ No newline at end of file
diff --git a/.github/workflows/build-and-publish-snapshot.yml b/.github/workflows/build-and-publish-snapshot.yml
index 3633fe4..9f0a39f 100644
--- a/.github/workflows/build-and-publish-snapshot.yml
+++ b/.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: |
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index 4c81c02..03ef155 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -36,18 +36,6 @@
default
-
-
- nexus-central
- Home Lab Nexus Maven Central
-
- true
- warn
-
- ${env.NEXUS_CENTRAL_REPOSITORY_URL}
- default
-
-
diff --git a/pom.xml b/pom.xml
index a264621..7a5e697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,9 +238,22 @@
main
develop
+ feature/
+ release/
+ hotfix/
+
+ [RELEASE] @{version}
+ Update for next development version [skip ci]
+ Update for next development version [skip ci]
+ Update for next development version [skip ci]
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+