From c53544d1af9bf980c47f18d801649976def320df Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 27 Mar 2023 13:24:32 +0200 Subject: [PATCH] start development 1.7.0-SNAPSHOT --- pom.xml | 4 +-- release-startdev.sh | 54 ++++++++++++++++++++++++++++++++++ user-manager-interface/pom.xml | 8 ++--- user-manager-server/pom.xml | 6 ++-- 4 files changed, 63 insertions(+), 9 deletions(-) create mode 100755 release-startdev.sh diff --git a/pom.xml b/pom.xml index 7ae69a0f..b399fade 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <!-- Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den @@ -28,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.itvsh.kop</groupId> <artifactId>user-manager</artifactId> - <version>1.6.0</version> + <version>1.7.0-SNAPSHOT</version> <name>User Manager Parent</name> <packaging>pom</packaging> @@ -86,4 +87,3 @@ </snapshotRepository> </distributionManagement> </project> - diff --git a/release-startdev.sh b/release-startdev.sh new file mode 100755 index 00000000..5edc5f0e --- /dev/null +++ b/release-startdev.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +#set -x + +if [ "$#" -ne 1 ]; then + echo "Aufruf: ozg-release-startdev.sh NEWVERSION" + exit 1 +fi + +NEWVERSION=$1 + +echo + +# pom.xml:main -> project.version setzen +# projectname/pom.xml:parent -> project.parent.version setzen +# projectname/pom.xml:parent,main -> project.parent.version und project.version setzen +# +PROJECTS="pom.xml:main + user-manager-interface/pom.xml:main + user-manager-server/pom.xml:main + " + +for PROJECT in $PROJECTS; +do + POMFILE=$(echo $PROJECT | cut -d':' -f1) + ACTIONS=$(echo $PROJECT | cut -d':' -f2) + + ## Auf SNAPSHOT Versionen testen + if fgrep -q "SNAPSHOT" $POMFILE; then + RED='\033[0;31m' + NC='\033[0m' + echo "${RED}ERROR: Datei "$POMFILE" enthält noch SNAPSHOT Versionen, das sollte hier nicht passieren.${NC}" + exit 1 + fi +echo $ACTIONS + ## Versionen setzen + if [[ $ACTIONS == "main" ]] ; then + xmlstarlet ed --pf -L -N w="http://maven.apache.org/POM/4.0.0" -u '//w:project/w:version' -v $NEWVERSION $POMFILE + fi + + if [[ $ACTIONS == "parent" ]]; then + xmlstarlet ed --pf -L -N w="http://maven.apache.org/POM/4.0.0" -u '//w:project/w:parent/w:version' -v $NEWVERSION $POMFILE + fi +done + + + +echo +echo "NEXT STEPS:" +echo "***********" +echo "Änderungen prüfen" +echo "git commit -a -m 'start development "$NEWVERSION"'" +echo "git push" + diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml index a0ca3499..d6f31bd1 100644 --- a/user-manager-interface/pom.xml +++ b/user-manager-interface/pom.xml @@ -24,19 +24,19 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>de.itvsh.kop.common</groupId> <artifactId>kop-common-dependencies</artifactId> <version>1.6.2</version> - <relativePath /> + <relativePath/> </parent> <groupId>de.itvsh.kop.user</groupId> <artifactId>user-manager-interface</artifactId> - <version>1.6.0</version> + <version>1.7.0-SNAPSHOT</version> <name>UserManager Interface</name> <description>gRPC Interface for User Manager</description> @@ -154,4 +154,4 @@ <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> </snapshotRepository> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml index 98202031..379c684a 100644 --- a/user-manager-server/pom.xml +++ b/user-manager-server/pom.xml @@ -24,12 +24,12 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>de.itvsh.kop.user</groupId> <artifactId>user-manager-server</artifactId> - <version>1.6.0</version> + <version>1.7.0-SNAPSHOT</version> <name>User Manager</name> <properties> @@ -429,4 +429,4 @@ <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> </snapshotRepository> </distributionManagement> -</project> \ No newline at end of file +</project> -- GitLab