diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml
deleted file mode 100644
index 5df9123..0000000
--- a/.github/workflows/deploy-snapshot.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: deploy snapshot
-
-on:
- push:
- branches:
- - develop
-
-jobs:
- deploy-snapshot:
-
- runs-on: ubuntu-latest
-
- steps:
- # Checkout source code
- - name: Checkout
- uses: actions/checkout@v2
- # Setup Java environment
- - name: Set up JDK 17
- uses: actions/setup-java@v1
- with:
- java-version: 17
- - name: Maven setup
- uses: ./.github/actions/mvn-setup
- with:
- mgnl_nexus_user: ${{secrets.MGNL_NEXUS_USER}}
- mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}}
- # Run maven verify
- - name: Maven verify
- run: mvn verify --batch-mode
- # Publish
- - name: Release Maven package
- uses: samuelmeuli/action-maven-publish@v1
- with:
- gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
- gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
- nexus_username: ${{ secrets.OSSRH_USER }}
- nexus_password: ${{ secrets.OSSRH_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/release-and-deploy-release.yml b/.github/workflows/release-and-deploy-release.yml
index c351a02..74beea4 100644
--- a/.github/workflows/release-and-deploy-release.yml
+++ b/.github/workflows/release-and-deploy-release.yml
@@ -1,9 +1,9 @@
-name: release and deploy
+name: 6.2 release and deploy
on:
push:
branches:
- - main
+ - 6.2
jobs:
release:
@@ -17,10 +17,10 @@ jobs:
with:
fetch-depth: '0'
# Setup Java environment
- - name: Set up JDK 17
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: 17
+ java-version: 11
- name: Maven setup
uses: ./.github/actions/mvn-setup
with:
@@ -50,12 +50,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- ref: 'main'
+ ref: '6.2'
# Setup Java environment
- - name: Set up JDK 17
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: 17
+ java-version: 11
- name: Maven setup
uses: ./.github/actions/mvn-setup
with:
@@ -71,4 +71,4 @@ jobs:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
nexus_username: ${{ secrets.OSSRH_USER }}
- nexus_password: ${{ secrets.OSSRH_PASSWORD }}
+ nexus_password: ${{ secrets.OSSRH_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
deleted file mode 100644
index 84e70f4..0000000
--- a/.github/workflows/verify.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: verify
-
-on:
- push:
- branches-ignore:
- - develop
- - main
-
-jobs:
- verify:
-
- runs-on: ubuntu-latest
-
- steps:
- # Checkout source code
- - name: Checkout
- uses: actions/checkout@v2
- # Setup Java environment
- - name: Set up JDK 17
- uses: actions/setup-java@v1
- with:
- java-version: 17
- - name: Maven setup
- uses: ./.github/actions/mvn-setup
- with:
- mgnl_nexus_user: ${{secrets.MGNL_NEXUS_USER}}
- mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}}
- # Run maven verify
- - name: Maven verify
- run: mvn verify --batch-mode
\ No newline at end of file
diff --git a/ci/mvn-release.sh b/ci/mvn-release.sh
index f2383b1..da5614c 100755
--- a/ci/mvn-release.sh
+++ b/ci/mvn-release.sh
@@ -2,16 +2,16 @@
CURRENT_VERSION=`xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml`
-if [[ $CURRENT_VERSION == *-SNAPSHOT ]]; then
- NEW_VERSION=${CURRENT_VERSION%'-SNAPSHOT'}
+if [[ $CURRENT_VERSION == *-6.2 ]]; then
+ NEW_VERSION=${CURRENT_VERSION%'-6.2'}
NEXT_VERSION=`bash ci/semver.sh -p $NEW_VERSION`
- NEXT_SNAPSHOT="$NEXT_VERSION-SNAPSHOT"
+ NEXT_SNAPSHOT="$NEXT_VERSION-6.2"
echo "perform release of $NEW_VERSION from $CURRENT_VERSION and set next develop version $NEXT_SNAPSHOT"
mvn versions:set -DnewVersion=$NEW_VERSION versions:commit --no-transfer-progress
echo "commit new release version"
- git commit -a -m "Release $NEW_VERSION: set main to new release version"
+ git commit -a -m "Release $NEW_VERSION: set 6.2 to new release version"
echo "Update version in README.md"
sed -i -e "s|[0-9A-Za-z._-]\{1,\}|$NEW_VERSION|g" README.md && rm -f README.md-e
@@ -20,16 +20,8 @@ if [[ $CURRENT_VERSION == *-SNAPSHOT ]]; then
echo "create tag for new release"
git tag -a $NEW_VERSION -m "Release $NEW_VERSION: tag release"
- echo "merge main back to develop"
- git fetch --all
- git checkout develop
- git merge main
-
mvn versions:set -DnewVersion=$NEXT_SNAPSHOT versions:commit --no-transfer-progress
- echo "commit new snapshot version"
- git commit -a -m "Release $NEW_VERSION: set develop to next development version $NEXT_SNAPSHOT"
-
git push --all
git push --tags
fi
diff --git a/ci/semver.sh b/ci/semver.sh
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index 378890a..af94f0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.namics.oss.magnolia
magnolia-flexible-image-generator
- 0.1.1-SNAPSHOT
+ 0.0.11-6.2
jar
${project.artifactId}
@@ -29,26 +29,24 @@
-
- 6.3.0
+ 6.2.40
4.0.1
2.10.1
- 3.0.2
- 5.11.0
- 5.13.0
+ 5.10.1
+ 5.7.0
3.11.0
- 3.5.0
+ 3.2.2
3.3.0
3.6.0
3.1.0
1.6.13
- 17
+ 11
UTF-8
@@ -96,11 +94,6 @@
gson
${gson.version}
-
- com.google.code.findbugs
- jsr305
- ${jsr305.nullable.version}
-