diff --git a/.gitignore b/.gitignore index 8731113e961cf767878890449d2bff399f357e1e..08bbd1dde5e283e1c16b4bb43d132ade5eca7061 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +out/ # ---> Maven target/ pom.xml.tag diff --git a/pom.xml b/pom.xml index e0c6b6454357dfbf4d5f62b7ce15816aa71c8a42..dba3c056dfc02fed020bdcb6755288e9faf2fec7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>de.ozgcloud.osiv2</groupId> <artifactId>osiv2-postfach</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.3.0-SNAPSHOT</version> <name>OZG-Cloud-OSIv2-Postfach</name> <description>OSIv2-Postfach-Anbindung für OZG-Cloud-Nachrichten</description> diff --git a/scripts/build-vorgang-manager-image.sh b/scripts/build-vorgang-manager-image.sh index d29858e74a9283405f308cccd84f93946f9eb302..b5c2cc287238727010c6e4fd2e9a22b4b06655eb 100755 --- a/scripts/build-vorgang-manager-image.sh +++ b/scripts/build-vorgang-manager-image.sh @@ -2,7 +2,6 @@ set -e - cd "$(dirname "${BASH_SOURCE[0]}")" pushd .. @@ -11,12 +10,9 @@ echo "OSIV2_POSTFACH_VERSION: $OSIV2_POSTFACH_VERSION" mvn -DskipTests=true clean install popd -# Building in temp directory since maven build fails in this directory -BUILD_DIR=$(mktemp -d) -trap "rm -rf '$BUILD_DIR'" EXIT -cd "$BUILD_DIR" +PROJECT_DIRECTORY=../../ +pushd "$PROJECT_DIRECTORY" -git clone --depth 1 --branch OZG-4094-OSI2-Postfach-Facade https://code.schleswig-holstein.de/ozg-cloud/app/nachrichten-manager.git pushd nachrichten-manager NACHRICHTEN_MANAGER_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo "NACHRICHTEN_MANAGER_VERSION: $NACHRICHTEN_MANAGER_VERSION" @@ -26,7 +22,6 @@ sed -i \ mvn -DskipTests=true clean install popd -git clone --depth 1 --single-branch https://code.schleswig-holstein.de/ozg-cloud/app/vorgang-manager.git pushd vorgang-manager sed -i \ 's|<nachrichten-manager.version>.*</nachrichten-manager.version>|<nachrichten-manager.version>'"$NACHRICHTEN_MANAGER_VERSION"'</nachrichten-manager.version>|g' \ diff --git a/scripts/release-minor-version.sh b/scripts/release-minor-version.sh new file mode 100755 index 0000000000000000000000000000000000000000..090c4ec0c29ea08c4e6eea162b6b25d9735b4e73 --- /dev/null +++ b/scripts/release-minor-version.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -e + +# Change directory to the root of the project +cd "$(dirname "${BASH_SOURCE[0]}")/../" + +if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ] +then + echo "[ERROR] Not on main branch" + exit 1 +fi + +if [ -n "$(git status --porcelain)" ] +then + echo "[ERROR] Working directory is not clean" + exit 1 +fi + +MAVEN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) +if [[ ! "$MAVEN_VERSION" =~ -SNAPSHOT$ ]] +then + echo "[ERROR] Version should end with -SNAPSHOT" + exit 1 +fi + +prompt_yes_no() { + read -p "$1 (y/n) " -n 1 -r + echo + [[ $REPLY =~ ^[Yy]$ ]] || exit 1 +} + +NUMERIC_VERSION=$(echo "$MAVEN_VERSION" | cut -d'-' -f1) +MAJOR=$(echo "$NUMERIC_VERSION" | cut -d '.' -f 1) +MINOR=$(echo "$NUMERIC_VERSION" | cut -d '.' -f 2) +PATCH=$(echo "$NUMERIC_VERSION" | cut -d '.' -f 3) + +CURRENT_VERSION="$MAJOR.$MINOR.$PATCH" +NEW_VERSION="$MAJOR.$((MINOR + 1)).0" +NEW_SNAPSHOT_VERSION="$NEW_VERSION-SNAPSHOT" +prompt_yes_no "Tag $CURRENT_VERSION and bump version from $MAVEN_VERSION to $NEW_SNAPSHOT_VERSION?" + +git tag -m "Release version $CURRENT_VERSION" "$CURRENT_VERSION" +mvn versions:set -DnewVersion="$NEW_SNAPSHOT_VERSION" -DgenerateBackupPoms=false +git add -u +git commit -m "Start development of $NEW_VERSION" + +prompt_yes_no "git push origin main $CURRENT_VERSION?" +git push origin main "$CURRENT_VERSION" \ No newline at end of file