From 60347f0234f3a1592155fdcb66367173588b61f1 Mon Sep 17 00:00:00 2001 From: Jon Koops Date: Thu, 14 Oct 2021 11:00:49 +0200 Subject: [PATCH] Use Maven for versioning and drop NPM version (#1336) --- get-version.sh | 2 +- package-lock.json | 2 -- package.json | 1 - set-version.sh | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) mode change 100644 => 100755 get-version.sh mode change 100644 => 100755 set-version.sh diff --git a/get-version.sh b/get-version.sh old mode 100644 new mode 100755 index bcf6c84fc0..f74d8158c0 --- a/get-version.sh +++ b/get-version.sh @@ -1,3 +1,3 @@ #!/bin/bash -e -awk '/"version":/ { print $2 }' package.json | sed 's/"//g' | sed 's/,//' \ No newline at end of file +mvn --file=./keycloak-theme/pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1a45d8c2eb..d7bf4f5400 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,10 @@ { "name": "keycloak-admin-ui", - "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "keycloak-admin-ui", - "version": "0.0.1", "license": "Apache", "dependencies": { "@keycloak/keycloak-admin-client": "^16.0.0-dev.32", diff --git a/package.json b/package.json index 9b312e819b..28f0100573 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "keycloak-admin-ui", - "version": "0.0.1", "main": "index.js", "homepage": "https://github.com/keycloak/keycloak-admin-ui", "bugs": "https://github.com/keycloak/keycloak-admin-ui/issues", diff --git a/set-version.sh b/set-version.sh old mode 100644 new mode 100755 index a1d0ae9034..6f94ecb7d6 --- a/set-version.sh +++ b/set-version.sh @@ -1,5 +1,4 @@ #!/bin/bash -e NEW_VERSION=$1 -sed -i 's/"version": .*/"version": "'$NEW_VERSION'",/' package.json mvn --file=./keycloak-theme/pom.xml versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -DgroupId=org.keycloak* -DartifactId=* \ No newline at end of file