From e79ad2b1b8da1ed5c3e3c5721acaefb68c7361e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 29 May 2024 10:34:19 +0200 Subject: [PATCH 1/4] Prepare for next development iteration --- gradle.properties | 2 +- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-ui/e2e-tests/package.json | 2 +- scm-ui/ui-api/package.json | 4 ++-- scm-ui/ui-buttons/package.json | 6 ++--- scm-ui/ui-components/package.json | 16 ++++++------- scm-ui/ui-extensions/package.json | 4 ++-- scm-ui/ui-forms/package.json | 12 +++++----- scm-ui/ui-layout/package.json | 10 ++++---- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-modules/package.json | 2 +- scm-ui/ui-overlays/package.json | 6 ++--- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-polyfill/package.json | 2 +- scm-ui/ui-scripts/package.json | 2 +- scm-ui/ui-shortcuts/package.json | 2 +- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-syntaxhighlighting/package.json | 4 ++-- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-text/package.json | 2 +- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index a59683a6a0..c4bef28f09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.2 +version = 2.46.3-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 204b6b6764..4e3647f96d 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 6de55e663b..141e539dac 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 8efd87fa82..ebed0e2304 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 84645decda..382b65e73b 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 8dd7f4b8d6..70a019d6d1 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index e941dbbe57..d2fd189510 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index b53f96b141..940295ffb5 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": false, "main": "build/index.js", "module": "build/index.mjs", @@ -24,11 +24,11 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.3.1", "classnames": "^2.2.6", - "@scm-manager/ui-components": "2.46.2" + "@scm-manager/ui-components": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", "@scm-manager/eslint-config": "^2.17.0", "@babel/core": "^7.17.8", "@scm-manager/tsconfig": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 4c6c3452c2..bcab80dc5f 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -24,10 +24,10 @@ "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-shortcuts": "2.46.2", - "@scm-manager/ui-syntaxhighlighting": "2.46.2", - "@scm-manager/ui-tests": "2.46.2", - "@scm-manager/ui-text": "2.46.2", + "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", + "@scm-manager/ui-text": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -65,9 +65,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 3c14a7ad0d..2a104ecac7 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 9133f4e4a3..686aa6c241 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2", + "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -32,7 +32,7 @@ "tsup": "^6.2.3" }, "peerDependencies": { - "@scm-manager/ui-components": "2.46.2", + "@scm-manager/ui-components": "2.46.3-SNAPSHOT", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", - "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", "@headlessui/react": "^1.7.15", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3" diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index 1a4e9e3ebb..ecf548d7ba 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,8 +16,8 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", + "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -37,7 +37,7 @@ "react": "17", "react-dom": "17", "styled-components": "5", - "@scm-manager/ui-components": "2.46.2" + "@scm-manager/ui-components": "2.46.3-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.2" + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 42e629bad0..5cebbaaf39 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index 654287bb58..1ba9fe7767 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 8128753aa3..539cdf8f73 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2", + "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -44,7 +44,7 @@ "@radix-ui/react-dropdown-menu": "2.0.1", "@radix-ui/react-popover": "1.0.6", "@radix-ui/react-tooltip": "1.0.2", - "@scm-manager/ui-buttons": "2.46.2" + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index fdb730fd84..368ac71d53 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" @@ -12,13 +12,13 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-components": "2.46.2", - "@scm-manager/ui-forms": "2.46.2", - "@scm-manager/ui-buttons": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", - "@scm-manager/ui-layout": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-components": "2.46.3-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", "classnames": "^2.2.6", "query-string": "6.14.1", "redux": "^4.0.0", @@ -33,9 +33,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.46.2", - "@scm-manager/ui-tests": "2.46.2", - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-scripts": "2.46.3-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 9f8706e3d3..5c52d6ba03 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index b3b454411f..19791eec3f 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 015eb6378b..3bc196b0d1 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "private": true, "main": "build/index.js", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 999a65c3d1..116e976cbe 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index dccb682d0c..bffad10c6c 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.2", + "@scm-manager/ui-text": "2.46.3-SNAPSHOT", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 59133221d0..030c5aa145 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index b87e03d32b..4e925ba7ff 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 951a87786a..1432266de4 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 30a23c15a9..968af6c15b 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.2", - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-modules": "2.46.2", - "@scm-manager/ui-syntaxhighlighting": "2.46.2", - "@scm-manager/ui-text": "2.46.2", - "@scm-manager/ui-shortcuts": "2.46.2", - "@scm-manager/ui-legacy": "2.46.2", - "@scm-manager/ui-forms": "2.46.2", - "@scm-manager/ui-buttons": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", - "@scm-manager/ui-layout": "2.46.2", + "@scm-manager/ui-components": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-modules": "2.46.3-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", + "@scm-manager/ui-text": "2.46.3-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", + "@scm-manager/ui-legacy": "2.46.3-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "21", @@ -43,7 +43,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.46.2", + "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From ea4a148d8623843ae33a528f044e1c318ef801b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 28 May 2024 08:54:30 +0200 Subject: [PATCH 2/4] Fix determination of default branch for git config on push --- gradle/changelog/git_config_init.yaml | 2 + gradle/changelog/git_initialization.yaml | 3 + .../GitRepositoryConfigInitializer.java | 41 +++- .../GitRepositoryConfigInitializerTest.java | 220 +++++++++++------- 4 files changed, 169 insertions(+), 97 deletions(-) create mode 100644 gradle/changelog/git_config_init.yaml create mode 100644 gradle/changelog/git_initialization.yaml diff --git a/gradle/changelog/git_config_init.yaml b/gradle/changelog/git_config_init.yaml new file mode 100644 index 0000000000..1d71dac14c --- /dev/null +++ b/gradle/changelog/git_config_init.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Default branch evaluation on git config initialization diff --git a/gradle/changelog/git_initialization.yaml b/gradle/changelog/git_initialization.yaml new file mode 100644 index 0000000000..6f1b76d336 --- /dev/null +++ b/gradle/changelog/git_initialization.yaml @@ -0,0 +1,3 @@ +- type: fixed + description: Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) + diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java index edd56e2e74..6d986a5072 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java @@ -29,11 +29,16 @@ import com.google.common.base.Strings; import sonia.scm.EagerSingleton; import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider; import sonia.scm.plugin.Extension; +import sonia.scm.repository.api.RepositoryService; +import sonia.scm.repository.api.RepositoryServiceFactory; import sonia.scm.store.ConfigurationStore; -import javax.inject.Inject; +import java.io.IOException; import java.util.Comparator; import java.util.List; +import java.util.Optional; + +import javax.inject.Inject; @Extension @EagerSingleton @@ -41,28 +46,40 @@ public class GitRepositoryConfigInitializer { private final GitRepositoryHandler repoHandler; private final GitRepositoryConfigStoreProvider storeProvider; + private final RepositoryServiceFactory serviceFactory; @Inject - public GitRepositoryConfigInitializer(GitRepositoryHandler repoHandler, GitRepositoryConfigStoreProvider storeProvider) { + public GitRepositoryConfigInitializer(GitRepositoryHandler repoHandler, GitRepositoryConfigStoreProvider storeProvider, RepositoryServiceFactory serviceFactory) { this.repoHandler = repoHandler; this.storeProvider = storeProvider; + this.serviceFactory = serviceFactory; } @Subscribe - public void initConfig(PostReceiveRepositoryHookEvent event) { - ConfigurationStore store = storeProvider.get(event.getRepository()); - GitRepositoryConfig repositoryConfig = store.get(); - if (repositoryConfig == null || Strings.isNullOrEmpty(repositoryConfig.getDefaultBranch())) { - List defaultBranchCandidates = event.getContext().getBranchProvider().getCreatedOrModified(); + public void initConfig(PostReceiveRepositoryHookEvent event) throws IOException { + if (GitRepositoryHandler.TYPE_NAME.equals(event.getRepository().getType())) { + ConfigurationStore store = storeProvider.get(event.getRepository()); + GitRepositoryConfig repositoryConfig = store.get(); + if (repositoryConfig == null || Strings.isNullOrEmpty(repositoryConfig.getDefaultBranch())) { + String defaultBranch; + try (RepositoryService service = serviceFactory.create(event.getRepository())) { + List branches = service.getBranchesCommand().getBranches().getBranches(); + Optional repoDefaultBranch = branches.stream().filter(Branch::isDefaultBranch).findFirst(); + if (repoDefaultBranch.isPresent()) { + defaultBranch = repoDefaultBranch.get().getName(); + } else { + defaultBranch = determineDefaultBranchFromPush(event); + } + } - String defaultBranch = determineDefaultBranch(defaultBranchCandidates); - - GitRepositoryConfig gitRepositoryConfig = new GitRepositoryConfig(defaultBranch); - store.set(gitRepositoryConfig); + GitRepositoryConfig gitRepositoryConfig = new GitRepositoryConfig(defaultBranch); + store.set(gitRepositoryConfig); + } } } - private String determineDefaultBranch(List defaultBranchCandidates) { + private String determineDefaultBranchFromPush(PostReceiveRepositoryHookEvent event) { + List defaultBranchCandidates = event.getContext().getBranchProvider().getCreatedOrModified(); String globalConfigDefaultBranch = repoHandler.getConfig().getDefaultBranch(); if (defaultBranchCandidates.contains(globalConfigDefaultBranch)) { return globalConfigDefaultBranch; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java index d89d8a42a4..bfe4f5499e 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java @@ -28,18 +28,24 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Answers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider; +import sonia.scm.repository.api.BranchesCommandBuilder; import sonia.scm.repository.api.HookBranchProvider; import sonia.scm.repository.api.HookContext; +import sonia.scm.repository.api.RepositoryService; +import sonia.scm.repository.api.RepositoryServiceFactory; import sonia.scm.store.ConfigurationStore; +import java.io.IOException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -62,116 +68,160 @@ class GitRepositoryConfigInitializerTest { @Mock private PostReceiveRepositoryHookEvent event; + @Mock + private RepositoryServiceFactory serviceFactory; + @Mock + private RepositoryService service; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private BranchesCommandBuilder branchesCommand; + @Mock + private Branches branches; + @InjectMocks private GitRepositoryConfigInitializer initializer; - @BeforeEach - void initMocks() { - when(storeProvider.get(REPOSITORY)).thenReturn(configStore); - when(event.getRepository()).thenReturn(REPOSITORY); - } - @Test - void shouldDoNothingIfDefaultBranchAlreadySet() { - when(configStore.get()).thenReturn(new GitRepositoryConfig("any")); + void shouldSkipNonGitRepositories() throws IOException { + REPOSITORY.setType("svn"); initializer.initConfig(event); verify(event, never()).getContext(); } + @BeforeEach + void initEvent() { + when(event.getRepository()).thenReturn(REPOSITORY); + } + @Nested - class WithGlobalConfig { + class ForGitRepositories { @BeforeEach - void initRepoHandler() { - GitConfig gitConfig = new GitConfig(); - gitConfig.setDefaultBranch("global_default"); - when(repoHandler.getConfig()).thenReturn(gitConfig); + void initMocks() throws IOException { + when(storeProvider.get(REPOSITORY)).thenReturn(configStore); + REPOSITORY.setType("git"); + lenient().when(serviceFactory.create(event.getRepository())).thenReturn(service); + lenient().when(service.getBranchesCommand()).thenReturn(branchesCommand); + lenient().when(branchesCommand.getBranches()).thenReturn(branches); } @Test - void shouldSetDefaultBranchIfNoGitConfigYet() { - when(configStore.get()).thenReturn(null); - initEvent(List.of("main")); + void shouldDoNothingIfDefaultBranchAlreadySet() throws IOException { + when(configStore.get()).thenReturn(new GitRepositoryConfig("any")); initializer.initConfig(event); - verify(event).getContext(); + verify(event, never()).getContext(); } - @Test - void shouldDetermineAndApplyDefaultBranch_GlobalDefault() { - initEvent(List.of("global_default", "main", "master")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + @Nested + class WithGlobalConfig { - initializer.initConfig(event); + @BeforeEach + void initRepoHandler() { + GitConfig gitConfig = new GitConfig(); + gitConfig.setDefaultBranch("global_default"); + lenient().when(repoHandler.getConfig()).thenReturn(gitConfig); + } - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("global_default"); - return true; - })); + + @Test + void shouldSetDefaultBranchFromPushIfNoGitConfigYet() throws IOException { + when(configStore.get()).thenReturn(null); + initEvent(List.of("main")); + + initializer.initConfig(event); + + verify(event).getContext(); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_GlobalDefault() throws IOException { + initEvent(List.of("global_default", "main", "master")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("global_default"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_Main() throws IOException { + initEvent(List.of("master", "main")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("main"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_Master() throws IOException { + initEvent(List.of("develop", "master")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("master"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranchFromRepository_Staging() throws IOException { + when(configStore.get()).thenReturn(null); + initEvent(List.of("master", "main")); + when(branches.getBranches()).thenReturn(List.of(new Branch("staging", "abc", true))); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("staging"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_BestMatch() throws IOException { + initEvent(List.of("test/123", "trillian", "dent")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("dent"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_AnyFallback() throws IOException { + initEvent(List.of("test/123", "x/y/z")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("test/123"); + return true; + })); + } } - @Test - void shouldDetermineAndApplyDefaultBranch_Main() { - initEvent(List.of("master", "main")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("main"); - return true; - })); - } - - @Test - void shouldDetermineAndApplyDefaultBranch_Master() { - initEvent(List.of("develop", "master")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("master"); - return true; - })); - } - - @Test - void shouldDetermineAndApplyDefaultBranch_BestMatch() { - initEvent(List.of("test/123", "trillian", "dent")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("dent"); - return true; - })); - } - - @Test - void shouldDetermineAndApplyDefaultBranch_AnyFallback() { - initEvent(List.of("test/123", "x/y/z")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("test/123"); - return true; - })); + private void initEvent(List branches) { + HookContext hookContext = mock(HookContext.class); + lenient().when(event.getContext()).thenReturn(hookContext); + HookBranchProvider branchProvider = mock(HookBranchProvider.class); + lenient().when(hookContext.getBranchProvider()).thenReturn(branchProvider); + lenient().when(branchProvider.getCreatedOrModified()).thenReturn(branches); } } - - private void initEvent(List branches) { - HookContext hookContext = mock(HookContext.class); - when(event.getContext()).thenReturn(hookContext); - HookBranchProvider branchProvider = mock(HookBranchProvider.class); - when(hookContext.getBranchProvider()).thenReturn(branchProvider); - when(branchProvider.getCreatedOrModified()).thenReturn(branches); - } - } From 5e3b660e8e0e8797d848e98ef1674ebb2a35a61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 29 May 2024 10:38:38 +0200 Subject: [PATCH 3/4] Adjust changelog for release 2.46.3 --- CHANGELOG.md | 9 +++++++-- gradle/changelog/git_config_init.yaml | 2 -- gradle/changelog/git_initialization.yaml | 3 --- 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 gradle/changelog/git_config_init.yaml delete mode 100644 gradle/changelog/git_initialization.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 48cb280dc8..b50e9090e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.46.3] - 2024-05-29 +### Fixed +- Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) +- Default branch evaluation on git config initialization + ## [2.46.2] - 2024-03-04 ### Fixed - Rendering PDF files in source view @@ -12,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.46.1] - 2023-09-01 ### Fixed - Loading LFS files for imports and mirrors (from 2.44.3) -- Handling of submodules in imports and mirrors (from 2.44.3) +- Handling of submodules in imports and mirrors (from 2.44.3) ## [2.46.0] - 2023-08-24 ### Added @@ -1369,4 +1374,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.46.0]: https://scm-manager.org/download/2.46.0 [2.46.1]: https://scm-manager.org/download/2.46.1 [2.46.2]: https://scm-manager.org/download/2.46.2 - +[2.46.3]: https://scm-manager.org/download/2.46.3 diff --git a/gradle/changelog/git_config_init.yaml b/gradle/changelog/git_config_init.yaml deleted file mode 100644 index 1d71dac14c..0000000000 --- a/gradle/changelog/git_config_init.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Default branch evaluation on git config initialization diff --git a/gradle/changelog/git_initialization.yaml b/gradle/changelog/git_initialization.yaml deleted file mode 100644 index 6f1b76d336..0000000000 --- a/gradle/changelog/git_initialization.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- type: fixed - description: Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) - From 87a727b58779425e1d3536915771aaf27a881c5a Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Wed, 29 May 2024 12:02:24 +0000 Subject: [PATCH 4/4] Release version 2.46.3 --- gradle.properties | 2 +- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-ui/e2e-tests/package.json | 2 +- scm-ui/ui-api/package.json | 4 ++-- scm-ui/ui-buttons/package.json | 6 ++--- scm-ui/ui-components/package.json | 16 ++++++------- scm-ui/ui-extensions/package.json | 4 ++-- scm-ui/ui-forms/package.json | 12 +++++----- scm-ui/ui-layout/package.json | 10 ++++---- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-modules/package.json | 2 +- scm-ui/ui-overlays/package.json | 6 ++--- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-polyfill/package.json | 2 +- scm-ui/ui-scripts/package.json | 2 +- scm-ui/ui-shortcuts/package.json | 2 +- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-syntaxhighlighting/package.json | 4 ++-- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-text/package.json | 2 +- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index c4bef28f09..e44eec9e9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.3-SNAPSHOT +version = 2.46.3 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 4e3647f96d..58c8b546cd 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 141e539dac..b38ffa8246 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index ebed0e2304..2d8d698245 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 382b65e73b..363c4404a7 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 70a019d6d1..d37af26ef8 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index d2fd189510..e05debd538 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index 940295ffb5..81af1c6330 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": false, "main": "build/index.js", "module": "build/index.mjs", @@ -24,11 +24,11 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.3.1", "classnames": "^2.2.6", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT" + "@scm-manager/ui-components": "2.46.3" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", "@scm-manager/eslint-config": "^2.17.0", "@babel/core": "^7.17.8", "@scm-manager/tsconfig": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index bcab80dc5f..b6db8e9aa0 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -24,10 +24,10 @@ "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", - "@scm-manager/ui-text": "2.46.3-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.3", + "@scm-manager/ui-syntaxhighlighting": "2.46.3", + "@scm-manager/ui-tests": "2.46.3", + "@scm-manager/ui-text": "2.46.3", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -65,9 +65,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-types": "2.46.3", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 2a104ecac7..7eadc4c94c 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 686aa6c241..f2ea52cd8a 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.3", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -32,7 +32,7 @@ "tsup": "^6.2.3" }, "peerDependencies": { - "@scm-manager/ui-components": "2.46.3-SNAPSHOT", + "@scm-manager/ui-components": "2.46.3", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-api": "2.46.3", "@headlessui/react": "^1.7.15", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3" diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index ecf548d7ba..72af1090ab 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,8 +16,8 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -37,7 +37,7 @@ "react": "17", "react-dom": "17", "styled-components": "5", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT" + "@scm-manager/ui-components": "2.46.3" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.3" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 5cebbaaf39..de7148b740 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-types": "2.46.3", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index 1ba9fe7767..f5184c5e3e 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 539cdf8f73..32371a93af 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.3", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -44,7 +44,7 @@ "@radix-ui/react-dropdown-menu": "2.0.1", "@radix-ui/react-popover": "1.0.6", "@radix-ui/react-tooltip": "1.0.2", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.3" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 368ac71d53..275e4c1533 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" @@ -12,13 +12,13 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-components": "2.46.3", + "@scm-manager/ui-forms": "2.46.3", + "@scm-manager/ui-buttons": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-layout": "2.46.3", "classnames": "^2.2.6", "query-string": "6.14.1", "redux": "^4.0.0", @@ -33,9 +33,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.46.3-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-scripts": "2.46.3", + "@scm-manager/ui-tests": "2.46.3", + "@scm-manager/ui-types": "2.46.3", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 5c52d6ba03..269d22838b 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index 19791eec3f..6eaa42b02a 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 3bc196b0d1..7c11772b7a 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "private": true, "main": "build/index.js", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 116e976cbe..503acdc691 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index bffad10c6c..696227b60f 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.3-SNAPSHOT", + "@scm-manager/ui-text": "2.46.3", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 030c5aa145..bb6161789b 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index 4e925ba7ff..be0a7b6891 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 1432266de4..73c719160a 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 968af6c15b..a1b74638b3 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-modules": "2.46.3-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", - "@scm-manager/ui-text": "2.46.3-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", - "@scm-manager/ui-legacy": "2.46.3-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", + "@scm-manager/ui-components": "2.46.3", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-modules": "2.46.3", + "@scm-manager/ui-syntaxhighlighting": "2.46.3", + "@scm-manager/ui-text": "2.46.3", + "@scm-manager/ui-shortcuts": "2.46.3", + "@scm-manager/ui-legacy": "2.46.3", + "@scm-manager/ui-forms": "2.46.3", + "@scm-manager/ui-buttons": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-layout": "2.46.3", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "21", @@ -43,7 +43,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.3", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3",