diff --git a/package-lock.json b/package-lock.json index c5864cea..6f1d1b05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "threat-dragon", - "version": "v2.3.0-RC1", + "version": "2.3.0-RC2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "threat-dragon", - "version": "v2.3.0-RC1", + "version": "2.3.0-RC2", "hasInstallScript": true, "license": "Apache-2.0", "devDependencies": { diff --git a/package.json b/package.json index 148ec0a8..cb2590a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "threat-dragon", - "version": "v2.3.0-RC1", + "version": "2.3.0-RC2", "private": true, "scripts": { "audit": "npm-run-all -c audit:server audit:site", diff --git a/release-process.md b/release-process.md index 1e55cdc5..9d765e94 100644 --- a/release-process.md +++ b/release-process.md @@ -6,20 +6,23 @@ Before a release it is required that a release candidate version is created. This allows the Threat Dragon community to review and feedback on the proposed release. Changes that are agreed for the release should then be made available with a further release candidate. +For example if RC1, but change for RC2 and so on : + 1. `git clone git@github.com:OWASP/threat-dragon.git` 2. `cd threat-dragon` -3. update version, for example `"version": "2.3.0-RC1",`, in `package.json`, `td.site/package.json` and `td.server/package.json` -4. ensure `buildState` in `td.vue/package.json` is `-latest` -5. update package lock files: `npm install` -6. `npm run build` -7. `npm test` -8. `npm run test:vue` -9. ensure that the package-lock files are up to date using `npm install` -10. `git add --all; git status` -11. `git commit -m"release version 2.3.0-RC1"` -12. `git push` -13. tag the release `git tag v2.3.0-RC1` -14. `git push origin v2.3.0-RC1` +3. update version, for example `"version": "2.3.0",`, in `td.vue/package.json` +4. ensure `buildState` in `td.vue/package.json` is `-RC1` +5. update version, for example `"version": "2.3.0-RC1",`, in `package.json` and `td.server/package.json` +6. update package lock files: `npm install` +7. `npm run build` +8. `npm test` +9. `npm run test:vue` +10. ensure that the package-lock files are up to date using `npm install` +11. `git add --all; git status` +12. `git commit -m"release version 2.3.0-RC1"` +13. `git push` +14. tag the release `git tag v2.3.0-RC1` +15. `git push origin v2.3.0-RC1` repeat as necessary for further release candidates. @@ -34,7 +37,7 @@ After the releases candidate has been agreed by the Threat Dragon community, a r 1. `git clone git@github.com:OWASP/threat-dragon.git` 2. `cd threat-dragon` -3. update version eg `"version": "2.3.0",`, in `package.json`, `td.site/package.json` and `td.server/package.json` +3. update version eg `"version": "2.3.0",`, in `package.json`, `td.vue/package.json` and `td.server/package.json` 4. update `buildState` in `td.vue/package.json` away from `-latest` to '' 5. update package lock files: `npm install` 6. `npm run build` diff --git a/td.server/package-lock.json b/td.server/package-lock.json index f6b08aba..f9ccd72e 100644 --- a/td.server/package-lock.json +++ b/td.server/package-lock.json @@ -1,12 +1,12 @@ { "name": "threat-dragon-server", - "version": "v2.3.0-RC1", + "version": "2.3.0-RC2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "threat-dragon-server", - "version": "v2.3.0-RC1", + "version": "2.3.0-RC2", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/td.server/package.json b/td.server/package.json index a0ad776d..53d58cc4 100644 --- a/td.server/package.json +++ b/td.server/package.json @@ -1,6 +1,6 @@ { "name": "threat-dragon-server", - "version": "v2.3.0-RC1", + "version": "2.3.0-RC2", "private": true, "scripts": { "audit": "npm audit", diff --git a/td.vue/package-lock.json b/td.vue/package-lock.json index 806bb796..4e2b94ad 100644 --- a/td.vue/package-lock.json +++ b/td.vue/package-lock.json @@ -1,12 +1,12 @@ { "name": "threat-dragon", - "version": "v2.3.0-RC1", + "version": "2.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "threat-dragon", - "version": "v2.3.0-RC1", + "version": "2.3.0", "license": "Apache-2.0", "dependencies": { "@antv/x6": "^2.18.1", diff --git a/td.vue/package.json b/td.vue/package.json index cd6acba8..f11c166e 100644 --- a/td.vue/package.json +++ b/td.vue/package.json @@ -1,7 +1,7 @@ { "name": "threat-dragon", "productName": "Threat Dragon", - "version": "v2.3.0-RC1", + "version": "2.3.0", "private": true, "scripts": { "audit": "npm audit", @@ -43,7 +43,7 @@ }, "license": "Apache-2.0", "homepage": "https://owasp.org/www-project-threat-dragon/", - "buildState": "-latest", + "buildState": "-RC2", "repository": { "type": "git", "url": "git://github.com/OWASP/threat-dragon.git"