From a47073a22aa44b6c653821874c642e2884947b6e Mon Sep 17 00:00:00 2001 From: stianst Date: Mon, 25 Sep 2023 14:03:36 +0200 Subject: [PATCH] Attach js-adapter to maven uploads and rewrite version to semver compatible if needed Closes #23312 --- js/libs/keycloak-js/pom.xml | 23 ++++++++++++++++++++++- set-version.sh | 13 ++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/js/libs/keycloak-js/pom.xml b/js/libs/keycloak-js/pom.xml index 236348cba2f0..429140eb448d 100644 --- a/js/libs/keycloak-js/pom.xml +++ b/js/libs/keycloak-js/pom.xml @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false @@ -71,6 +71,27 @@ ../.. + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + ${project.basedir}/assembly.xml + target/keycloak-js-${project.version}.tgz + tar.gz + + + + + + diff --git a/set-version.sh b/set-version.sh index 5dba0ea1bc18..b8e442b3915b 100755 --- a/set-version.sh +++ b/set-version.sh @@ -2,6 +2,13 @@ NEW_VERSION=$1 +# Convert NPM version to semver compatible if needed +if [[ $NEW_VERSION =~ [0-9]+.[0-9]+.[0-9]+.[a-z] ]]; then + NEW_NPM_VERSION=$(echo $NEW_VERSION | awk -F '.' '{ print $1"."$2"."$3"+"$4 }') +else + NEW_NPM_VERSION=$NEW_VERSION +fi + # Maven mvn versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -DgroupId=org.keycloak* -DartifactId=* @@ -13,12 +20,12 @@ cd docs/documentation SHORT_VERSION=`echo $NEW_VERSION | awk -F '.' '{ print $1"."$2 }'` sed -i 's/:project_version: .*/:project_version: '$NEW_VERSION'/' topics/templates/document-attributes.adoc sed -i 's/:project_versionMvn: .*/:project_versionMvn: '$NEW_VERSION'/' topics/templates/document-attributes.adoc -sed -i 's/:project_versionNpm: .*/:project_versionNpm: '$NEW_VERSION'/' topics/templates/document-attributes.adoc +sed -i 's/:project_versionNpm: .*/:project_versionNpm: '$NEW_NPM_VERSION'/' topics/templates/document-attributes.adoc sed -i 's/:project_versionDoc: .*/:project_versionDoc: '$NEW_VERSION'/' topics/templates/document-attributes.adoc cd - # Keycloak JS -echo "$(jq '. += {"version": "'$NEW_VERSION'"}' js/libs/keycloak-js/package.json)" > js/libs/keycloak-js/package.json +echo "$(jq '. += {"version": "'$NEW_NPM_VERSION'"}' js/libs/keycloak-js/package.json)" > js/libs/keycloak-js/package.json # Keycloak Admin Client -echo "$(jq '. += {"version": "'$NEW_VERSION'"}' js/libs/keycloak-admin-client/package.json)" > js/libs/keycloak-admin-client/package.json +echo "$(jq '. += {"version": "'$NEW_NPM_VERSION'"}' js/libs/keycloak-admin-client/package.json)" > js/libs/keycloak-admin-client/package.json