From 59a9d4939aba5384f2fcb9f540dab4028b4ccb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 3 Apr 2025 11:23:37 +0200 Subject: [PATCH 1/9] 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 ae75c5870b..a0fd030556 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.5 +version = 2.46.6-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 47a3d04e3a..cb3d13447f 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.5", + "version": "2.46.6-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5" + "@scm-manager/ui-plugins": "2.46.6-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 e1b19ecbc1..916435bf4a 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.5", + "version": "2.46.6-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5" + "@scm-manager/ui-plugins": "2.46.6-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 4b03fa72cd..41e1bdc679 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.5", + "version": "2.46.6-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5" + "@scm-manager/ui-plugins": "2.46.6-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 1db8a7e0ce..1386cc35ae 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.5", + "version": "2.46.6-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5" + "@scm-manager/ui-plugins": "2.46.6-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 532def2ca7..5c7057bbd0 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.5", + "version": "2.46.6-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 af0aad2c25..794d84bcd2 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.5", + "version": "2.46.6-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.5", + "@scm-manager/ui-types": "2.46.6-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 5ce2305baf..3d2bf01d00 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.5", + "version": "2.46.6-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.5" + "@scm-manager/ui-components": "2.46.6-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.5", + "@scm-manager/ui-api": "2.46.6-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 bd30809362..e4dff1ab3f 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.5", + "version": "2.46.6-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.5", - "@scm-manager/ui-syntaxhighlighting": "2.46.5", - "@scm-manager/ui-tests": "2.46.5", - "@scm-manager/ui-text": "2.46.5", + "@scm-manager/ui-shortcuts": "2.46.6-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.6-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.6-SNAPSHOT", + "@scm-manager/ui-text": "2.46.6-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.5", - "@scm-manager/ui-extensions": "2.46.5", - "@scm-manager/ui-types": "2.46.5", + "@scm-manager/ui-api": "2.46.6-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", + "@scm-manager/ui-types": "2.46.6-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 b40e88efb3..d155ef936a 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.5", + "version": "2.46.6-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.5", + "@scm-manager/ui-types": "2.46.6-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 8d2aa20602..e9a167a6ba 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.5", + "version": "2.46.6-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.5", + "@scm-manager/ui-styles": "2.46.6-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.5", + "@scm-manager/ui-components": "2.46.6-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.5", - "@scm-manager/ui-overlays": "2.46.5", - "@scm-manager/ui-api": "2.46.5", + "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", + "@scm-manager/ui-api": "2.46.6-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 2166a45854..fb1c103906 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.5", + "version": "2.46.6-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.5", - "@scm-manager/ui-overlays": "2.46.5", + "@scm-manager/ui-styles": "2.46.6-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.6-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.5" + "@scm-manager/ui-components": "2.46.6-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.5" + "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index b1b1ebc2cb..cd2ff624ac 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.5", + "version": "2.46.6-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.5", - "@scm-manager/ui-extensions": "2.46.5", - "@scm-manager/ui-types": "2.46.5", + "@scm-manager/ui-api": "2.46.6-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", + "@scm-manager/ui-types": "2.46.6-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 39d0fec652..b5c010824f 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.5", + "version": "2.46.6-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 5a3018b3d9..8e2fbf8dc7 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.5", + "version": "2.46.6-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.5", + "@scm-manager/ui-styles": "2.46.6-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.5" + "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 814acfbd69..e5c43b28ce 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.5", + "version": "2.46.6-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.5", - "@scm-manager/ui-extensions": "2.46.5", - "@scm-manager/ui-components": "2.46.5", - "@scm-manager/ui-forms": "2.46.5", - "@scm-manager/ui-buttons": "2.46.5", - "@scm-manager/ui-overlays": "2.46.5", - "@scm-manager/ui-layout": "2.46.5", + "@scm-manager/ui-api": "2.46.6-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", + "@scm-manager/ui-components": "2.46.6-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.6-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.6-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.5", - "@scm-manager/ui-tests": "2.46.5", - "@scm-manager/ui-types": "2.46.5", + "@scm-manager/ui-scripts": "2.46.6-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.6-SNAPSHOT", + "@scm-manager/ui-types": "2.46.6-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 15e2b0e774..8b8cec2a66 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.5", + "version": "2.46.6-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 97812fde1b..5ed902e15b 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.5", + "version": "2.46.6-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 ba7c1a3e96..c4f1d6b8e1 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.5", + "version": "2.46.6-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 dc57f32f27..d3973e4cc1 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.5", + "version": "2.46.6-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 070f50a555..9846d8427f 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.5", + "version": "2.46.6-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.5", + "@scm-manager/ui-text": "2.46.6-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 ae95b98b97..91a78334fc 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.5", + "version": "2.46.6-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 bfde048d8e..6ca132e0a6 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.5", + "version": "2.46.6-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 9ff82bb3c8..f04c053639 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.5", + "version": "2.46.6-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 743b46491e..b2c9273e80 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.5", + "version": "2.46.6-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.5", - "@scm-manager/ui-api": "2.46.5", - "@scm-manager/ui-extensions": "2.46.5", - "@scm-manager/ui-modules": "2.46.5", - "@scm-manager/ui-syntaxhighlighting": "2.46.5", - "@scm-manager/ui-text": "2.46.5", - "@scm-manager/ui-shortcuts": "2.46.5", - "@scm-manager/ui-legacy": "2.46.5", - "@scm-manager/ui-forms": "2.46.5", - "@scm-manager/ui-buttons": "2.46.5", - "@scm-manager/ui-overlays": "2.46.5", - "@scm-manager/ui-layout": "2.46.5", + "@scm-manager/ui-components": "2.46.6-SNAPSHOT", + "@scm-manager/ui-api": "2.46.6-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", + "@scm-manager/ui-modules": "2.46.6-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.6-SNAPSHOT", + "@scm-manager/ui-text": "2.46.6-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.6-SNAPSHOT", + "@scm-manager/ui-legacy": "2.46.6-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.6-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.6-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.5", + "@scm-manager/ui-tests": "2.46.6-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From bf642ff82482c4bc364e3b2016dc3078e1ee3137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 27 May 2025 09:42:04 +0200 Subject: [PATCH 2/9] 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 | 4 ++-- scm-ui/ui-components/package.json | 24 +++++++++---------- scm-ui/ui-core/package.json | 6 ++--- scm-ui/ui-extensions/package.json | 6 ++--- scm-ui/ui-forms/package.json | 4 ++-- scm-ui/ui-layout/package.json | 4 ++-- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-overlays/package.json | 4 ++-- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-shortcuts/package.json | 4 ++-- 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 | 4 ++-- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 23 files changed, 76 insertions(+), 76 deletions(-) diff --git a/gradle.properties b/gradle.properties index d16e432d92..0132167e3c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # group = sonia.scm -version = 3.7.5 +version = 3.7.6-SNAPSHOT org.gradle.jvmargs=-Xmx1024M org.gradle.caching=true diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 5ec1a6db50..10d4a94109 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.5" + "@scm-manager/ui-plugins": "3.7.6-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 5a198a5a61..d35462a9d0 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.5" + "@scm-manager/ui-plugins": "3.7.6-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 e91827a7f7..01654a423a 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.5" + "@scm-manager/ui-plugins": "3.7.6-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 b7522d74f5..4fc22500b8 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.5" + "@scm-manager/ui-plugins": "3.7.6-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 3a7e9d06b2..3b7ecc9446 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": "3.7.5", + "version": "3.7.6-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 bde9087d96..14f0d2d11c 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -26,7 +26,7 @@ "react-i18next": "11" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.5", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", "tsup": "^5.12.6", "@types/react-test-renderer": "^17.0.1", "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index 724dc54ac3..35f4c942fd 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "private": false, "main": "index.ts", "license": "AGPL-3.0-only", @@ -13,7 +13,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5" + "@scm-manager/ui-core": "3.7.6-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index a9ac2a8a2f..ebf04a0db4 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -32,8 +32,8 @@ "react-query": "^3.39.2" }, "devDependencies": { - "@scm-manager/ui-tests": "3.7.5", - "@scm-manager/ui-types": "3.7.5", + "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", "@types/fetch-mock": "^7.3.1", "@types/react-select": "^2.0.19", "@types/unist": "^2.0.3", @@ -67,17 +67,17 @@ "@scm-manager/jest-preset": "^2.14.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-syntaxhighlighting": "3.7.5", - "@scm-manager/ui-shortcuts": "3.7.5", - "@scm-manager/ui-text": "3.7.5" + "@scm-manager/ui-syntaxhighlighting": "3.7.6-SNAPSHOT", + "@scm-manager/ui-shortcuts": "3.7.6-SNAPSHOT", + "@scm-manager/ui-text": "3.7.6-SNAPSHOT" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5", - "@scm-manager/ui-overlays": "3.7.5", - "@scm-manager/ui-layout": "3.7.5", - "@scm-manager/ui-buttons": "3.7.5", - "@scm-manager/ui-api": "3.7.5", - "@scm-manager/ui-extensions": "3.7.5", + "@scm-manager/ui-core": "3.7.6-SNAPSHOT", + "@scm-manager/ui-overlays": "3.7.6-SNAPSHOT", + "@scm-manager/ui-layout": "3.7.6-SNAPSHOT", + "@scm-manager/ui-buttons": "3.7.6-SNAPSHOT", + "@scm-manager/ui-api": "3.7.6-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", "deepmerge": "^4.2.2", "hast-util-sanitize": "^3.0.2", "react-diff-view": "^2.4.10", diff --git a/scm-ui/ui-core/package.json b/scm-ui/ui-core/package.json index 04e883c0a8..584f3bc523 100644 --- a/scm-ui/ui-core/package.json +++ b/scm-ui/ui-core/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-core", - "version": "3.7.5", + "version": "3.7.6-SNAPSHOT", "main": "./src/index.ts", "license": "AGPL-3.0-only", "scripts": { @@ -20,7 +20,7 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-api": "3.7.5", + "@scm-manager/ui-api": "3.7.6-SNAPSHOT", "@radix-ui/react-radio-group": "^1.1.3", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3", @@ -37,7 +37,7 @@ "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/tsconfig": "^2.12.0", "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/ui-types": "3.7.5", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", "@types/mousetrap": "1.6.5", "@testing-library/react-hooks": "8.0.1", "@testing-library/react": "12.1.5", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index ae44ef7aca..3639e7c2e6 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "private": false, "author": "Sebastian Sdorra ", @@ -21,8 +21,8 @@ "react": "^17.0.1" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.5", - "@scm-manager/ui-tests": "3.7.5", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 73d7368918..b36177d384 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -21,7 +21,7 @@ "styled-components": "^5.3.5" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5" + "@scm-manager/ui-core": "3.7.6-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index da47706371..b508eaf514 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -14,7 +14,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5" + "@scm-manager/ui-core": "3.7.6-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index b999332a28..ab1c80c975 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -13,13 +13,13 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-api": "3.7.5", - "@scm-manager/ui-extensions": "3.7.5", + "@scm-manager/ui-api": "3.7.6-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", "react-redux": "^5.0.7", "redux": "^4.0.0" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.5", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", "@types/react-redux": "5.0.7", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 2402cac49f..2f1015db59 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -19,7 +19,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5" + "@scm-manager/ui-core": "3.7.6-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 2b3d4325ec..49a204ccd3 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-plugins", "description": "Defines the versions of SCM-Manager plugin dependencies provided by the core webapp. Exclusively used by the postinstall command of @scm-manager/plugin-scripts.", - "version": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "type": "module", "main": "./build/provided-modules.js", @@ -17,14 +17,14 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "3.7.5", - "@scm-manager/ui-buttons": "3.7.5", - "@scm-manager/ui-components": "3.7.5", - "@scm-manager/ui-core": "3.7.5", - "@scm-manager/ui-extensions": "3.7.5", - "@scm-manager/ui-forms": "3.7.5", - "@scm-manager/ui-layout": "3.7.5", - "@scm-manager/ui-overlays": "3.7.5", + "@scm-manager/ui-api": "3.7.6-SNAPSHOT", + "@scm-manager/ui-buttons": "3.7.6-SNAPSHOT", + "@scm-manager/ui-components": "3.7.6-SNAPSHOT", + "@scm-manager/ui-core": "3.7.6-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", + "@scm-manager/ui-forms": "3.7.6-SNAPSHOT", + "@scm-manager/ui-layout": "3.7.6-SNAPSHOT", + "@scm-manager/ui-overlays": "3.7.6-SNAPSHOT", "classnames": "^2.3.1", "query-string": "6.14.1", "redux": "^4.0.0", @@ -43,8 +43,8 @@ "@scm-manager/plugin-scripts": "^1.6.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "3.7.5", - "@scm-manager/ui-types": "3.7.5", + "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/i18next": "^13.0.0", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 837e0048e8..fb021d30df 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "license": "AGPL-3.0-only", "private": true, "main": "index.ts", @@ -18,7 +18,7 @@ "@scm-manager/tsconfig": "^2.13.0" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5" + "@scm-manager/ui-core": "3.7.6-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 5cafe100b4..3717b29013 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index e82589c812..e41fb2b268 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "3.7.5", + "@scm-manager/ui-text": "3.7.6-SNAPSHOT", "nanoid": "^3.3.2", "refractor": "^4.5.0" }, diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 05a2bda2c9..e9eea8c7ca 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index 7bdc75ae5f..7652b5e4b3 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": "3.7.5", + "version": "3.7.6-SNAPSHOT", "private": true, "main": "index.ts", "scripts": { @@ -10,7 +10,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.5" + "@scm-manager/ui-core": "3.7.6-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index da4ae70c41..dca9c212df 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": "3.7.5", + "version": "3.7.6-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 16f620e466..6ee8fe7e02 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-webapp", - "version": "3.7.5", + "version": "3.7.6-SNAPSHOT", "private": true, "scripts": { "test": "jest", @@ -11,16 +11,16 @@ }, "dependencies": { "@headlessui/react": "^1.7.17", - "@scm-manager/ui-components": "3.7.5", - "@scm-manager/ui-api": "3.7.5", - "@scm-manager/ui-extensions": "3.7.5", - "@scm-manager/ui-shortcuts": "3.7.5", - "@scm-manager/ui-legacy": "3.7.5", - "@scm-manager/ui-forms": "3.7.5", - "@scm-manager/ui-core": "3.7.5", - "@scm-manager/ui-overlays": "3.7.5", - "@scm-manager/ui-layout": "3.7.5", - "@scm-manager/ui-buttons": "3.7.5", + "@scm-manager/ui-components": "3.7.6-SNAPSHOT", + "@scm-manager/ui-api": "3.7.6-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", + "@scm-manager/ui-shortcuts": "3.7.6-SNAPSHOT", + "@scm-manager/ui-legacy": "3.7.6-SNAPSHOT", + "@scm-manager/ui-forms": "3.7.6-SNAPSHOT", + "@scm-manager/ui-core": "3.7.6-SNAPSHOT", + "@scm-manager/ui-overlays": "3.7.6-SNAPSHOT", + "@scm-manager/ui-layout": "3.7.6-SNAPSHOT", + "@scm-manager/ui-buttons": "3.7.6-SNAPSHOT", "@radix-ui/react-portal": "^1.0.4", "@react-aria/overlays": "^3.23.1", "classnames": "^2.3.1", @@ -46,10 +46,10 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", - "@scm-manager/ui-tests": "3.7.5", - "@scm-manager/ui-plugins": "3.7.5", + "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", + "@scm-manager/ui-plugins": "3.7.6-SNAPSHOT", "@scm-manager/prettier-config": "^2.12.0", - "@scm-manager/ui-types": "3.7.5", + "@scm-manager/ui-types": "3.7.6-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/react": "^17.0.1", From 4fede25d41915125280751509df2096cc528800d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till-Andr=C3=A9=20Diegeler?= Date: Mon, 12 May 2025 18:41:41 +0200 Subject: [PATCH 3/9] Fix committer in squash merge * Merge: Author and committer from request * Squash: Author from request, committer from session * Rebase: Rebase from original commit, committer from session * Fast-forward: No changes, author and committer from tip These are the four stratagies available for a merge. Each of them has a different requirement regarding who is seen as an author and who as a committer. --- .../changelog/committer_in_squash_merge.yaml | 2 + .../repository/spi/AbstractGitCommand.java | 109 +----- .../repository/spi/GitMergeWithSquash.java | 14 +- .../sonia/scm/repository/spi/MergeHelper.java | 7 +- .../repository/spi/GitMergeCommandTest.java | 356 +++++++++++------- 5 files changed, 241 insertions(+), 247 deletions(-) create mode 100644 gradle/changelog/committer_in_squash_merge.yaml diff --git a/gradle/changelog/committer_in_squash_merge.yaml b/gradle/changelog/committer_in_squash_merge.yaml new file mode 100644 index 0000000000..bed4dbd6f1 --- /dev/null +++ b/gradle/changelog/committer_in_squash_merge.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: The committer in squash merge, rebase, and regular merge is now set to the current user. diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java index 2f6d68a794..88c2021594 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java @@ -18,16 +18,11 @@ package sonia.scm.repository.spi; import com.google.common.base.Strings; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.subject.Subject; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.Status; import org.eclipse.jgit.api.errors.GitAPIException; -import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.PushResult; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteRefUpdate; @@ -37,21 +32,15 @@ import sonia.scm.ConcurrentModificationException; import sonia.scm.ContextEntry; import sonia.scm.repository.GitWorkingCopyFactory; import sonia.scm.repository.InternalRepositoryException; -import sonia.scm.repository.Person; import sonia.scm.repository.work.WorkingCopy; -import sonia.scm.user.User; import java.io.IOException; import java.util.Collection; import java.util.Iterator; -import java.util.Optional; import java.util.function.Function; -import java.util.function.Supplier; import static java.util.Arrays.asList; import static java.util.Arrays.stream; -import static java.util.Optional.empty; -import static java.util.Optional.of; import static java.util.stream.Collectors.toList; import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.NON_EXISTING; import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.OK; @@ -65,7 +54,7 @@ import static sonia.scm.repository.spi.IntegrateChangesFromWorkdirException.forM class AbstractGitCommand { - + private static final Logger logger = LoggerFactory.getLogger(AbstractGitCommand.class); private static final Collection ACCEPTED_UPDATE_STATUS = asList(OK, UP_TO_DATE, NON_EXISTING); @@ -78,6 +67,15 @@ class AbstractGitCommand { this.context = context; } + static ObjectId resolveRevisionOrThrowNotFound(Repository repository, String revision, sonia.scm.repository.Repository scmRepository) throws IOException { + ObjectId resolved = repository.resolve(revision); + if (resolved == null) { + throw notFound(entity("Revision", revision).in(scmRepository)); + } else { + return resolved; + } + } + Repository open() { return context.open(); } @@ -125,15 +123,6 @@ class AbstractGitCommand { return resolveRevisionOrThrowNotFound(repository, revision, scmRepository); } - static ObjectId resolveRevisionOrThrowNotFound(Repository repository, String revision, sonia.scm.repository.Repository scmRepository) throws IOException { - ObjectId resolved = repository.resolve(revision); - if (resolved == null) { - throw notFound(entity("Revision", revision).in(scmRepository)); - } else { - return resolved; - } - } - abstract static class GitCloneWorker { private final Git clone; private final GitContext context; @@ -151,37 +140,10 @@ class AbstractGitCommand { return clone; } - GitContext getContext() { - return context; - } - sonia.scm.repository.Repository getRepository() { return repository; } - void checkOutBranch(String branchName) throws IOException { - try { - clone.checkout().setName(branchName).call(); - } catch (RefNotFoundException e) { - logger.trace("could not checkout branch {} directly; trying to create local branch", branchName, e); - checkOutTargetAsNewLocalBranch(branchName); - } catch (GitAPIException e) { - throw new InternalRepositoryException(repository, "could not checkout branch: " + branchName, e); - } - } - - private void checkOutTargetAsNewLocalBranch(String branchName) throws IOException { - try { - ObjectId targetRevision = resolveRevision(branchName); - clone.checkout().setStartPoint(targetRevision.getName()).setName(branchName).setCreateBranch(true).call(); - } catch (RefNotFoundException e) { - logger.debug("could not checkout branch {} as local branch", branchName, e); - throw notFound(entity("Revision", branchName).in(repository)); - } catch (GitAPIException e) { - throw new InternalRepositoryException(repository, "could not checkout branch as local branch: " + branchName, e); - } - } - ObjectId resolveRevision(String revision) throws IOException { ObjectId resolved = clone.getRepository().resolve(revision); if (resolved == null) { @@ -191,40 +153,6 @@ class AbstractGitCommand { } } - void failIfNotChanged(Supplier doThrow) { - try { - if (clone.status().call().isClean()) { - throw doThrow.get(); - } - } catch (GitAPIException e) { - throw new InternalRepositoryException(repository, "could not read status of repository", e); - } - } - - Optional doCommit(String message, Person author, boolean sign) { - Person authorToUse = determineAuthor(author); - try { - Status status = clone.status().call(); - if (!status.isClean() || isInMerge()) { - return of(clone.commit() - .setAuthor(authorToUse.getName(), authorToUse.getMail()) - .setCommitter(authorToUse.getName(), authorToUse.getMail()) - .setMessage(message) - .setSign(sign) - .setSigningKey(sign ? "SCM-MANAGER-DEFAULT-KEY" : null) - .call()); - } else { - return empty(); - } - } catch (GitAPIException | IOException e) { - throw new InternalRepositoryException(repository, "could not commit changes", e); - } - } - - private boolean isInMerge() throws IOException { - return clone.getRepository().readMergeHeads() != null && !clone.getRepository().readMergeHeads().isEmpty(); - } - void push(String... refSpecs) { push(false, refSpecs); } @@ -269,22 +197,5 @@ class AbstractGitCommand { } logger.debug("pushed changes"); } - - ObjectId getCurrentObjectId() throws IOException { - return getClone().getRepository().getRefDatabase().findRef("HEAD").getObjectId(); - } - - private Person determineAuthor(Person author) { - if (author == null) { - Subject subject = SecurityUtils.getSubject(); - User user = subject.getPrincipals().oneByType(User.class); - String name = user.getDisplayName(); - String email = user.getMail(); - logger.debug("no author set; using logged in user: {} <{}>", name, email); - return new Person(name, email); - } else { - return author; - } - } } } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java index 82b16083a9..49502a2029 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java @@ -16,9 +16,13 @@ package sonia.scm.repository.spi; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.subject.Subject; import org.eclipse.jgit.lib.ObjectId; +import sonia.scm.repository.Person; import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.api.MergeCommandResult; +import sonia.scm.user.User; class GitMergeWithSquash { @@ -31,6 +35,14 @@ class GitMergeWithSquash { } MergeCommandResult run() { - return mergeHelper.doRecursiveMerge(request, (sourceRevision, targetRevision) -> new ObjectId[]{targetRevision}); + return mergeHelper.doRecursiveMerge(request, determineCommitter(), (sourceRevision, targetRevision) -> new ObjectId[]{targetRevision}); + } + + private Person determineCommitter() { + Subject subject = SecurityUtils.getSubject(); + User user = subject.getPrincipals().oneByType(User.class); + String name = user.getDisplayName(); + String email = user.getMail(); + return new Person(name, email); } } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/MergeHelper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/MergeHelper.java index 8422f86665..0b737c0837 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/MergeHelper.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/MergeHelper.java @@ -27,6 +27,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import sonia.scm.NoChangesMadeException; import sonia.scm.repository.InternalRepositoryException; +import sonia.scm.repository.Person; import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.api.MergeCommandResult; @@ -127,6 +128,10 @@ class MergeHelper { } MergeCommandResult doRecursiveMerge(MergeCommandRequest request, BiFunction parents) { + return doRecursiveMerge(request, request.getAuthor(), parents); + } + + MergeCommandResult doRecursiveMerge(MergeCommandRequest request, Person committer, BiFunction parents) { log.trace("merge branch {} into {}", branchToMerge, targetBranch); try { org.eclipse.jgit.lib.Repository repository = context.open(); @@ -148,7 +153,7 @@ class MergeHelper { ObjectId commitId = commitHelper.createCommit( newTreeId, request.getAuthor(), - request.getAuthor(), + committer, determineMessage(), request.isSign(), parents.apply(sourceRevision, targetRevision) diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java index 2b8d9439fd..f716bad6c8 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java @@ -71,8 +71,8 @@ import static org.mockito.Mockito.when; @SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini", username = "admin", password = "secret") public class GitMergeCommandTest extends AbstractGitCommandTestBase { + static final User COMMITTER_PRINCIPAL = new User("committer", "Comrade Mitter", "ilike@mittens.net"); private static final String REALM = "AdminRealm"; - @Rule public ShiroRule shiro = new ShiroRule(); @Mock @@ -167,18 +167,22 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.getRevisionToMerge()).isEqualTo("91b99de908fcd04772798a31c308a64aea1a5523"); assertThat(mergeCommandResult.getTargetRevision()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); - String message = mergeCommit.getFullMessage(); - assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); - assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); - assertThat(message).contains("master", "mergeable"); - // We expect the merge result of file b.txt here by looking up the sha hash of its content. - // If the file is missing (aka not merged correctly) this will throw a MissingObjectException: - byte[] contentOfFileB = repository.open(repository.resolve("9513e9c76e73f3e562fd8e4c909d0607113c77c6")).getBytes(); - assertThat(new String(contentOfFileB)).isEqualTo("b\ncontent from branch\n"); + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + String message = mergeCommit.getFullMessage(); + assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); + assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); + assertThat(mergeCommitter.getName()).isEqualTo("Dirk Gently"); + assertThat(mergeCommitter.getEmailAddress()).isEqualTo("dirk@holistic.det"); + assertThat(message).contains("master", "mergeable"); + // We expect the merge result of file b.txt here by looking up the sha hash of its content. + // If the file is missing (aka not merged correctly) this will throw a MissingObjectException: + byte[] contentOfFileB = repository.open(repository.resolve("9513e9c76e73f3e562fd8e4c909d0607113c77c6")).getBytes(); + assertThat(new String(contentOfFileB)).isEqualTo("b\ncontent from branch\n"); + } } @Test @@ -194,12 +198,13 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - assertThat(mergeCommit.getParentCount()).isEqualTo(2); - assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); - assertThat(mergeCommit.getParent(1).name()).isEqualTo("d81ad6c63d7e2162308d69637b339dedd1d9201c"); + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + assertThat(mergeCommit.getParentCount()).isEqualTo(2); + assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); + assertThat(mergeCommit.getParent(1).name()).isEqualTo("d81ad6c63d7e2162308d69637b339dedd1d9201c"); + } } @Test(expected = NoChangesMadeException.class) @@ -215,8 +220,9 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call().iterator().next().getId(); + try (GitContext context = createContext(); Repository repository = context.open()) { + new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call().iterator().next().getId(); + } command.merge(request); } @@ -235,11 +241,12 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - String message = mergeCommit.getFullMessage(); - assertThat(message).isEqualTo("simple"); + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + String message = mergeCommit.getFullMessage(); + assertThat(message).isEqualTo("simple"); + } } @Test @@ -267,12 +274,12 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { // create concurrent modification after the pre commit hook was fired doAnswer(invocation -> { - RefUpdate refUpdate = createCommand() - .open() - .updateRef("refs/heads/master"); - refUpdate.setNewObjectId(ObjectId.fromString("2f95f02d9c568594d31e78464bd11a96c62e3f91")); - refUpdate.update(); - return null; + try (Repository repository = createCommand().open()) { + RefUpdate refUpdate = repository.updateRef("refs/heads/master"); + refUpdate.setNewObjectId(ObjectId.fromString("2f95f02d9c568594d31e78464bd11a96c62e3f91")); + refUpdate.update(); + return null; + } }).when(repositoryManager).fireHookEvent(any()); command.merge(request); @@ -280,14 +287,8 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { @Test public void shouldTakeAuthorFromSubjectIfNotSet() throws IOException, GitAPIException { - SimplePrincipalCollection principals = new SimplePrincipalCollection(); - principals.add("admin", REALM); - principals.add(new User("dirk", "Dirk Gently", "dirk@holistic.det"), REALM); - shiro.setSubject( - new Subject.Builder() - .principals(principals) - .authenticated(true) - .buildSubject()); + prepareCommitterSubject(); + GitMergeCommand command = createCommand(); MergeCommandRequest request = new MergeCommandRequest(); request.setTargetBranch("master"); @@ -298,11 +299,16 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable mergeCommit = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - PersonIdent mergeAuthor = mergeCommit.iterator().next().getAuthorIdent(); - assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); - assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable mergeCommitIterator = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = mergeCommitIterator.iterator().next(); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + + assertThat(mergeAuthor.getName()).isEqualTo(COMMITTER_PRINCIPAL.getDisplayName()); + assertThat(mergeAuthor.getEmailAddress()).isEqualTo(COMMITTER_PRINCIPAL.getMail()); + assertCommitter(mergeCommitter); + } } @Test @@ -316,26 +322,34 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { MergeCommandResult mergeCommandResult = command.merge(request); - Repository repository = createContext().open(); - assertThat(mergeCommandResult.isSuccess()).isTrue(); + try (GitContext context = createContext(); Repository repository = context.open()) { + assertThat(mergeCommandResult.isSuccess()).isTrue(); - Iterable commits = new Git(repository).log().add(repository.resolve("mergeable")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); - String message = mergeCommit.getFullMessage(); - assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); - assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); - assertThat(message).contains("master", "mergeable"); - // We expect the merge result of file b.txt here by looking up the sha hash of its content. - // If the file is missing (aka not merged correctly) this will throw a MissingObjectException: - byte[] contentOfFileB = repository.open(repository.resolve("9513e9c76e73f3e562fd8e4c909d0607113c77c6")).getBytes(); - assertThat(new String(contentOfFileB)).isEqualTo("b\ncontent from branch\n"); + Iterable commits = new Git(repository).log().add(repository.resolve("mergeable")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + String message = mergeCommit.getFullMessage(); + assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); + assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); + assertThat(mergeCommitter.getName()).isEqualTo("Dirk Gently"); + assertThat(mergeCommitter.getEmailAddress()).isEqualTo("dirk@holistic.det"); + assertThat(message).contains("master", "mergeable"); + // We expect the merge result of file b.txt here by looking up the sha hash of its content. + // If the file is missing (aka not merged correctly) this will throw a MissingObjectException: + byte[] contentOfFileB = repository.open(repository.resolve("9513e9c76e73f3e562fd8e4c909d0607113c77c6")).getBytes(); + assertThat(new String(contentOfFileB)).isEqualTo("b\ncontent from branch\n"); + } } @Test public void shouldSquashCommitsIfSquashIsEnabled() throws IOException, GitAPIException { + GitMergeCommand command = createCommand(); MergeCommandRequest request = new MergeCommandRequest(); + + prepareCommitterSubject(); + request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det")); request.setBranchToMerge("squash"); request.setTargetBranch("master"); @@ -344,75 +358,91 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { MergeCommandResult mergeCommandResult = command.merge(request); - Repository repository = createContext().open(); - assertThat(mergeCommandResult.isSuccess()).isTrue(); - assertThat(mergeCommandResult.getRevisionToMerge()).isEqualTo("35597e9e98fe53167266583848bfef985c2adb27"); - assertThat(mergeCommandResult.getTargetRevision()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); + try (GitContext context = createContext(); Repository repository = context.open()) { + assertThat(mergeCommandResult.isSuccess()).isTrue(); + assertThat(mergeCommandResult.getRevisionToMerge()).isEqualTo("35597e9e98fe53167266583848bfef985c2adb27"); + assertThat(mergeCommandResult.getTargetRevision()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - assertThat(mergeCommit.getParentCount()).isEqualTo(1); - PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); - String message = mergeCommit.getFullMessage(); - assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); - assertThat(message).isEqualTo("this is a squash"); + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + assertThat(mergeCommit.getParentCount()).isEqualTo(1); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + String message = mergeCommit.getFullMessage(); + assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); + assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); + assertCommitter(mergeCommitter); + assertThat(message).isEqualTo("this is a squash"); + } } @Test public void shouldSquashThreeCommitsIntoOne() throws IOException, GitAPIException { GitMergeCommand command = createCommand(); MergeCommandRequest request = new MergeCommandRequest(); + + prepareCommitterSubject(); + request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det")); request.setBranchToMerge("squash"); request.setTargetBranch("master"); request.setMessageTemplate("squash three commits"); request.setMergeStrategy(MergeStrategy.SQUASH); - Repository gitRepository = createContext().open(); - MergeCommandResult mergeCommandResult = command.merge(request); - assertThat(mergeCommandResult.isSuccess()).isTrue(); + try (GitContext context = createContext(); Repository gitRepository = context.open()) { + MergeCommandResult mergeCommandResult = command.merge(request); - Iterable commits = new Git(gitRepository).log().add(gitRepository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); - String message = mergeCommit.getFullMessage(); - assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); - assertThat(message).isEqualTo("squash three commits"); - assertThat(mergeCommit.getParentCount()).isEqualTo(1); - assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); + assertThat(mergeCommandResult.isSuccess()).isTrue(); - GitModificationsCommand modificationsCommand = new GitModificationsCommand(createContext()); - List changes = modificationsCommand.getModifications("master").getAdded(); - assertThat(changes).hasSize(3); + Iterable commits = new Git(gitRepository).log().add(gitRepository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + String message = mergeCommit.getFullMessage(); + + assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); + assertCommitter(mergeCommitter); + assertThat(message).isEqualTo("squash three commits"); + assertThat(mergeCommit.getParentCount()).isEqualTo(1); + assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); + + GitModificationsCommand modificationsCommand = new GitModificationsCommand(createContext()); + List changes = modificationsCommand.getModifications("master").getAdded(); + assertThat(changes).hasSize(3); + } } @Test public void shouldMergeWithFastForward() throws IOException, GitAPIException { - Repository repository = createContext().open(); + try (GitContext context = createContext(); Repository repository = context.open()) { - ObjectId featureBranchHead = new Git(repository).log().add(repository.resolve("squash")).setMaxCount(1).call().iterator().next().getId(); + ObjectId featureBranchHead = new Git(repository).log().add(repository.resolve("squash")).setMaxCount(1).call().iterator().next().getId(); - GitMergeCommand command = createCommand(); - MergeCommandRequest request = new MergeCommandRequest(); - request.setBranchToMerge("squash"); - request.setTargetBranch("master"); - request.setMergeStrategy(MergeStrategy.FAST_FORWARD_IF_POSSIBLE); - request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det")); + GitMergeCommand command = createCommand(); + MergeCommandRequest request = new MergeCommandRequest(); + request.setBranchToMerge("squash"); + request.setTargetBranch("master"); + request.setMergeStrategy(MergeStrategy.FAST_FORWARD_IF_POSSIBLE); + request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det")); - MergeCommandResult mergeCommandResult = command.merge(request); - assertThat(mergeCommandResult.getNewHeadRevision()).isEqualTo("35597e9e98fe53167266583848bfef985c2adb27"); - assertThat(mergeCommandResult.getRevisionToMerge()).isEqualTo("35597e9e98fe53167266583848bfef985c2adb27"); - assertThat(mergeCommandResult.getTargetRevision()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); + MergeCommandResult mergeCommandResult = command.merge(request); + assertThat(mergeCommandResult.getNewHeadRevision()).isEqualTo("35597e9e98fe53167266583848bfef985c2adb27"); + assertThat(mergeCommandResult.getRevisionToMerge()).isEqualTo("35597e9e98fe53167266583848bfef985c2adb27"); + assertThat(mergeCommandResult.getTargetRevision()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); - assertThat(mergeCommandResult.isSuccess()).isTrue(); + assertThat(mergeCommandResult.isSuccess()).isTrue(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - assertThat(mergeCommit.getParentCount()).isEqualTo(1); - PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); - assertThat(mergeAuthor.getName()).isEqualTo("Philip J Fry"); - assertThat(mergeCommit.getId()).isEqualTo(featureBranchHead); + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + assertThat(mergeCommit.getParentCount()).isEqualTo(1); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + + assertThat(mergeAuthor.getName()).isEqualTo("Philip J Fry"); + assertThat(mergeCommitter.getName()).isEqualTo("Eduard Heimbuch"); + assertThat(mergeCommit.getId()).isEqualTo(featureBranchHead); + } } @Test @@ -428,15 +458,16 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); - assertThat(mergeCommit.getParentCount()).isEqualTo(2); - String message = mergeCommit.getFullMessage(); - assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); - assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); - assertThat(message).contains("master", "mergeable"); + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + assertThat(mergeCommit.getParentCount()).isEqualTo(2); + String message = mergeCommit.getFullMessage(); + assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently"); + assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det"); + assertThat(message).contains("master", "mergeable"); + } } @Test(expected = NotFoundException.class) @@ -494,12 +525,12 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - assertThat(mergeCommit.getRawGpgSignature()).isNotEmpty(); - assertThat(mergeCommit.getRawGpgSignature()).isEqualTo(GitTestHelper.SimpleGpgSigner.getSignature()); - + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + assertThat(mergeCommit.getRawGpgSignature()).isNotEmpty(); + assertThat(mergeCommit.getRawGpgSignature()).isEqualTo(GitTestHelper.SimpleGpgSigner.getSignature()); + } } @Test @@ -516,40 +547,53 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - assertThat(mergeCommit.getRawGpgSignature()).isNullOrEmpty(); - + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + assertThat(mergeCommit.getRawGpgSignature()).isNullOrEmpty(); + } } @Test public void shouldAllowMergeWithRebase() throws IOException, GitAPIException { GitMergeCommand command = createCommand(); MergeCommandRequest request = new MergeCommandRequest(); + + prepareCommitterSubject(); + request.setTargetBranch("master"); request.setBranchToMerge("mergeable"); request.setMergeStrategy(MergeStrategy.REBASE); - request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det")); MergeCommandResult mergeCommandResult = command.merge(request); assertThat(mergeCommandResult.isSuccess()).isTrue(); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); - RevCommit mergeCommit = commits.iterator().next(); - assertThat(mergeCommit.getParentCount()).isEqualTo(1); - assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); - assertThat(mergeCommit.getName()).isEqualTo(mergeCommandResult.getNewHeadRevision()); - assertThat(mergeCommit.getName()).doesNotStartWith("91b99de908fcd04772798a31c308a64aea1a5523"); - assertThat(mergeCommit.getAuthorIdent().getWhenAsInstant()).isEqualTo("2018-11-07T10:20:52Z"); // the timestamp of the original commit + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + RevCommit mergeCommit = commits.iterator().next(); + assertThat(mergeCommit.getParentCount()).isEqualTo(1); + assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); + assertThat(mergeCommit.getName()).isEqualTo(mergeCommandResult.getNewHeadRevision()); + assertThat(mergeCommit.getName()).doesNotStartWith("91b99de908fcd04772798a31c308a64aea1a5523"); + assertThat(mergeCommit.getAuthorIdent().getWhenAsInstant()).isEqualTo("2018-11-07T10:20:52Z"); // the timestamp of the original commit + + PersonIdent mergeAuthor = mergeCommit.getAuthorIdent(); + PersonIdent mergeCommitter = mergeCommit.getCommitterIdent(); + + assertThat(mergeAuthor.getName()).isEqualTo("Douglas Adams"); + assertThat(mergeAuthor.getEmailAddress()).isEqualTo("douglas.adams@hitchhiker.com"); + assertCommitter(mergeCommitter); + } } @Test public void shouldRebaseMultipleCommits() throws IOException, GitAPIException { GitMergeCommand command = createCommand(); MergeCommandRequest request = new MergeCommandRequest(); + + prepareCommitterSubject(); + request.setTargetBranch("master"); request.setBranchToMerge("squash"); request.setMergeStrategy(MergeStrategy.REBASE); @@ -557,19 +601,19 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { command.merge(request); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(6).call(); - - assertThat(commits) - .extracting("shortMessage") - .containsExactly( - "third", - "second commit", - "first commit", - "added new line for blame", - "added file f", - "added file d and e in folder c" - ); + try (GitContext context = createContext(); Repository repository = context.open()) { + Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(6).call(); + assertThat(commits) + .extracting("shortMessage") + .containsExactly( + "third", + "second commit", + "first commit", + "added new line for blame", + "added file f", + "added file d and e in folder c" + ); + } } @Test @@ -581,12 +625,16 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { request.setMergeStrategy(MergeStrategy.REBASE); request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det")); + prepareCommitterSubject(); + MergeCommandResult mergeCommandResult = command.merge(request); assertThat(mergeCommandResult.isSuccess()).isFalse(); assertThat(mergeCommandResult.getFilesWithConflict()).containsExactly("a.txt"); - Repository repository = createContext().open(); - Iterable commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + Iterable commits; + try (GitContext context = createContext(); Repository repository = context.open()) { + commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call(); + } RevCommit headCommit = commits.iterator().next(); assertThat(headCommit.getName()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); } @@ -628,4 +676,20 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { } }; } + + private void prepareCommitterSubject() { + SimplePrincipalCollection principals = new SimplePrincipalCollection(); + principals.add("admin", REALM); + principals.add(COMMITTER_PRINCIPAL, REALM); + shiro.setSubject( + new Subject.Builder() + .principals(principals) + .authenticated(true) + .buildSubject()); + } + + private void assertCommitter(PersonIdent mergeCommitter) { + assertThat(mergeCommitter.getName()).isEqualTo(COMMITTER_PRINCIPAL.getDisplayName()); + assertThat(mergeCommitter.getEmailAddress()).isEqualTo(COMMITTER_PRINCIPAL.getMail()); + } } From 9bcb9f25120d4ecb4eb5bfbd0fbb033f7fb48a5a Mon Sep 17 00:00:00 2001 From: Thomas Zerr Date: Mon, 26 May 2025 17:10:36 +0200 Subject: [PATCH 4/9] Add un-escaped url prop in repository nav extension point The url needs to be escaped for the route component, so that react-router can perform his matching logic. But additionally, the components rendered within the extension point also need the unescaped url to create further links based on this url. --- scm-ui/ui-extensions/src/extensionPoints.tsx | 4 ++-- scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scm-ui/ui-extensions/src/extensionPoints.tsx b/scm-ui/ui-extensions/src/extensionPoints.tsx index b6d4fe062f..63b4371bf5 100644 --- a/scm-ui/ui-extensions/src/extensionPoints.tsx +++ b/scm-ui/ui-extensions/src/extensionPoints.tsx @@ -602,7 +602,7 @@ export type RepositorySourcesContentDownloadButton = RenderableExtensionPointDef export type RepositoryRoute = RenderableExtensionPointDefinition< "repository.route", - { repository: Repository; url: string; indexLinks: Links } + { repository: Repository; url: string; indexLinks: Links; urlForLinks: string } >; type RepositoryRedirectProps = { @@ -686,7 +686,7 @@ export type RepositoryInformationTableBottom = RenderableExtensionPointDefinitio export type RepositoryBanner = RenderableExtensionPointDefinition< "repository.banner", - { repository: Repository, url: string } + { repository: Repository; url: string } >; export type UserInformationTableBottom = RenderableExtensionPointDefinition< diff --git a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx index a421fef750..4cf32c6118 100644 --- a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx @@ -343,6 +343,7 @@ const RepositoryRoot = () => { repository, url: urls.escapeUrlForRoute(url), indexLinks, + urlForLinks: url, }} renderAll={true} /> From 7858316a63a528efc9d2de32a4ae4825687ea3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till-Andr=C3=A9=20Diegeler?= Date: Fri, 15 Aug 2025 07:59:05 +0200 Subject: [PATCH 5/9] Bugfix for go-git client issue --- gradle/changelog/gogit_client_support.yaml | 2 ++ .../main/java/sonia/scm/web/GitUserAgentProvider.java | 9 +++++++++ .../java/sonia/scm/web/GitUserAgentProviderTest.java | 1 + 3 files changed, 12 insertions(+) create mode 100644 gradle/changelog/gogit_client_support.yaml diff --git a/gradle/changelog/gogit_client_support.yaml b/gradle/changelog/gogit_client_support.yaml new file mode 100644 index 0000000000..26cebbbf75 --- /dev/null +++ b/gradle/changelog/gogit_client_support.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Support for go-git user agents (e.g. ArgoCD ≥ 2.14) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java index e93c5a3ecc..b770431670 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java @@ -69,7 +69,12 @@ public class GitUserAgentProvider implements UserAgentProvider { .basicAuthenticationCharset(Charsets.UTF_8) .build(); + private static final String PREFIX_GOGIT = "go-git/"; + @VisibleForTesting + static final UserAgent GOGIT = UserAgent.scmClient("go-git") + .basicAuthenticationCharset(Charsets.UTF_8) + .build(); //~--- methods -------------------------------------------------------------- @@ -85,6 +90,8 @@ public class GitUserAgentProvider implements UserAgentProvider { return GIT_LFS; } else if (isGit(lowerUserAgent)) { return GIT; + } else if (isGoGit(lowerUserAgent)) { + return GOGIT; } else { return null; } @@ -109,4 +116,6 @@ public class GitUserAgentProvider implements UserAgentProvider { private boolean isGit(String userAgent) { return userAgent.startsWith(PREFIX_REGULAR); } + + private boolean isGoGit(String userAgent) { return userAgent.startsWith(PREFIX_GOGIT); } } diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitUserAgentProviderTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitUserAgentProviderTest.java index 506b8d5522..56639ba203 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitUserAgentProviderTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitUserAgentProviderTest.java @@ -47,6 +47,7 @@ public class GitUserAgentProviderTest { assertEquals(GitUserAgentProvider.JGIT, parse("jgit/4.5.2")); assertEquals(GitUserAgentProvider.GIT_LFS, parse("git-lfs/2.0.1 (GitHub; windows amd64; go 1.8; git 678cdbd4)")); assertEquals(GitUserAgentProvider.MSYSGIT, parse("git/1.8.3.msysgit.0")); + assertEquals(GitUserAgentProvider.GOGIT, parse("go-git/5.x")); assertNull(parse("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36")); } From 59a7340cb1fbfe67a7fcaa055411c95d8dba81bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 19 Aug 2025 15:23:05 +0200 Subject: [PATCH 6/9] Prepare release of 2.46.6 --- gradle/changelog/gogit_client_support.yaml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 gradle/changelog/gogit_client_support.yaml diff --git a/gradle/changelog/gogit_client_support.yaml b/gradle/changelog/gogit_client_support.yaml deleted file mode 100644 index 26cebbbf75..0000000000 --- a/gradle/changelog/gogit_client_support.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Support for go-git user agents (e.g. ArgoCD ≥ 2.14) From 59b1e58f2fb1018c2a4a1c5099f16c67adb5dee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 19 Aug 2025 19:08:57 +0200 Subject: [PATCH 7/9] Release version 2.46.6 --- CHANGELOG.md | 5 ++++ 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 +++++++++++----------- 26 files changed, 83 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index daa7c12525..829c7a3df2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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.6] - 2025-08-19 +### Fixed +- Support for go-git user agents (e.g. ArgoCD ≥ 2.14) + ## [2.46.5] - 2025-01-17 ### Fixed - Removed the API token error log message that was being printed when the API token was invalid. @@ -1386,3 +1390,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.46.3]: https://scm-manager.org/download/2.46.3 [2.46.4]: https://scm-manager.org/download/2.46.4 [2.46.5]: https://scm-manager.org/download/2.46.5 +[2.46.6]: https://scm-manager.org/download/2.46.6 diff --git a/gradle.properties b/gradle.properties index a0fd030556..38c0dab25f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.6-SNAPSHOT +version = 2.46.6 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index cb3d13447f..95388ec274 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.6-SNAPSHOT", + "version": "2.46.6", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.6-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.6" }, "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 916435bf4a..9b5ee90360 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.6-SNAPSHOT", + "version": "2.46.6", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.6-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.6" }, "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 41e1bdc679..957b0aab2b 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.6-SNAPSHOT", + "version": "2.46.6", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.6-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.6" }, "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 1386cc35ae..e75cdeb326 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.6-SNAPSHOT", + "version": "2.46.6", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.6-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.6" }, "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 5c7057bbd0..0638ff9b57 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.6-SNAPSHOT", + "version": "2.46.6", "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 794d84bcd2..5b6c6fde4f 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT", + "@scm-manager/ui-types": "2.46.6", "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 3d2bf01d00..3a6b6e1a87 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT" + "@scm-manager/ui-components": "2.46.6" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.6-SNAPSHOT", + "@scm-manager/ui-api": "2.46.6", "@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 e4dff1ab3f..ec8d5fface 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.6-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.6-SNAPSHOT", - "@scm-manager/ui-text": "2.46.6-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.6", + "@scm-manager/ui-syntaxhighlighting": "2.46.6", + "@scm-manager/ui-tests": "2.46.6", + "@scm-manager/ui-text": "2.46.6", "@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.6-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", - "@scm-manager/ui-types": "2.46.6-SNAPSHOT", + "@scm-manager/ui-api": "2.46.6", + "@scm-manager/ui-extensions": "2.46.6", + "@scm-manager/ui-types": "2.46.6", "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 d155ef936a..077d04f014 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.6-SNAPSHOT", + "version": "2.46.6", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.6-SNAPSHOT", + "@scm-manager/ui-types": "2.46.6", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index e9a167a6ba..1ae3ebd8f1 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.6", "@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.6-SNAPSHOT", + "@scm-manager/ui-components": "2.46.6", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", - "@scm-manager/ui-api": "2.46.6-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.6", + "@scm-manager/ui-overlays": "2.46.6", + "@scm-manager/ui-api": "2.46.6", "@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 fb1c103906..231dd695d9 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.6", + "@scm-manager/ui-overlays": "2.46.6", "@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.6-SNAPSHOT" + "@scm-manager/ui-components": "2.46.6" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.6" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index cd2ff624ac..04cc046aa5 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.6-SNAPSHOT", + "version": "2.46.6", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.6-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", - "@scm-manager/ui-types": "2.46.6-SNAPSHOT", + "@scm-manager/ui-api": "2.46.6", + "@scm-manager/ui-extensions": "2.46.6", + "@scm-manager/ui-types": "2.46.6", "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 b5c010824f..d047aee826 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.6-SNAPSHOT", + "version": "2.46.6", "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 8e2fbf8dc7..172088d692 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.6", "@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.6-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.6" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index e5c43b28ce..b10ce992c3 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.6-SNAPSHOT", + "version": "2.46.6", "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.6-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", - "@scm-manager/ui-components": "2.46.6-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.6-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.6-SNAPSHOT", + "@scm-manager/ui-api": "2.46.6", + "@scm-manager/ui-extensions": "2.46.6", + "@scm-manager/ui-components": "2.46.6", + "@scm-manager/ui-forms": "2.46.6", + "@scm-manager/ui-buttons": "2.46.6", + "@scm-manager/ui-overlays": "2.46.6", + "@scm-manager/ui-layout": "2.46.6", "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.6-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.6-SNAPSHOT", - "@scm-manager/ui-types": "2.46.6-SNAPSHOT", + "@scm-manager/ui-scripts": "2.46.6", + "@scm-manager/ui-tests": "2.46.6", + "@scm-manager/ui-types": "2.46.6", "@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 8b8cec2a66..b57cf59251 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.6-SNAPSHOT", + "version": "2.46.6", "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 5ed902e15b..a59d14b527 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.6-SNAPSHOT", + "version": "2.46.6", "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 c4f1d6b8e1..164aae51c9 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.6-SNAPSHOT", + "version": "2.46.6", "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 d3973e4cc1..f6aef773fb 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.6-SNAPSHOT", + "version": "2.46.6", "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 9846d8427f..9fcadd19cc 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.6-SNAPSHOT", + "version": "2.46.6", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.6-SNAPSHOT", + "@scm-manager/ui-text": "2.46.6", "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 91a78334fc..0eb79e3d8c 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.6-SNAPSHOT", + "version": "2.46.6", "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 6ca132e0a6..1f54c38fd2 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.6-SNAPSHOT", + "version": "2.46.6", "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 f04c053639..62ab6acbfe 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.6-SNAPSHOT", + "version": "2.46.6", "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 b2c9273e80..76946a1332 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.6-SNAPSHOT", + "version": "2.46.6", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.6-SNAPSHOT", - "@scm-manager/ui-api": "2.46.6-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.6-SNAPSHOT", - "@scm-manager/ui-modules": "2.46.6-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.6-SNAPSHOT", - "@scm-manager/ui-text": "2.46.6-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.46.6-SNAPSHOT", - "@scm-manager/ui-legacy": "2.46.6-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.6-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.6-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.6-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.6-SNAPSHOT", + "@scm-manager/ui-components": "2.46.6", + "@scm-manager/ui-api": "2.46.6", + "@scm-manager/ui-extensions": "2.46.6", + "@scm-manager/ui-modules": "2.46.6", + "@scm-manager/ui-syntaxhighlighting": "2.46.6", + "@scm-manager/ui-text": "2.46.6", + "@scm-manager/ui-shortcuts": "2.46.6", + "@scm-manager/ui-legacy": "2.46.6", + "@scm-manager/ui-forms": "2.46.6", + "@scm-manager/ui-buttons": "2.46.6", + "@scm-manager/ui-overlays": "2.46.6", + "@scm-manager/ui-layout": "2.46.6", "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.6-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.6", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From 9cd41f2d94396779dddecfc76d648a188eb26e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 19 Aug 2025 19:15:52 +0200 Subject: [PATCH 8/9] Prepare release of 3.7.6 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66b281b407..f40180b556 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [3.7.6] - 2025-08-19 +### Fixed +- Support for go-git user agents (e.g. ArgoCD ≥ 2.14) (Patch from 2.46.6) + ## [2.46.6] - 2025-08-19 ### Fixed - Support for go-git user agents (e.g. ArgoCD ≥ 2.14) From 74abd9443310f6a40b0fce3eea2a12f30d4a4cc6 Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Tue, 19 Aug 2025 17:21:22 +0000 Subject: [PATCH 9/9] Release version 3.7.6 --- 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 | 4 ++-- scm-ui/ui-components/package.json | 24 +++++++++---------- scm-ui/ui-core/package.json | 6 ++--- scm-ui/ui-extensions/package.json | 6 ++--- scm-ui/ui-forms/package.json | 4 ++-- scm-ui/ui-layout/package.json | 4 ++-- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-overlays/package.json | 4 ++-- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-shortcuts/package.json | 4 ++-- 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 | 4 ++-- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 23 files changed, 76 insertions(+), 76 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0132167e3c..f9db41cb0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # group = sonia.scm -version = 3.7.6-SNAPSHOT +version = 3.7.6 org.gradle.jvmargs=-Xmx1024M org.gradle.caching=true diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 10d4a94109..9a90674b39 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.6-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.6" }, "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 d35462a9d0..ad8a977413 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.6-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.6" }, "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 01654a423a..377fc52b7f 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.6-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.6" }, "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 4fc22500b8..e1a9c88ba0 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.6-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.6" }, "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 3b7ecc9446..659b4a57d1 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "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 14f0d2d11c..2e274cdda7 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -26,7 +26,7 @@ "react-i18next": "11" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6", "tsup": "^5.12.6", "@types/react-test-renderer": "^17.0.1", "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index 35f4c942fd..55b123a63d 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "private": false, "main": "index.ts", "license": "AGPL-3.0-only", @@ -13,7 +13,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT" + "@scm-manager/ui-core": "3.7.6" }, "devDependencies": { "@scm-manager/prettier-config": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index ebf04a0db4..a961357366 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -32,8 +32,8 @@ "react-query": "^3.39.2" }, "devDependencies": { - "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.6", + "@scm-manager/ui-types": "3.7.6", "@types/fetch-mock": "^7.3.1", "@types/react-select": "^2.0.19", "@types/unist": "^2.0.3", @@ -67,17 +67,17 @@ "@scm-manager/jest-preset": "^2.14.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-syntaxhighlighting": "3.7.6-SNAPSHOT", - "@scm-manager/ui-shortcuts": "3.7.6-SNAPSHOT", - "@scm-manager/ui-text": "3.7.6-SNAPSHOT" + "@scm-manager/ui-syntaxhighlighting": "3.7.6", + "@scm-manager/ui-shortcuts": "3.7.6", + "@scm-manager/ui-text": "3.7.6" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT", - "@scm-manager/ui-overlays": "3.7.6-SNAPSHOT", - "@scm-manager/ui-layout": "3.7.6-SNAPSHOT", - "@scm-manager/ui-buttons": "3.7.6-SNAPSHOT", - "@scm-manager/ui-api": "3.7.6-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", + "@scm-manager/ui-core": "3.7.6", + "@scm-manager/ui-overlays": "3.7.6", + "@scm-manager/ui-layout": "3.7.6", + "@scm-manager/ui-buttons": "3.7.6", + "@scm-manager/ui-api": "3.7.6", + "@scm-manager/ui-extensions": "3.7.6", "deepmerge": "^4.2.2", "hast-util-sanitize": "^3.0.2", "react-diff-view": "^2.4.10", diff --git a/scm-ui/ui-core/package.json b/scm-ui/ui-core/package.json index 584f3bc523..993ca4f58f 100644 --- a/scm-ui/ui-core/package.json +++ b/scm-ui/ui-core/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-core", - "version": "3.7.6-SNAPSHOT", + "version": "3.7.6", "main": "./src/index.ts", "license": "AGPL-3.0-only", "scripts": { @@ -20,7 +20,7 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-api": "3.7.6-SNAPSHOT", + "@scm-manager/ui-api": "3.7.6", "@radix-ui/react-radio-group": "^1.1.3", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3", @@ -37,7 +37,7 @@ "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/tsconfig": "^2.12.0", "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6", "@types/mousetrap": "1.6.5", "@testing-library/react-hooks": "8.0.1", "@testing-library/react": "12.1.5", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 3639e7c2e6..aa3ab9ef7e 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "private": false, "author": "Sebastian Sdorra ", @@ -21,8 +21,8 @@ "react": "^17.0.1" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", - "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6", + "@scm-manager/ui-tests": "3.7.6", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index b36177d384..3668c3872e 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -21,7 +21,7 @@ "styled-components": "^5.3.5" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT" + "@scm-manager/ui-core": "3.7.6" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index b508eaf514..a47c9653a7 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -14,7 +14,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT" + "@scm-manager/ui-core": "3.7.6" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index ab1c80c975..348cd4d75d 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -13,13 +13,13 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-api": "3.7.6-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", + "@scm-manager/ui-api": "3.7.6", + "@scm-manager/ui-extensions": "3.7.6", "react-redux": "^5.0.7", "redux": "^4.0.0" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6", "@types/react-redux": "5.0.7", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 2f1015db59..5f9ae7060b 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -19,7 +19,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT" + "@scm-manager/ui-core": "3.7.6" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 49a204ccd3..f3add2bb2e 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-plugins", "description": "Defines the versions of SCM-Manager plugin dependencies provided by the core webapp. Exclusively used by the postinstall command of @scm-manager/plugin-scripts.", - "version": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "type": "module", "main": "./build/provided-modules.js", @@ -17,14 +17,14 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "3.7.6-SNAPSHOT", - "@scm-manager/ui-buttons": "3.7.6-SNAPSHOT", - "@scm-manager/ui-components": "3.7.6-SNAPSHOT", - "@scm-manager/ui-core": "3.7.6-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", - "@scm-manager/ui-forms": "3.7.6-SNAPSHOT", - "@scm-manager/ui-layout": "3.7.6-SNAPSHOT", - "@scm-manager/ui-overlays": "3.7.6-SNAPSHOT", + "@scm-manager/ui-api": "3.7.6", + "@scm-manager/ui-buttons": "3.7.6", + "@scm-manager/ui-components": "3.7.6", + "@scm-manager/ui-core": "3.7.6", + "@scm-manager/ui-extensions": "3.7.6", + "@scm-manager/ui-forms": "3.7.6", + "@scm-manager/ui-layout": "3.7.6", + "@scm-manager/ui-overlays": "3.7.6", "classnames": "^2.3.1", "query-string": "6.14.1", "redux": "^4.0.0", @@ -43,8 +43,8 @@ "@scm-manager/plugin-scripts": "^1.6.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.6", + "@scm-manager/ui-types": "3.7.6", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/i18next": "^13.0.0", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index fb021d30df..e7fccf0781 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "license": "AGPL-3.0-only", "private": true, "main": "index.ts", @@ -18,7 +18,7 @@ "@scm-manager/tsconfig": "^2.13.0" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT" + "@scm-manager/ui-core": "3.7.6" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 3717b29013..f8684a54f1 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index e41fb2b268..91c506a3ac 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "3.7.6-SNAPSHOT", + "@scm-manager/ui-text": "3.7.6", "nanoid": "^3.3.2", "refractor": "^4.5.0" }, diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index e9eea8c7ca..bd8b39d847 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index 7652b5e4b3..e8aecef719 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "private": true, "main": "index.ts", "scripts": { @@ -10,7 +10,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.6-SNAPSHOT" + "@scm-manager/ui-core": "3.7.6" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index dca9c212df..3af6b6776d 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": "3.7.6-SNAPSHOT", + "version": "3.7.6", "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 6ee8fe7e02..9a0f0df11c 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-webapp", - "version": "3.7.6-SNAPSHOT", + "version": "3.7.6", "private": true, "scripts": { "test": "jest", @@ -11,16 +11,16 @@ }, "dependencies": { "@headlessui/react": "^1.7.17", - "@scm-manager/ui-components": "3.7.6-SNAPSHOT", - "@scm-manager/ui-api": "3.7.6-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.6-SNAPSHOT", - "@scm-manager/ui-shortcuts": "3.7.6-SNAPSHOT", - "@scm-manager/ui-legacy": "3.7.6-SNAPSHOT", - "@scm-manager/ui-forms": "3.7.6-SNAPSHOT", - "@scm-manager/ui-core": "3.7.6-SNAPSHOT", - "@scm-manager/ui-overlays": "3.7.6-SNAPSHOT", - "@scm-manager/ui-layout": "3.7.6-SNAPSHOT", - "@scm-manager/ui-buttons": "3.7.6-SNAPSHOT", + "@scm-manager/ui-components": "3.7.6", + "@scm-manager/ui-api": "3.7.6", + "@scm-manager/ui-extensions": "3.7.6", + "@scm-manager/ui-shortcuts": "3.7.6", + "@scm-manager/ui-legacy": "3.7.6", + "@scm-manager/ui-forms": "3.7.6", + "@scm-manager/ui-core": "3.7.6", + "@scm-manager/ui-overlays": "3.7.6", + "@scm-manager/ui-layout": "3.7.6", + "@scm-manager/ui-buttons": "3.7.6", "@radix-ui/react-portal": "^1.0.4", "@react-aria/overlays": "^3.23.1", "classnames": "^2.3.1", @@ -46,10 +46,10 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", - "@scm-manager/ui-tests": "3.7.6-SNAPSHOT", - "@scm-manager/ui-plugins": "3.7.6-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.6", + "@scm-manager/ui-plugins": "3.7.6", "@scm-manager/prettier-config": "^2.12.0", - "@scm-manager/ui-types": "3.7.6-SNAPSHOT", + "@scm-manager/ui-types": "3.7.6", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/react": "^17.0.1",