Merge branch 'AEMaaCS/develop' of https://github.com/merkle-open/aem-…

…generic-multifield into 6.5/develop

# Conflicts:
#	README.md
#	pom.xml

.github/workflows/deploy-snapshot.yml

@@ -0,0 +1,33 @@
+name: deploy snapshot
+
+on:
+ push:
+ branches:
+ - develop
+
+jobs:
+ deploy-snapshot:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ # Checkout source code
+ - name: Checkout
+ uses: actions/checkout@v4
+ # Setup Java environment
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
+ with:
+ java-version: 11
+ distribution: zulu
+ # 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 }}

.github/workflows/release-and-deploy-release.yml

@@ -0,0 +1,66 @@
+name: release and deploy
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ release:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ # Checkout source code
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: '0'
+ # Setup Java environment
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
+ with:
+ java-version: 11
+ distribution: zulu
+ # Install xmllint
+ - name: Install dependencies
+ run: sudo apt-get install libxml2-utils
+ # Set git username and email
+ - name: Set up Git
+ run: |
+ chmod +x ci/setup-git.sh
+ ci/setup-git.sh
+ # Release, set correct versions and create tag
+ - name: Release (versioning/tag)
+ run: |
+ chmod +x ci/mvn-release.sh
+ ci/mvn-release.sh
+
+ deploy-release:
+
+ needs: release
+ runs-on: ubuntu-latest
+
+ steps:
+ # Checkout source code
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ ref: 'master'
+ # Setup Java environment
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
+ with:
+ java-version: 11
+ distribution: zulu
+ # 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 }}

.github/workflows/verify.yml

@@ -0,0 +1,26 @@
+name: verify
+
+on:
+ push:
+ branches-ignore:
+ - master
+ - develop
+
+jobs:
+ verify:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ # Checkout source code
+ - name: Checkout
+ uses: actions/checkout@v4
+ # Setup Java environment
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
+ with:
+ java-version: 11
+ distribution: zulu
+ # Run maven verify
+ - name: Maven verify
+ run: mvn verify --batch-mode

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Namics AG
+Copyright (c) 2018 Merkle Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

ci/mvn-release.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+function getVersion() {
+ xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml
+}
+
+CURRENT_VERSION=$(getVersion)
+if [[ $CURRENT_VERSION == *-SNAPSHOT ]]; then
+ echo "perform release"
+ mvn versions:set -DremoveSnapshot versions:commit --no-transfer-progress
+ NEW_VERSION=$(getVersion)
+
+ echo "commit new release version"
+ git commit -a -m "Release $NEW_VERSION: set master to new release version"
+
+ echo "Update version in README.md"
+ sed -i -e "s|<version>[0-9A-Za-z._-]\{1,\}</version>|<version>$NEW_VERSION</version>|g" README.md && rm -f README.md-e
+ git commit -a -m "Release $NEW_VERSION: Update README.md"
+
+ echo "create tag for new release"
+ git tag -a $NEW_VERSION -m "Release $NEW_VERSION: tag release"
+
+ echo "update develop version"
+ git fetch --all
+ git checkout develop
+ mvn versions:set -DnextSnapshot versions:commit --no-transfer-progress
+ NEXT_SNAPSHOT=$(getVersion)
+ 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

ci/setup-git.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+git config --global user.email "oss@namics.com"
+git config --global user.name "Namics OSS CI"