From 98a6fd185eda1f38e44e5389fc52da70d7f3bfff Mon Sep 17 00:00:00 2001 From: Laura Gorzitze Date: Mon, 4 Mar 2024 14:45:54 +0100 Subject: [PATCH 01/16] 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 e1eadc11bd..f209cbe6fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.1 +version = 2.46.2-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index e1211b2c33..790348635f 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.1", + "version": "2.46.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.1" + "@scm-manager/ui-plugins": "2.46.2-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 1c04863ac8..c35d4b491e 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.1", + "version": "2.46.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.1" + "@scm-manager/ui-plugins": "2.46.2-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 260e1c0835..632a804356 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.1", + "version": "2.46.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.1" + "@scm-manager/ui-plugins": "2.46.2-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 4b550d87db..924ff8982f 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.1", + "version": "2.46.2-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.1" + "@scm-manager/ui-plugins": "2.46.2-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 039eda26fc..e839c45305 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.1", + "version": "2.46.2-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 4f48ce3bb0..d75036dd95 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.1", + "version": "2.46.2-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.1", + "@scm-manager/ui-types": "2.46.2-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 0da6e201f6..7e65c29a8c 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.1", + "version": "2.46.2-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.1" + "@scm-manager/ui-components": "2.46.2-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.1", + "@scm-manager/ui-api": "2.46.2-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 9c9bd67720..0674af1e1d 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.1", + "version": "2.46.2-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.1", - "@scm-manager/ui-syntaxhighlighting": "2.46.1", - "@scm-manager/ui-tests": "2.46.1", - "@scm-manager/ui-text": "2.46.1", + "@scm-manager/ui-shortcuts": "2.46.2-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.2-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.2-SNAPSHOT", + "@scm-manager/ui-text": "2.46.2-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.1", - "@scm-manager/ui-extensions": "2.46.1", - "@scm-manager/ui-types": "2.46.1", + "@scm-manager/ui-api": "2.46.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", + "@scm-manager/ui-types": "2.46.2-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 8b47dd994e..4945ec5f8a 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.1", + "version": "2.46.2-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.1", + "@scm-manager/ui-types": "2.46.2-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 1f768cb967..689e8399fd 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.1", + "version": "2.46.2-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.1", + "@scm-manager/ui-styles": "2.46.2-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.1", + "@scm-manager/ui-components": "2.46.2-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.1", - "@scm-manager/ui-overlays": "2.46.1", - "@scm-manager/ui-api": "2.46.1", + "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", + "@scm-manager/ui-api": "2.46.2-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 c41834e22d..ee83925509 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.1", + "version": "2.46.2-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.1", - "@scm-manager/ui-overlays": "2.46.1", + "@scm-manager/ui-styles": "2.46.2-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.2-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.1" + "@scm-manager/ui-components": "2.46.2-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.1" + "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index e38ddaf927..e5ae73e4f3 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.1", + "version": "2.46.2-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.1", - "@scm-manager/ui-extensions": "2.46.1", - "@scm-manager/ui-types": "2.46.1", + "@scm-manager/ui-api": "2.46.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", + "@scm-manager/ui-types": "2.46.2-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 f4a2b93618..4f9a3411c9 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.1", + "version": "2.46.2-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 b07c24ff3d..4b8ce2b704 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.1", + "version": "2.46.2-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.1", + "@scm-manager/ui-styles": "2.46.2-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.1" + "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index aa1bb0314c..2f88519671 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.1", + "version": "2.46.2-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.1", - "@scm-manager/ui-extensions": "2.46.1", - "@scm-manager/ui-components": "2.46.1", - "@scm-manager/ui-forms": "2.46.1", - "@scm-manager/ui-buttons": "2.46.1", - "@scm-manager/ui-overlays": "2.46.1", - "@scm-manager/ui-layout": "2.46.1", + "@scm-manager/ui-api": "2.46.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", + "@scm-manager/ui-components": "2.46.2-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.2-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.2-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.1", - "@scm-manager/ui-tests": "2.46.1", - "@scm-manager/ui-types": "2.46.1", + "@scm-manager/ui-scripts": "2.46.2-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.2-SNAPSHOT", + "@scm-manager/ui-types": "2.46.2-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 fb3f40eaf1..2d957eb4ec 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.1", + "version": "2.46.2-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 a15b083705..11ab59b243 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.1", + "version": "2.46.2-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 e0e06a7658..461f966ab4 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.1", + "version": "2.46.2-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 cd4ef49649..d08636be1e 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.1", + "version": "2.46.2-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 19748a53c4..2399e1b368 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.1", + "version": "2.46.2-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.1", + "@scm-manager/ui-text": "2.46.2-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 582f18010a..64f7a6156e 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.1", + "version": "2.46.2-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 1351f17d73..486e6974e3 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.1", + "version": "2.46.2-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 1358fab368..4ad624e569 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.1", + "version": "2.46.2-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 36364ec7e4..2c1b7219c4 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.1", + "version": "2.46.2-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.1", - "@scm-manager/ui-api": "2.46.1", - "@scm-manager/ui-extensions": "2.46.1", - "@scm-manager/ui-modules": "2.46.1", - "@scm-manager/ui-syntaxhighlighting": "2.46.1", - "@scm-manager/ui-text": "2.46.1", - "@scm-manager/ui-shortcuts": "2.46.1", - "@scm-manager/ui-legacy": "2.46.1", - "@scm-manager/ui-forms": "2.46.1", - "@scm-manager/ui-buttons": "2.46.1", - "@scm-manager/ui-overlays": "2.46.1", - "@scm-manager/ui-layout": "2.46.1", + "@scm-manager/ui-components": "2.46.2-SNAPSHOT", + "@scm-manager/ui-api": "2.46.2-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", + "@scm-manager/ui-modules": "2.46.2-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.2-SNAPSHOT", + "@scm-manager/ui-text": "2.46.2-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.2-SNAPSHOT", + "@scm-manager/ui-legacy": "2.46.2-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.2-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.2-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.1", + "@scm-manager/ui-tests": "2.46.2-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From 1ab5c3fe8058ea86f72281d56704e07572ee74cd Mon Sep 17 00:00:00 2001 From: Laura Gorzitze Date: Mon, 4 Mar 2024 14:50:39 +0100 Subject: [PATCH 02/16] Adjust security headers to allow pdf rendering --- .../src/main/java/sonia/scm/filter/SecurityHeadersFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/filter/SecurityHeadersFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/SecurityHeadersFilter.java index ba348b67f6..67689a925c 100644 --- a/scm-webapp/src/main/java/sonia/scm/filter/SecurityHeadersFilter.java +++ b/scm-webapp/src/main/java/sonia/scm/filter/SecurityHeadersFilter.java @@ -42,8 +42,8 @@ public class SecurityHeadersFilter extends HttpFilter { response.setHeader("X-Content-Type-Options", "nosniff"); response.setHeader("Content-Security-Policy", "form-action 'self'; " + - "object-src 'none'; " + - "frame-ancestors 'none'; " + + "object-src 'self'; " + + "frame-ancestors 'self'; " + "block-all-mixed-content" ); response.setHeader("Permissions-Policy", From 40ffdd8a34e0a338020e5b8c2a511b9ece9ee1b5 Mon Sep 17 00:00:00 2001 From: Laura Gorzitze Date: Mon, 4 Mar 2024 16:15:07 +0100 Subject: [PATCH 03/16] Prepare release of 2.46.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13bc13624e..48cb280dc8 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.2] - 2024-03-04 +### Fixed +- Rendering PDF files in source view + ## [2.46.1] - 2023-09-01 ### Fixed - Loading LFS files for imports and mirrors (from 2.44.3) @@ -1363,3 +1367,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.45.0]: https://scm-manager.org/download/2.45.0 [2.45.1]: https://scm-manager.org/download/2.45.1 [2.46.0]: https://scm-manager.org/download/2.46.0 +[2.46.1]: https://scm-manager.org/download/2.46.1 +[2.46.2]: https://scm-manager.org/download/2.46.2 + From b7eaad4c3d14d8735a314216f599ab0c6fdde51e Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Tue, 5 Mar 2024 08:40:39 +0000 Subject: [PATCH 04/16] Release version 2.46.2 --- 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 f209cbe6fe..a59683a6a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.2-SNAPSHOT +version = 2.46.2 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 790348635f..204b6b6764 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.2" }, "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 c35d4b491e..6de55e663b 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.2" }, "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 632a804356..8efd87fa82 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.2" }, "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 924ff8982f..84645decda 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.2" }, "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 e839c45305..8dd7f4b8d6 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 d75036dd95..e941dbbe57 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.46.2-SNAPSHOT", + "@scm-manager/ui-types": "2.46.2", "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 7e65c29a8c..b53f96b141 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "private": false, "main": "build/index.js", "module": "build/index.mjs", @@ -24,11 +24,11 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.3.1", "classnames": "^2.2.6", - "@scm-manager/ui-components": "2.46.2-SNAPSHOT" + "@scm-manager/ui-components": "2.46.2" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.2-SNAPSHOT", + "@scm-manager/ui-api": "2.46.2", "@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 0674af1e1d..4c6c3452c2 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -24,10 +24,10 @@ "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-shortcuts": "2.46.2-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.2-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.2-SNAPSHOT", - "@scm-manager/ui-text": "2.46.2-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.2", + "@scm-manager/ui-syntaxhighlighting": "2.46.2", + "@scm-manager/ui-tests": "2.46.2", + "@scm-manager/ui-text": "2.46.2", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -65,9 +65,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.46.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", - "@scm-manager/ui-types": "2.46.2-SNAPSHOT", + "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-extensions": "2.46.2", + "@scm-manager/ui-types": "2.46.2", "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 4945ec5f8a..3c14a7ad0d 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.2-SNAPSHOT", + "@scm-manager/ui-types": "2.46.2", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 689e8399fd..9133f4e4a3 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.2", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -32,7 +32,7 @@ "tsup": "^6.2.3" }, "peerDependencies": { - "@scm-manager/ui-components": "2.46.2-SNAPSHOT", + "@scm-manager/ui-components": "2.46.2", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", - "@scm-manager/ui-api": "2.46.2-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.2", + "@scm-manager/ui-overlays": "2.46.2", + "@scm-manager/ui-api": "2.46.2", "@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 ee83925509..1a4e9e3ebb 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,8 +16,8 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.2", + "@scm-manager/ui-overlays": "2.46.2", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -37,7 +37,7 @@ "react": "17", "react-dom": "17", "styled-components": "5", - "@scm-manager/ui-components": "2.46.2-SNAPSHOT" + "@scm-manager/ui-components": "2.46.2" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.2" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index e5ae73e4f3..42e629bad0 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", - "@scm-manager/ui-types": "2.46.2-SNAPSHOT", + "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-extensions": "2.46.2", + "@scm-manager/ui-types": "2.46.2", "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 4f9a3411c9..654287bb58 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 4b8ce2b704..8128753aa3 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.2", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -44,7 +44,7 @@ "@radix-ui/react-dropdown-menu": "2.0.1", "@radix-ui/react-popover": "1.0.6", "@radix-ui/react-tooltip": "1.0.2", - "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.2" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 2f88519671..fdb730fd84 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" @@ -12,13 +12,13 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "2.46.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", - "@scm-manager/ui-components": "2.46.2-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.2-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.2-SNAPSHOT", + "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-extensions": "2.46.2", + "@scm-manager/ui-components": "2.46.2", + "@scm-manager/ui-forms": "2.46.2", + "@scm-manager/ui-buttons": "2.46.2", + "@scm-manager/ui-overlays": "2.46.2", + "@scm-manager/ui-layout": "2.46.2", "classnames": "^2.2.6", "query-string": "6.14.1", "redux": "^4.0.0", @@ -33,9 +33,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.46.2-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.2-SNAPSHOT", - "@scm-manager/ui-types": "2.46.2-SNAPSHOT", + "@scm-manager/ui-scripts": "2.46.2", + "@scm-manager/ui-tests": "2.46.2", + "@scm-manager/ui-types": "2.46.2", "@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 2d957eb4ec..9f8706e3d3 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 11ab59b243..b3b454411f 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 461f966ab4..015eb6378b 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 d08636be1e..999a65c3d1 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 2399e1b368..dccb682d0c 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.2-SNAPSHOT", + "@scm-manager/ui-text": "2.46.2", "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 64f7a6156e..59133221d0 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 486e6974e3..b87e03d32b 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 4ad624e569..951a87786a 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "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 2c1b7219c4..30a23c15a9 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.46.2-SNAPSHOT", + "version": "2.46.2", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.2-SNAPSHOT", - "@scm-manager/ui-api": "2.46.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.2-SNAPSHOT", - "@scm-manager/ui-modules": "2.46.2-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.2-SNAPSHOT", - "@scm-manager/ui-text": "2.46.2-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.46.2-SNAPSHOT", - "@scm-manager/ui-legacy": "2.46.2-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.2-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.2-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.2-SNAPSHOT", + "@scm-manager/ui-components": "2.46.2", + "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-extensions": "2.46.2", + "@scm-manager/ui-modules": "2.46.2", + "@scm-manager/ui-syntaxhighlighting": "2.46.2", + "@scm-manager/ui-text": "2.46.2", + "@scm-manager/ui-shortcuts": "2.46.2", + "@scm-manager/ui-legacy": "2.46.2", + "@scm-manager/ui-forms": "2.46.2", + "@scm-manager/ui-buttons": "2.46.2", + "@scm-manager/ui-overlays": "2.46.2", + "@scm-manager/ui-layout": "2.46.2", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "21", @@ -43,7 +43,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.46.2-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.2", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From e79ad2b1b8da1ed5c3e3c5721acaefb68c7361e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 29 May 2024 10:34:19 +0200 Subject: [PATCH 05/16] Prepare for next development iteration --- gradle.properties | 2 +- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-ui/e2e-tests/package.json | 2 +- scm-ui/ui-api/package.json | 4 ++-- scm-ui/ui-buttons/package.json | 6 ++--- scm-ui/ui-components/package.json | 16 ++++++------- scm-ui/ui-extensions/package.json | 4 ++-- scm-ui/ui-forms/package.json | 12 +++++----- scm-ui/ui-layout/package.json | 10 ++++---- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-modules/package.json | 2 +- scm-ui/ui-overlays/package.json | 6 ++--- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-polyfill/package.json | 2 +- scm-ui/ui-scripts/package.json | 2 +- scm-ui/ui-shortcuts/package.json | 2 +- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-syntaxhighlighting/package.json | 4 ++-- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-text/package.json | 2 +- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index a59683a6a0..c4bef28f09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.2 +version = 2.46.3-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 204b6b6764..4e3647f96d 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 6de55e663b..141e539dac 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 8efd87fa82..ebed0e2304 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 84645decda..382b65e73b 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.2" + "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 8dd7f4b8d6..70a019d6d1 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index e941dbbe57..d2fd189510 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index b53f96b141..940295ffb5 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": false, "main": "build/index.js", "module": "build/index.mjs", @@ -24,11 +24,11 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.3.1", "classnames": "^2.2.6", - "@scm-manager/ui-components": "2.46.2" + "@scm-manager/ui-components": "2.46.3-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", "@scm-manager/eslint-config": "^2.17.0", "@babel/core": "^7.17.8", "@scm-manager/tsconfig": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 4c6c3452c2..bcab80dc5f 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -24,10 +24,10 @@ "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-shortcuts": "2.46.2", - "@scm-manager/ui-syntaxhighlighting": "2.46.2", - "@scm-manager/ui-tests": "2.46.2", - "@scm-manager/ui-text": "2.46.2", + "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", + "@scm-manager/ui-text": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -65,9 +65,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 3c14a7ad0d..2a104ecac7 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 9133f4e4a3..686aa6c241 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2", + "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -32,7 +32,7 @@ "tsup": "^6.2.3" }, "peerDependencies": { - "@scm-manager/ui-components": "2.46.2", + "@scm-manager/ui-components": "2.46.3-SNAPSHOT", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", - "@scm-manager/ui-api": "2.46.2", + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", "@headlessui/react": "^1.7.15", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3" diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index 1a4e9e3ebb..ecf548d7ba 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,8 +16,8 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", + "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -37,7 +37,7 @@ "react": "17", "react-dom": "17", "styled-components": "5", - "@scm-manager/ui-components": "2.46.2" + "@scm-manager/ui-components": "2.46.3-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.2" + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 42e629bad0..5cebbaaf39 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index 654287bb58..1ba9fe7767 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 8128753aa3..539cdf8f73 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.2", + "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -44,7 +44,7 @@ "@radix-ui/react-dropdown-menu": "2.0.1", "@radix-ui/react-popover": "1.0.6", "@radix-ui/react-tooltip": "1.0.2", - "@scm-manager/ui-buttons": "2.46.2" + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index fdb730fd84..368ac71d53 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" @@ -12,13 +12,13 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-components": "2.46.2", - "@scm-manager/ui-forms": "2.46.2", - "@scm-manager/ui-buttons": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", - "@scm-manager/ui-layout": "2.46.2", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-components": "2.46.3-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", "classnames": "^2.2.6", "query-string": "6.14.1", "redux": "^4.0.0", @@ -33,9 +33,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.46.2", - "@scm-manager/ui-tests": "2.46.2", - "@scm-manager/ui-types": "2.46.2", + "@scm-manager/ui-scripts": "2.46.3-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 9f8706e3d3..5c52d6ba03 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index b3b454411f..19791eec3f 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 015eb6378b..3bc196b0d1 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "license": "MIT", "private": true, "main": "build/index.js", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 999a65c3d1..116e976cbe 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index dccb682d0c..bffad10c6c 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.2", + "@scm-manager/ui-text": "2.46.3-SNAPSHOT", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 59133221d0..030c5aa145 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index b87e03d32b..4e925ba7ff 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 951a87786a..1432266de4 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 30a23c15a9..968af6c15b 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.46.2", + "version": "2.46.3-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.2", - "@scm-manager/ui-api": "2.46.2", - "@scm-manager/ui-extensions": "2.46.2", - "@scm-manager/ui-modules": "2.46.2", - "@scm-manager/ui-syntaxhighlighting": "2.46.2", - "@scm-manager/ui-text": "2.46.2", - "@scm-manager/ui-shortcuts": "2.46.2", - "@scm-manager/ui-legacy": "2.46.2", - "@scm-manager/ui-forms": "2.46.2", - "@scm-manager/ui-buttons": "2.46.2", - "@scm-manager/ui-overlays": "2.46.2", - "@scm-manager/ui-layout": "2.46.2", + "@scm-manager/ui-components": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", + "@scm-manager/ui-modules": "2.46.3-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", + "@scm-manager/ui-text": "2.46.3-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", + "@scm-manager/ui-legacy": "2.46.3-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "21", @@ -43,7 +43,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.46.2", + "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From ea4a148d8623843ae33a528f044e1c318ef801b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 28 May 2024 08:54:30 +0200 Subject: [PATCH 06/16] Fix determination of default branch for git config on push --- gradle/changelog/git_config_init.yaml | 2 + gradle/changelog/git_initialization.yaml | 3 + .../GitRepositoryConfigInitializer.java | 41 +++- .../GitRepositoryConfigInitializerTest.java | 220 +++++++++++------- 4 files changed, 169 insertions(+), 97 deletions(-) create mode 100644 gradle/changelog/git_config_init.yaml create mode 100644 gradle/changelog/git_initialization.yaml diff --git a/gradle/changelog/git_config_init.yaml b/gradle/changelog/git_config_init.yaml new file mode 100644 index 0000000000..1d71dac14c --- /dev/null +++ b/gradle/changelog/git_config_init.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Default branch evaluation on git config initialization diff --git a/gradle/changelog/git_initialization.yaml b/gradle/changelog/git_initialization.yaml new file mode 100644 index 0000000000..6f1b76d336 --- /dev/null +++ b/gradle/changelog/git_initialization.yaml @@ -0,0 +1,3 @@ +- type: fixed + description: Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) + diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java index edd56e2e74..6d986a5072 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryConfigInitializer.java @@ -29,11 +29,16 @@ import com.google.common.base.Strings; import sonia.scm.EagerSingleton; import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider; import sonia.scm.plugin.Extension; +import sonia.scm.repository.api.RepositoryService; +import sonia.scm.repository.api.RepositoryServiceFactory; import sonia.scm.store.ConfigurationStore; -import javax.inject.Inject; +import java.io.IOException; import java.util.Comparator; import java.util.List; +import java.util.Optional; + +import javax.inject.Inject; @Extension @EagerSingleton @@ -41,28 +46,40 @@ public class GitRepositoryConfigInitializer { private final GitRepositoryHandler repoHandler; private final GitRepositoryConfigStoreProvider storeProvider; + private final RepositoryServiceFactory serviceFactory; @Inject - public GitRepositoryConfigInitializer(GitRepositoryHandler repoHandler, GitRepositoryConfigStoreProvider storeProvider) { + public GitRepositoryConfigInitializer(GitRepositoryHandler repoHandler, GitRepositoryConfigStoreProvider storeProvider, RepositoryServiceFactory serviceFactory) { this.repoHandler = repoHandler; this.storeProvider = storeProvider; + this.serviceFactory = serviceFactory; } @Subscribe - public void initConfig(PostReceiveRepositoryHookEvent event) { - ConfigurationStore store = storeProvider.get(event.getRepository()); - GitRepositoryConfig repositoryConfig = store.get(); - if (repositoryConfig == null || Strings.isNullOrEmpty(repositoryConfig.getDefaultBranch())) { - List defaultBranchCandidates = event.getContext().getBranchProvider().getCreatedOrModified(); + public void initConfig(PostReceiveRepositoryHookEvent event) throws IOException { + if (GitRepositoryHandler.TYPE_NAME.equals(event.getRepository().getType())) { + ConfigurationStore store = storeProvider.get(event.getRepository()); + GitRepositoryConfig repositoryConfig = store.get(); + if (repositoryConfig == null || Strings.isNullOrEmpty(repositoryConfig.getDefaultBranch())) { + String defaultBranch; + try (RepositoryService service = serviceFactory.create(event.getRepository())) { + List branches = service.getBranchesCommand().getBranches().getBranches(); + Optional repoDefaultBranch = branches.stream().filter(Branch::isDefaultBranch).findFirst(); + if (repoDefaultBranch.isPresent()) { + defaultBranch = repoDefaultBranch.get().getName(); + } else { + defaultBranch = determineDefaultBranchFromPush(event); + } + } - String defaultBranch = determineDefaultBranch(defaultBranchCandidates); - - GitRepositoryConfig gitRepositoryConfig = new GitRepositoryConfig(defaultBranch); - store.set(gitRepositoryConfig); + GitRepositoryConfig gitRepositoryConfig = new GitRepositoryConfig(defaultBranch); + store.set(gitRepositoryConfig); + } } } - private String determineDefaultBranch(List defaultBranchCandidates) { + private String determineDefaultBranchFromPush(PostReceiveRepositoryHookEvent event) { + List defaultBranchCandidates = event.getContext().getBranchProvider().getCreatedOrModified(); String globalConfigDefaultBranch = repoHandler.getConfig().getDefaultBranch(); if (defaultBranchCandidates.contains(globalConfigDefaultBranch)) { return globalConfigDefaultBranch; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java index d89d8a42a4..bfe4f5499e 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryConfigInitializerTest.java @@ -28,18 +28,24 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Answers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider; +import sonia.scm.repository.api.BranchesCommandBuilder; import sonia.scm.repository.api.HookBranchProvider; import sonia.scm.repository.api.HookContext; +import sonia.scm.repository.api.RepositoryService; +import sonia.scm.repository.api.RepositoryServiceFactory; import sonia.scm.store.ConfigurationStore; +import java.io.IOException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -62,116 +68,160 @@ class GitRepositoryConfigInitializerTest { @Mock private PostReceiveRepositoryHookEvent event; + @Mock + private RepositoryServiceFactory serviceFactory; + @Mock + private RepositoryService service; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private BranchesCommandBuilder branchesCommand; + @Mock + private Branches branches; + @InjectMocks private GitRepositoryConfigInitializer initializer; - @BeforeEach - void initMocks() { - when(storeProvider.get(REPOSITORY)).thenReturn(configStore); - when(event.getRepository()).thenReturn(REPOSITORY); - } - @Test - void shouldDoNothingIfDefaultBranchAlreadySet() { - when(configStore.get()).thenReturn(new GitRepositoryConfig("any")); + void shouldSkipNonGitRepositories() throws IOException { + REPOSITORY.setType("svn"); initializer.initConfig(event); verify(event, never()).getContext(); } + @BeforeEach + void initEvent() { + when(event.getRepository()).thenReturn(REPOSITORY); + } + @Nested - class WithGlobalConfig { + class ForGitRepositories { @BeforeEach - void initRepoHandler() { - GitConfig gitConfig = new GitConfig(); - gitConfig.setDefaultBranch("global_default"); - when(repoHandler.getConfig()).thenReturn(gitConfig); + void initMocks() throws IOException { + when(storeProvider.get(REPOSITORY)).thenReturn(configStore); + REPOSITORY.setType("git"); + lenient().when(serviceFactory.create(event.getRepository())).thenReturn(service); + lenient().when(service.getBranchesCommand()).thenReturn(branchesCommand); + lenient().when(branchesCommand.getBranches()).thenReturn(branches); } @Test - void shouldSetDefaultBranchIfNoGitConfigYet() { - when(configStore.get()).thenReturn(null); - initEvent(List.of("main")); + void shouldDoNothingIfDefaultBranchAlreadySet() throws IOException { + when(configStore.get()).thenReturn(new GitRepositoryConfig("any")); initializer.initConfig(event); - verify(event).getContext(); + verify(event, never()).getContext(); } - @Test - void shouldDetermineAndApplyDefaultBranch_GlobalDefault() { - initEvent(List.of("global_default", "main", "master")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + @Nested + class WithGlobalConfig { - initializer.initConfig(event); + @BeforeEach + void initRepoHandler() { + GitConfig gitConfig = new GitConfig(); + gitConfig.setDefaultBranch("global_default"); + lenient().when(repoHandler.getConfig()).thenReturn(gitConfig); + } - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("global_default"); - return true; - })); + + @Test + void shouldSetDefaultBranchFromPushIfNoGitConfigYet() throws IOException { + when(configStore.get()).thenReturn(null); + initEvent(List.of("main")); + + initializer.initConfig(event); + + verify(event).getContext(); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_GlobalDefault() throws IOException { + initEvent(List.of("global_default", "main", "master")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("global_default"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_Main() throws IOException { + initEvent(List.of("master", "main")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("main"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_Master() throws IOException { + initEvent(List.of("develop", "master")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("master"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranchFromRepository_Staging() throws IOException { + when(configStore.get()).thenReturn(null); + initEvent(List.of("master", "main")); + when(branches.getBranches()).thenReturn(List.of(new Branch("staging", "abc", true))); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("staging"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_BestMatch() throws IOException { + initEvent(List.of("test/123", "trillian", "dent")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("dent"); + return true; + })); + } + + @Test + void shouldDetermineAndApplyDefaultBranch_AnyFallback() throws IOException { + initEvent(List.of("test/123", "x/y/z")); + when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); + + initializer.initConfig(event); + + verify(configStore).set(argThat(arg -> { + assertThat(arg.getDefaultBranch()).isEqualTo("test/123"); + return true; + })); + } } - @Test - void shouldDetermineAndApplyDefaultBranch_Main() { - initEvent(List.of("master", "main")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("main"); - return true; - })); - } - - @Test - void shouldDetermineAndApplyDefaultBranch_Master() { - initEvent(List.of("develop", "master")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("master"); - return true; - })); - } - - @Test - void shouldDetermineAndApplyDefaultBranch_BestMatch() { - initEvent(List.of("test/123", "trillian", "dent")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("dent"); - return true; - })); - } - - @Test - void shouldDetermineAndApplyDefaultBranch_AnyFallback() { - initEvent(List.of("test/123", "x/y/z")); - when(configStore.get()).thenReturn(new GitRepositoryConfig(null)); - - initializer.initConfig(event); - - verify(configStore).set(argThat(arg -> { - assertThat(arg.getDefaultBranch()).isEqualTo("test/123"); - return true; - })); + private void initEvent(List branches) { + HookContext hookContext = mock(HookContext.class); + lenient().when(event.getContext()).thenReturn(hookContext); + HookBranchProvider branchProvider = mock(HookBranchProvider.class); + lenient().when(hookContext.getBranchProvider()).thenReturn(branchProvider); + lenient().when(branchProvider.getCreatedOrModified()).thenReturn(branches); } } - - private void initEvent(List branches) { - HookContext hookContext = mock(HookContext.class); - when(event.getContext()).thenReturn(hookContext); - HookBranchProvider branchProvider = mock(HookBranchProvider.class); - when(hookContext.getBranchProvider()).thenReturn(branchProvider); - when(branchProvider.getCreatedOrModified()).thenReturn(branches); - } - } From 5e3b660e8e0e8797d848e98ef1674ebb2a35a61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 29 May 2024 10:38:38 +0200 Subject: [PATCH 07/16] Adjust changelog for release 2.46.3 --- CHANGELOG.md | 9 +++++++-- gradle/changelog/git_config_init.yaml | 2 -- gradle/changelog/git_initialization.yaml | 3 --- 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 gradle/changelog/git_config_init.yaml delete mode 100644 gradle/changelog/git_initialization.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 48cb280dc8..b50e9090e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.46.3] - 2024-05-29 +### Fixed +- Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) +- Default branch evaluation on git config initialization + ## [2.46.2] - 2024-03-04 ### Fixed - Rendering PDF files in source view @@ -12,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.46.1] - 2023-09-01 ### Fixed - Loading LFS files for imports and mirrors (from 2.44.3) -- Handling of submodules in imports and mirrors (from 2.44.3) +- Handling of submodules in imports and mirrors (from 2.44.3) ## [2.46.0] - 2023-08-24 ### Added @@ -1369,4 +1374,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.46.0]: https://scm-manager.org/download/2.46.0 [2.46.1]: https://scm-manager.org/download/2.46.1 [2.46.2]: https://scm-manager.org/download/2.46.2 - +[2.46.3]: https://scm-manager.org/download/2.46.3 diff --git a/gradle/changelog/git_config_init.yaml b/gradle/changelog/git_config_init.yaml deleted file mode 100644 index 1d71dac14c..0000000000 --- a/gradle/changelog/git_config_init.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Default branch evaluation on git config initialization diff --git a/gradle/changelog/git_initialization.yaml b/gradle/changelog/git_initialization.yaml deleted file mode 100644 index 6f1b76d336..0000000000 --- a/gradle/changelog/git_initialization.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- type: fixed - description: Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) - From 87a727b58779425e1d3536915771aaf27a881c5a Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Wed, 29 May 2024 12:02:24 +0000 Subject: [PATCH 08/16] Release version 2.46.3 --- gradle.properties | 2 +- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-ui/e2e-tests/package.json | 2 +- scm-ui/ui-api/package.json | 4 ++-- scm-ui/ui-buttons/package.json | 6 ++--- scm-ui/ui-components/package.json | 16 ++++++------- scm-ui/ui-extensions/package.json | 4 ++-- scm-ui/ui-forms/package.json | 12 +++++----- scm-ui/ui-layout/package.json | 10 ++++---- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-modules/package.json | 2 +- scm-ui/ui-overlays/package.json | 6 ++--- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-polyfill/package.json | 2 +- scm-ui/ui-scripts/package.json | 2 +- scm-ui/ui-shortcuts/package.json | 2 +- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-syntaxhighlighting/package.json | 4 ++-- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-text/package.json | 2 +- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index c4bef28f09..e44eec9e9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.3-SNAPSHOT +version = 2.46.3 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 4e3647f96d..58c8b546cd 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 141e539dac..b38ffa8246 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index ebed0e2304..2d8d698245 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 382b65e73b..363c4404a7 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.3" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 70a019d6d1..d37af26ef8 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index d2fd189510..e05debd538 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index 940295ffb5..81af1c6330 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": false, "main": "build/index.js", "module": "build/index.mjs", @@ -24,11 +24,11 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.3.1", "classnames": "^2.2.6", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT" + "@scm-manager/ui-components": "2.46.3" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", "@scm-manager/eslint-config": "^2.17.0", "@babel/core": "^7.17.8", "@scm-manager/tsconfig": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index bcab80dc5f..b6db8e9aa0 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -24,10 +24,10 @@ "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", - "@scm-manager/ui-text": "2.46.3-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.3", + "@scm-manager/ui-syntaxhighlighting": "2.46.3", + "@scm-manager/ui-tests": "2.46.3", + "@scm-manager/ui-text": "2.46.3", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -65,9 +65,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-types": "2.46.3", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 2a104ecac7..7eadc4c94c 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-types": "2.46.3", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 686aa6c241..f2ea52cd8a 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.3", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -32,7 +32,7 @@ "tsup": "^6.2.3" }, "peerDependencies": { - "@scm-manager/ui-components": "2.46.3-SNAPSHOT", + "@scm-manager/ui-components": "2.46.3", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-api": "2.46.3", "@headlessui/react": "^1.7.15", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3" diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index ecf548d7ba..72af1090ab 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,8 +16,8 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -37,7 +37,7 @@ "react": "17", "react-dom": "17", "styled-components": "5", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT" + "@scm-manager/ui-components": "2.46.3" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.3" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 5cebbaaf39..de7148b740 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-types": "2.46.3", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index 1ba9fe7767..f5184c5e3e 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 539cdf8f73..32371a93af 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.46.3-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.3", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-docs": "^6.5.14", "@storybook/addon-essentials": "^6.5.10", @@ -44,7 +44,7 @@ "@radix-ui/react-dropdown-menu": "2.0.1", "@radix-ui/react-popover": "1.0.6", "@radix-ui/react-tooltip": "1.0.2", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.3" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 368ac71d53..275e4c1533 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" @@ -12,13 +12,13 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-components": "2.46.3", + "@scm-manager/ui-forms": "2.46.3", + "@scm-manager/ui-buttons": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-layout": "2.46.3", "classnames": "^2.2.6", "query-string": "6.14.1", "redux": "^4.0.0", @@ -33,9 +33,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.46.3-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", - "@scm-manager/ui-types": "2.46.3-SNAPSHOT", + "@scm-manager/ui-scripts": "2.46.3", + "@scm-manager/ui-tests": "2.46.3", + "@scm-manager/ui-types": "2.46.3", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 5c52d6ba03..269d22838b 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index 19791eec3f..6eaa42b02a 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 3bc196b0d1..7c11772b7a 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "license": "MIT", "private": true, "main": "build/index.js", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 116e976cbe..503acdc691 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index bffad10c6c..696227b60f 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.3-SNAPSHOT", + "@scm-manager/ui-text": "2.46.3", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 030c5aa145..bb6161789b 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index 4e925ba7ff..be0a7b6891 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 1432266de4..73c719160a 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 968af6c15b..a1b74638b3 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.46.3-SNAPSHOT", + "version": "2.46.3", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.3-SNAPSHOT", - "@scm-manager/ui-api": "2.46.3-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.3-SNAPSHOT", - "@scm-manager/ui-modules": "2.46.3-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.3-SNAPSHOT", - "@scm-manager/ui-text": "2.46.3-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.46.3-SNAPSHOT", - "@scm-manager/ui-legacy": "2.46.3-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.3-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.3-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.3-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.3-SNAPSHOT", + "@scm-manager/ui-components": "2.46.3", + "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-extensions": "2.46.3", + "@scm-manager/ui-modules": "2.46.3", + "@scm-manager/ui-syntaxhighlighting": "2.46.3", + "@scm-manager/ui-text": "2.46.3", + "@scm-manager/ui-shortcuts": "2.46.3", + "@scm-manager/ui-legacy": "2.46.3", + "@scm-manager/ui-forms": "2.46.3", + "@scm-manager/ui-buttons": "2.46.3", + "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-layout": "2.46.3", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "21", @@ -43,7 +43,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.46.3-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.3", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From 74ec91a95cadfdf84d691563f8c9157375dee8bf Mon Sep 17 00:00:00 2001 From: Laura Gorzitze Date: Fri, 21 Jun 2024 09:52:00 +0200 Subject: [PATCH 09/16] 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 e44eec9e9e..a61d1f5387 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.3 +version = 2.46.4-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 58c8b546cd..7e92d00c05 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3" + "@scm-manager/ui-plugins": "2.46.4-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 b38ffa8246..9e814baf92 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3" + "@scm-manager/ui-plugins": "2.46.4-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 2d8d698245..e8936c29d2 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3" + "@scm-manager/ui-plugins": "2.46.4-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 363c4404a7..3ed3b258c2 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.3" + "@scm-manager/ui-plugins": "2.46.4-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 d37af26ef8..4d5b7c79dd 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.46.3", + "version": "2.46.4-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 e05debd538..4672d7dd47 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.46.3", + "version": "2.46.4-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.3", + "@scm-manager/ui-types": "2.46.4-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 81af1c6330..509f100af1 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.46.3", + "version": "2.46.4-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.3" + "@scm-manager/ui-components": "2.46.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-api": "2.46.4-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 b6db8e9aa0..f2093bfd42 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.46.3", + "version": "2.46.4-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.3", - "@scm-manager/ui-syntaxhighlighting": "2.46.3", - "@scm-manager/ui-tests": "2.46.3", - "@scm-manager/ui-text": "2.46.3", + "@scm-manager/ui-shortcuts": "2.46.4-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.4-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.4-SNAPSHOT", + "@scm-manager/ui-text": "2.46.4-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.3", - "@scm-manager/ui-extensions": "2.46.3", - "@scm-manager/ui-types": "2.46.3", + "@scm-manager/ui-api": "2.46.4-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", + "@scm-manager/ui-types": "2.46.4-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 7eadc4c94c..11a5a2e026 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.3", + "@scm-manager/ui-types": "2.46.4-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index f2ea52cd8a..84a903c7ac 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.46.3", + "version": "2.46.4-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.3", + "@scm-manager/ui-styles": "2.46.4-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.3", + "@scm-manager/ui-components": "2.46.4-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.3", - "@scm-manager/ui-overlays": "2.46.3", - "@scm-manager/ui-api": "2.46.3", + "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", + "@scm-manager/ui-api": "2.46.4-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 72af1090ab..ff939df69f 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "2.46.3", + "version": "2.46.4-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.3", - "@scm-manager/ui-overlays": "2.46.3", + "@scm-manager/ui-styles": "2.46.4-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.4-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.3" + "@scm-manager/ui-components": "2.46.4-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.3" + "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index de7148b740..8b11da1439 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.46.3", + "version": "2.46.4-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.3", - "@scm-manager/ui-extensions": "2.46.3", - "@scm-manager/ui-types": "2.46.3", + "@scm-manager/ui-api": "2.46.4-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", + "@scm-manager/ui-types": "2.46.4-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 f5184c5e3e..13512eb274 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.46.3", + "version": "2.46.4-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 32371a93af..e0fbb5b349 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.46.3", + "version": "2.46.4-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.3", + "@scm-manager/ui-styles": "2.46.4-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.3" + "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 275e4c1533..a244f0e404 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.46.3", + "version": "2.46.4-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.3", - "@scm-manager/ui-extensions": "2.46.3", - "@scm-manager/ui-components": "2.46.3", - "@scm-manager/ui-forms": "2.46.3", - "@scm-manager/ui-buttons": "2.46.3", - "@scm-manager/ui-overlays": "2.46.3", - "@scm-manager/ui-layout": "2.46.3", + "@scm-manager/ui-api": "2.46.4-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", + "@scm-manager/ui-components": "2.46.4-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.4-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.4-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.3", - "@scm-manager/ui-tests": "2.46.3", - "@scm-manager/ui-types": "2.46.3", + "@scm-manager/ui-scripts": "2.46.4-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.4-SNAPSHOT", + "@scm-manager/ui-types": "2.46.4-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 269d22838b..d134c0d9af 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.46.3", + "version": "2.46.4-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 6eaa42b02a..656878fa0e 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.46.3", + "version": "2.46.4-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 7c11772b7a..efc88e84d9 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.46.3", + "version": "2.46.4-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 503acdc691..b07afa533d 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.46.3", + "version": "2.46.4-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 696227b60f..0bb8455b51 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.3", + "@scm-manager/ui-text": "2.46.4-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 bb6161789b..058358e068 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.46.3", + "version": "2.46.4-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 be0a7b6891..a998463e12 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.46.3", + "version": "2.46.4-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 73c719160a..1cb4fb4359 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.46.3", + "version": "2.46.4-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 a1b74638b3..11c3c13df4 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.46.3", + "version": "2.46.4-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.3", - "@scm-manager/ui-api": "2.46.3", - "@scm-manager/ui-extensions": "2.46.3", - "@scm-manager/ui-modules": "2.46.3", - "@scm-manager/ui-syntaxhighlighting": "2.46.3", - "@scm-manager/ui-text": "2.46.3", - "@scm-manager/ui-shortcuts": "2.46.3", - "@scm-manager/ui-legacy": "2.46.3", - "@scm-manager/ui-forms": "2.46.3", - "@scm-manager/ui-buttons": "2.46.3", - "@scm-manager/ui-overlays": "2.46.3", - "@scm-manager/ui-layout": "2.46.3", + "@scm-manager/ui-components": "2.46.4-SNAPSHOT", + "@scm-manager/ui-api": "2.46.4-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", + "@scm-manager/ui-modules": "2.46.4-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.4-SNAPSHOT", + "@scm-manager/ui-text": "2.46.4-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.4-SNAPSHOT", + "@scm-manager/ui-legacy": "2.46.4-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.4-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.4-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.3", + "@scm-manager/ui-tests": "2.46.4-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From 38d0325b4c22d715d1c4211caf4b1e7589cc8e4e Mon Sep 17 00:00:00 2001 From: Laura Gorzitze Date: Mon, 24 Jun 2024 10:12:53 +0200 Subject: [PATCH 10/16] Check on duplicate name for rename Add check whether namespace and name already exist when renaming a repository. --- gradle/changelog/rename_check.yaml | 2 + .../scm/repository/xml/XmlRepositoryDAO.java | 9 ++++ .../repository/xml/XmlRepositoryDAOTest.java | 46 +++++++++++++++++-- .../repository/DefaultRepositoryManager.java | 9 +++- .../DefaultRepositoryManagerTest.java | 10 ++++ 5 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 gradle/changelog/rename_check.yaml diff --git a/gradle/changelog/rename_check.yaml b/gradle/changelog/rename_check.yaml new file mode 100644 index 0000000000..178e148b82 --- /dev/null +++ b/gradle/changelog/rename_check.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Check for already existing Namespace and Name when renaming a repository diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java index b9d69c7910..7a4c36826a 100644 --- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java +++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java @@ -28,6 +28,8 @@ package sonia.scm.repository.xml; import com.google.common.collect.ImmutableList; import com.google.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import sonia.scm.io.FileSystem; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.NamespaceAndName; @@ -67,6 +69,9 @@ public class XmlRepositoryDAO implements RepositoryDAO { private final Map byNamespaceAndName; private final ReadWriteLock byNamespaceLock = new ReentrantReadWriteLock(); + private static final Logger LOG = LoggerFactory.getLogger(XmlRepositoryDAO.class); + + @Inject public XmlRepositoryDAO(PathBasedRepositoryLocationResolver repositoryLocationResolver, FileSystem fileSystem, RepositoryExportingCheck repositoryExportingCheck) { this.repositoryLocationResolver = repositoryLocationResolver; @@ -84,6 +89,10 @@ public class XmlRepositoryDAO implements RepositoryDAO { RepositoryLocationResolver.RepositoryLocationResolverInstance pathRepositoryLocationResolverInstance = repositoryLocationResolver.create(Path.class); pathRepositoryLocationResolverInstance.forAllLocations((repositoryId, repositoryPath) -> { Repository repository = metadataStore.read(repositoryPath); + if (byNamespaceAndName.containsKey(repository.getNamespaceAndName())) { + LOG.warn("Duplicate repository found. Adding suffix DUPLICATE to repository {}", repository); + repository.setName(repository.getName() + "-" + repositoryId + "-DUPLICATE"); + } byNamespaceAndName.put(repository.getNamespaceAndName(), repository); byId.put(repositoryId, repository); }); diff --git a/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java b/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java index a388621e31..05be72e3bb 100644 --- a/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java +++ b/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java @@ -83,7 +83,7 @@ class XmlRepositoryDAOTest { @BeforeEach void createDAO(@TempDir Path basePath) { when(locationResolver.create(Path.class)).thenReturn( - new RepositoryLocationResolver.RepositoryLocationResolverInstance() { + new RepositoryLocationResolver.RepositoryLocationResolverInstance<>() { @Override public Path getLocation(String repositoryId) { return locationResolver.create(repositoryId); @@ -367,7 +367,7 @@ class XmlRepositoryDAOTest { private String content(Path storePath) { try { - return new String(Files.readAllBytes(storePath), Charsets.UTF_8); + return Files.readString(storePath, Charsets.UTF_8); } catch (IOException e) { throw new RuntimeException(e); } @@ -383,9 +383,7 @@ class XmlRepositoryDAOTest { void createMetadataFileForRepository(@TempDir Path basePath) throws IOException { repositoryPath = basePath.resolve("existing"); - Files.createDirectories(repositoryPath); - URL metadataUrl = Resources.getResource("sonia/scm/store/repositoryDaoMetadata.xml"); - Files.copy(metadataUrl.openStream(), repositoryPath.resolve("metadata.xml")); + prepareRepositoryPath(repositoryPath); } @Test @@ -420,6 +418,44 @@ class XmlRepositoryDAOTest { } } + @Nested + class WithDuplicateRepositories { + private Path repositoryPath; + private Path duplicateRepositoryPath; + + @BeforeEach + void createMetadataFileForRepository(@TempDir Path basePath) throws IOException { + repositoryPath = basePath.resolve("existing"); + duplicateRepositoryPath = basePath.resolve("duplicate"); + + prepareRepositoryPath(repositoryPath); + prepareRepositoryPath(duplicateRepositoryPath); + } + + @Test + void shouldRenameDuplicateRepositories() { + mockExistingPath(); + + XmlRepositoryDAO dao = new XmlRepositoryDAO(locationResolver, fileSystem, repositoryExportingCheck); + + assertThat(dao.contains(new NamespaceAndName("space", "existing"))).isTrue(); + assertThat(dao.contains(new NamespaceAndName("space", "existing-existing2-DUPLICATE"))).isTrue(); + } + + private void mockExistingPath() { + triggeredOnForAllLocations = consumer -> { + consumer.accept("existing", repositoryPath); + consumer.accept("existing2", duplicateRepositoryPath); + }; + } + } + + private void prepareRepositoryPath(Path repositoryPath) throws IOException { + Files.createDirectories(repositoryPath); + URL metadataUrl = Resources.getResource("sonia/scm/store/repositoryDaoMetadata.xml"); + Files.copy(metadataUrl.openStream(), repositoryPath.resolve("metadata.xml")); + } + private Repository createRepository(String id) { return new Repository(id, "xml", "space", id); } diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java index 65c6da4115..253ee43f91 100644 --- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java +++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java @@ -30,6 +30,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sonia.scm.AlreadyExistsException; import sonia.scm.ConfigurationException; import sonia.scm.HandlerEventType; import sonia.scm.ManagerDaoAdapter; @@ -183,7 +184,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager { }, newRepository -> { if (repositoryDAO.contains(newRepository.getNamespaceAndName())) { - throw alreadyExists(entity(newRepository.getClass(), newRepository.getNamespaceAndName().logString())); + throw alreadyExists(entity(newRepository.getNamespaceAndName())); } } ); @@ -292,10 +293,16 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager { public Repository rename(Repository repository, String newNamespace, String newName) { + NamespaceAndName newNamespaceAndName = new NamespaceAndName(newNamespace, newName); + if (hasNamespaceOrNameNotChanged(repository, newNamespace, newName)) { throw new NoChangesMadeException(repository); } + if (this.get(newNamespaceAndName) != null){ + throw AlreadyExistsException.alreadyExists(entity(NamespaceAndName.class, newNamespaceAndName.logString())); + } + Repository changedRepository = repository.clone(); if (!Strings.isNullOrEmpty(newName)) { changedRepository.setName(newName); diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java index dff97c98cd..1c479640c7 100644 --- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java +++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java @@ -457,6 +457,16 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase { assertEquals("hitchhiker", changedRepo.getNamespace()); } + @Test + public void shouldNotRenameRepositoryIfNameOrNamespaceAlreadyInUse() { + Repository repository1 = createTestRepository(); + Repository repository2 = createSecondTestRepository(); + RepositoryManager repoManager = (RepositoryManager) manager; + + assertThrows(AlreadyExistsException.class, () -> repoManager.rename(repository2, repository1.getNamespace(), repository1.getName())); + + } + @Test public void shouldReturnDistinctNamespaces() { createTestRepository(); From e8af0ee7cd49ea55caa3bb153a493334829eb710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 24 Jun 2024 10:48:55 +0200 Subject: [PATCH 11/16] Adjust changelog for release --- CHANGELOG.md | 6 ++++++ Jenkinsfile | 25 ------------------------- gradle/changelog/rename_check.yaml | 2 -- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 gradle/changelog/rename_check.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index b50e9090e3..c3cc572d15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.46.4] - 2024-06-24 +### Fixed +- Check for already existing Namespace and Name when renaming a repository +- Repositories with the same namespace and name will get unique names on startup + ## [2.46.3] - 2024-05-29 ### Fixed - Exception in SVN repositories due to incorrect git initialization (Backport from 2.47) @@ -1375,3 +1380,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.46.1]: https://scm-manager.org/download/2.46.1 [2.46.2]: https://scm-manager.org/download/2.46.2 [2.46.3]: https://scm-manager.org/download/2.46.3 +[2.46.4]: https://scm-manager.org/download/2.46.4 diff --git a/Jenkinsfile b/Jenkinsfile index 6c06ed3186..89a42e884e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,31 +80,6 @@ pipeline { } } - stage('SonarQube') { - steps { - sh 'git config --replace-all "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*"' - sh 'git fetch origin develop' - script { - withSonarQubeEnv('sonarcloud.io-scm') { - String parameters = ' -Dsonar.organization=scm-manager -Dsonar.analysis.scmm-repo=scm-manager/scm-manager' - if (env.CHANGE_ID) { - parameters += ' -Dsonar.pullrequest.provider=GitHub' - parameters += ' -Dsonar.pullrequest.github.repository=scm-manager/scm-manager' - parameters += " -Dsonar.pullrequest.key=${env.CHANGE_ID}" - parameters += " -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH}" - parameters += " -Dsonar.pullrequest.base=${env.CHANGE_TARGET}" - } else { - parameters += " -Dsonar.branch.name=${env.BRANCH_NAME}" - if (env.BRANCH_NAME != "develop") { - parameters += " -Dsonar.branch.target=develop" - } - } - gradle "sonarqube ${parameters}" - } - } - } - } - stage('Deployment') { when { anyOf { diff --git a/gradle/changelog/rename_check.yaml b/gradle/changelog/rename_check.yaml deleted file mode 100644 index 178e148b82..0000000000 --- a/gradle/changelog/rename_check.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Check for already existing Namespace and Name when renaming a repository From c023ebf3ffa95d6d284d81c2f3aa54af4b479b55 Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Mon, 24 Jun 2024 08:59:07 +0000 Subject: [PATCH 12/16] Release version 2.46.4 --- 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 a61d1f5387..998562ddc9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.4-SNAPSHOT +version = 2.46.4 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 7e92d00c05..c4413b71e7 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.4-SNAPSHOT", + "version": "2.46.4", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.4" }, "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 9e814baf92..07e4b5a328 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.4-SNAPSHOT", + "version": "2.46.4", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.4" }, "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 e8936c29d2..9f6b982f18 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.4-SNAPSHOT", + "version": "2.46.4", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.4" }, "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 3ed3b258c2..7dfa0e71b9 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.4-SNAPSHOT", + "version": "2.46.4", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.4" }, "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 4d5b7c79dd..d70fae4ac9 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.4-SNAPSHOT", + "version": "2.46.4", "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 4672d7dd47..a7a2bec3c8 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT", + "@scm-manager/ui-types": "2.46.4", "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 509f100af1..ffbf793169 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT" + "@scm-manager/ui-components": "2.46.4" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.4-SNAPSHOT", + "@scm-manager/ui-api": "2.46.4", "@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 f2093bfd42..43c4cf40e2 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.4-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.4-SNAPSHOT", - "@scm-manager/ui-text": "2.46.4-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.4", + "@scm-manager/ui-syntaxhighlighting": "2.46.4", + "@scm-manager/ui-tests": "2.46.4", + "@scm-manager/ui-text": "2.46.4", "@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.4-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", - "@scm-manager/ui-types": "2.46.4-SNAPSHOT", + "@scm-manager/ui-api": "2.46.4", + "@scm-manager/ui-extensions": "2.46.4", + "@scm-manager/ui-types": "2.46.4", "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 11a5a2e026..97269eaf53 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.4-SNAPSHOT", + "version": "2.46.4", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.4-SNAPSHOT", + "@scm-manager/ui-types": "2.46.4", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 84a903c7ac..e9396969fe 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.4", "@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.4-SNAPSHOT", + "@scm-manager/ui-components": "2.46.4", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", - "@scm-manager/ui-api": "2.46.4-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.4", + "@scm-manager/ui-overlays": "2.46.4", + "@scm-manager/ui-api": "2.46.4", "@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 ff939df69f..04d25dbe6e 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.4", + "@scm-manager/ui-overlays": "2.46.4", "@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.4-SNAPSHOT" + "@scm-manager/ui-components": "2.46.4" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { @@ -48,6 +48,6 @@ }, "dependencies": { "@radix-ui/react-collapsible": "^1.0.3", - "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.4" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 8b11da1439..c3dc497ae6 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.4-SNAPSHOT", + "version": "2.46.4", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.46.4-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", - "@scm-manager/ui-types": "2.46.4-SNAPSHOT", + "@scm-manager/ui-api": "2.46.4", + "@scm-manager/ui-extensions": "2.46.4", + "@scm-manager/ui-types": "2.46.4", "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 13512eb274..30d2ecdc8a 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.4-SNAPSHOT", + "version": "2.46.4", "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 e0fbb5b349..d60b743dd9 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.4", "@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.4-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.4" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index a244f0e404..fa45bf1271 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.4-SNAPSHOT", + "version": "2.46.4", "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.4-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", - "@scm-manager/ui-components": "2.46.4-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.4-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.4-SNAPSHOT", + "@scm-manager/ui-api": "2.46.4", + "@scm-manager/ui-extensions": "2.46.4", + "@scm-manager/ui-components": "2.46.4", + "@scm-manager/ui-forms": "2.46.4", + "@scm-manager/ui-buttons": "2.46.4", + "@scm-manager/ui-overlays": "2.46.4", + "@scm-manager/ui-layout": "2.46.4", "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.4-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.4-SNAPSHOT", - "@scm-manager/ui-types": "2.46.4-SNAPSHOT", + "@scm-manager/ui-scripts": "2.46.4", + "@scm-manager/ui-tests": "2.46.4", + "@scm-manager/ui-types": "2.46.4", "@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 d134c0d9af..312cada2be 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.4-SNAPSHOT", + "version": "2.46.4", "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 656878fa0e..a5ded1f7cb 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.4-SNAPSHOT", + "version": "2.46.4", "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 efc88e84d9..18bc6f9c4c 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.4-SNAPSHOT", + "version": "2.46.4", "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 b07afa533d..9107adbce1 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.4-SNAPSHOT", + "version": "2.46.4", "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 0bb8455b51..2600467f96 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.4-SNAPSHOT", + "version": "2.46.4", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.4-SNAPSHOT", + "@scm-manager/ui-text": "2.46.4", "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 058358e068..d36a0208fd 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.4-SNAPSHOT", + "version": "2.46.4", "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 a998463e12..2bc7e31a42 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.4-SNAPSHOT", + "version": "2.46.4", "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 1cb4fb4359..f594aa0a3b 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.4-SNAPSHOT", + "version": "2.46.4", "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 11c3c13df4..ce6da69056 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.4-SNAPSHOT", + "version": "2.46.4", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.4-SNAPSHOT", - "@scm-manager/ui-api": "2.46.4-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.4-SNAPSHOT", - "@scm-manager/ui-modules": "2.46.4-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.4-SNAPSHOT", - "@scm-manager/ui-text": "2.46.4-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.46.4-SNAPSHOT", - "@scm-manager/ui-legacy": "2.46.4-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.4-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.4-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.4-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.4-SNAPSHOT", + "@scm-manager/ui-components": "2.46.4", + "@scm-manager/ui-api": "2.46.4", + "@scm-manager/ui-extensions": "2.46.4", + "@scm-manager/ui-modules": "2.46.4", + "@scm-manager/ui-syntaxhighlighting": "2.46.4", + "@scm-manager/ui-text": "2.46.4", + "@scm-manager/ui-shortcuts": "2.46.4", + "@scm-manager/ui-legacy": "2.46.4", + "@scm-manager/ui-forms": "2.46.4", + "@scm-manager/ui-buttons": "2.46.4", + "@scm-manager/ui-overlays": "2.46.4", + "@scm-manager/ui-layout": "2.46.4", "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.4-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.4", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From 9d2001895ea0b9fd57eeb7d6c57ea8739947c9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 17 Jan 2025 13:50:25 +0100 Subject: [PATCH 13/16] 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 998562ddc9..944bf38675 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.4 +version = 2.46.5-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index c4413b71e7..d754902141 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.4", + "version": "2.46.5-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4" + "@scm-manager/ui-plugins": "2.46.5-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 07e4b5a328..2099941d66 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.4", + "version": "2.46.5-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4" + "@scm-manager/ui-plugins": "2.46.5-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 9f6b982f18..871675453e 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.4", + "version": "2.46.5-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4" + "@scm-manager/ui-plugins": "2.46.5-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 7dfa0e71b9..e9a861acf9 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.4", + "version": "2.46.5-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.4" + "@scm-manager/ui-plugins": "2.46.5-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 d70fae4ac9..ae18f151f4 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.4", + "version": "2.46.5-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 a7a2bec3c8..1e812954db 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.4", + "version": "2.46.5-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.4", + "@scm-manager/ui-types": "2.46.5-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 ffbf793169..63997ed8b3 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.4", + "version": "2.46.5-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.4" + "@scm-manager/ui-components": "2.46.5-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.4", + "@scm-manager/ui-api": "2.46.5-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 43c4cf40e2..e62dd0c036 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.4", + "version": "2.46.5-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.4", - "@scm-manager/ui-syntaxhighlighting": "2.46.4", - "@scm-manager/ui-tests": "2.46.4", - "@scm-manager/ui-text": "2.46.4", + "@scm-manager/ui-shortcuts": "2.46.5-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.5-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.5-SNAPSHOT", + "@scm-manager/ui-text": "2.46.5-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.4", - "@scm-manager/ui-extensions": "2.46.4", - "@scm-manager/ui-types": "2.46.4", + "@scm-manager/ui-api": "2.46.5-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", + "@scm-manager/ui-types": "2.46.5-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 97269eaf53..df9d28e9e2 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.4", + "version": "2.46.5-SNAPSHOT", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.4", + "@scm-manager/ui-types": "2.46.5-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index e9396969fe..10f8bef377 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.4", + "version": "2.46.5-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.4", + "@scm-manager/ui-styles": "2.46.5-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.4", + "@scm-manager/ui-components": "2.46.5-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.4", - "@scm-manager/ui-overlays": "2.46.4", - "@scm-manager/ui-api": "2.46.4", + "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", + "@scm-manager/ui-api": "2.46.5-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 04d25dbe6e..4e89b87fa6 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.4", + "version": "2.46.5-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.4", - "@scm-manager/ui-overlays": "2.46.4", + "@scm-manager/ui-styles": "2.46.5-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.5-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.4" + "@scm-manager/ui-components": "2.46.5-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.4" + "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index c3dc497ae6..459e6c0b9b 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.4", + "version": "2.46.5-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.4", - "@scm-manager/ui-extensions": "2.46.4", - "@scm-manager/ui-types": "2.46.4", + "@scm-manager/ui-api": "2.46.5-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", + "@scm-manager/ui-types": "2.46.5-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 30d2ecdc8a..c9094124b2 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.4", + "version": "2.46.5-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 d60b743dd9..4b7185f0bb 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.4", + "version": "2.46.5-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.4", + "@scm-manager/ui-styles": "2.46.5-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.4" + "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index fa45bf1271..48f8913934 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.4", + "version": "2.46.5-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.4", - "@scm-manager/ui-extensions": "2.46.4", - "@scm-manager/ui-components": "2.46.4", - "@scm-manager/ui-forms": "2.46.4", - "@scm-manager/ui-buttons": "2.46.4", - "@scm-manager/ui-overlays": "2.46.4", - "@scm-manager/ui-layout": "2.46.4", + "@scm-manager/ui-api": "2.46.5-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", + "@scm-manager/ui-components": "2.46.5-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.5-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.5-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.4", - "@scm-manager/ui-tests": "2.46.4", - "@scm-manager/ui-types": "2.46.4", + "@scm-manager/ui-scripts": "2.46.5-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.5-SNAPSHOT", + "@scm-manager/ui-types": "2.46.5-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 312cada2be..90ad8f3253 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.4", + "version": "2.46.5-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 a5ded1f7cb..64b8a11939 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.4", + "version": "2.46.5-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 18bc6f9c4c..566db62a27 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.4", + "version": "2.46.5-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 9107adbce1..1b2b75b7ca 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.4", + "version": "2.46.5-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 2600467f96..ff3b767836 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.4", + "version": "2.46.5-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.4", + "@scm-manager/ui-text": "2.46.5-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 d36a0208fd..8a620a2113 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.4", + "version": "2.46.5-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 2bc7e31a42..638cd1dd8e 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.4", + "version": "2.46.5-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 f594aa0a3b..d7dd16c421 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.4", + "version": "2.46.5-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 ce6da69056..c90608b1d4 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.4", + "version": "2.46.5-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.4", - "@scm-manager/ui-api": "2.46.4", - "@scm-manager/ui-extensions": "2.46.4", - "@scm-manager/ui-modules": "2.46.4", - "@scm-manager/ui-syntaxhighlighting": "2.46.4", - "@scm-manager/ui-text": "2.46.4", - "@scm-manager/ui-shortcuts": "2.46.4", - "@scm-manager/ui-legacy": "2.46.4", - "@scm-manager/ui-forms": "2.46.4", - "@scm-manager/ui-buttons": "2.46.4", - "@scm-manager/ui-overlays": "2.46.4", - "@scm-manager/ui-layout": "2.46.4", + "@scm-manager/ui-components": "2.46.5-SNAPSHOT", + "@scm-manager/ui-api": "2.46.5-SNAPSHOT", + "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", + "@scm-manager/ui-modules": "2.46.5-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.46.5-SNAPSHOT", + "@scm-manager/ui-text": "2.46.5-SNAPSHOT", + "@scm-manager/ui-shortcuts": "2.46.5-SNAPSHOT", + "@scm-manager/ui-legacy": "2.46.5-SNAPSHOT", + "@scm-manager/ui-forms": "2.46.5-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT", + "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", + "@scm-manager/ui-layout": "2.46.5-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.4", + "@scm-manager/ui-tests": "2.46.5-SNAPSHOT", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", From 7b74224a802726907f6c5a1d8f40284e0c8c378c Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 17 Jan 2025 14:46:17 +0100 Subject: [PATCH 14/16] Remove exception log for api token errors Printing the exception may reveal details about the password. --- gradle/changelog/remove_api_token_error_log.yaml | 2 ++ .../src/main/java/sonia/scm/security/ApiKeyTokenHandler.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 gradle/changelog/remove_api_token_error_log.yaml diff --git a/gradle/changelog/remove_api_token_error_log.yaml b/gradle/changelog/remove_api_token_error_log.yaml new file mode 100644 index 0000000000..b082be8fa8 --- /dev/null +++ b/gradle/changelog/remove_api_token_error_log.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Removed the API token error log message that was being printed when the API token was invalid. diff --git a/scm-webapp/src/main/java/sonia/scm/security/ApiKeyTokenHandler.java b/scm-webapp/src/main/java/sonia/scm/security/ApiKeyTokenHandler.java index de38346aec..83d3e6db24 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/ApiKeyTokenHandler.java +++ b/scm-webapp/src/main/java/sonia/scm/security/ApiKeyTokenHandler.java @@ -64,9 +64,7 @@ class ApiKeyTokenHandler { return of(OBJECT_MAPPER.readValue(decoder.decode(token), Token.class)); } catch (IOException | DecodingException e) { LOG.debug("failed to read api token, perhaps it is a jwt token or a normal password"); - if (LOG.isTraceEnabled()) { - LOG.trace("failed to parse token", e); - } + // do not print the exception here, because it could reveal password details return empty(); } } From 15fd0a2094ea2a699f1611ce5891beca21c9963a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 17 Jan 2025 14:49:30 +0100 Subject: [PATCH 15/16] Adjust changelog for release 2.46.5 --- CHANGELOG.md | 5 +++++ gradle/changelog/remove_api_token_error_log.yaml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 gradle/changelog/remove_api_token_error_log.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index c3cc572d15..daa7c12525 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.5] - 2025-01-17 +### Fixed +- Removed the API token error log message that was being printed when the API token was invalid. + ## [2.46.4] - 2024-06-24 ### Fixed - Check for already existing Namespace and Name when renaming a repository @@ -1381,3 +1385,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.46.2]: https://scm-manager.org/download/2.46.2 [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 diff --git a/gradle/changelog/remove_api_token_error_log.yaml b/gradle/changelog/remove_api_token_error_log.yaml deleted file mode 100644 index b082be8fa8..0000000000 --- a/gradle/changelog/remove_api_token_error_log.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Removed the API token error log message that was being printed when the API token was invalid. From a696f8f0172c91195599d5249609eca6ad040b5d Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Fri, 17 Jan 2025 13:55:11 +0000 Subject: [PATCH 16/16] Release version 2.46.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 +++++++++++----------- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index 944bf38675..ae75c5870b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.46.5-SNAPSHOT +version = 2.46.5 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index d754902141..47a3d04e3a 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-SNAPSHOT", + "version": "2.46.5", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.5" }, "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 2099941d66..e1b19ecbc1 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-SNAPSHOT", + "version": "2.46.5", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.5" }, "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 871675453e..4b03fa72cd 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-SNAPSHOT", + "version": "2.46.5", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.5" }, "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 e9a861acf9..1db8a7e0ce 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-SNAPSHOT", + "version": "2.46.5", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.46.5-SNAPSHOT" + "@scm-manager/ui-plugins": "2.46.5" }, "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 ae18f151f4..532def2ca7 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-SNAPSHOT", + "version": "2.46.5", "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 1e812954db..af0aad2c25 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", + "@scm-manager/ui-types": "2.46.5", "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 63997ed8b3..5ce2305baf 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT" + "@scm-manager/ui-components": "2.46.5" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.46.5-SNAPSHOT", + "@scm-manager/ui-api": "2.46.5", "@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 e62dd0c036..bd30809362 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.5-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.5-SNAPSHOT", - "@scm-manager/ui-text": "2.46.5-SNAPSHOT", + "@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", "@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-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", - "@scm-manager/ui-types": "2.46.5-SNAPSHOT", + "@scm-manager/ui-api": "2.46.5", + "@scm-manager/ui-extensions": "2.46.5", + "@scm-manager/ui-types": "2.46.5", "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 df9d28e9e2..b40e88efb3 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-SNAPSHOT", + "version": "2.46.5", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.46.5-SNAPSHOT", + "@scm-manager/ui-types": "2.46.5", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 10f8bef377..8d2aa20602 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.5", "@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-SNAPSHOT", + "@scm-manager/ui-components": "2.46.5", "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-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", - "@scm-manager/ui-api": "2.46.5-SNAPSHOT", + "@scm-manager/ui-buttons": "2.46.5", + "@scm-manager/ui-overlays": "2.46.5", + "@scm-manager/ui-api": "2.46.5", "@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 4e89b87fa6..2166a45854 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.5", + "@scm-manager/ui-overlays": "2.46.5", "@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-SNAPSHOT" + "@scm-manager/ui-components": "2.46.5" }, "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-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.5" } } \ No newline at end of file diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 459e6c0b9b..b1b1ebc2cb 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", - "@scm-manager/ui-types": "2.46.5-SNAPSHOT", + "@scm-manager/ui-api": "2.46.5", + "@scm-manager/ui-extensions": "2.46.5", + "@scm-manager/ui-types": "2.46.5", "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 c9094124b2..39d0fec652 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-SNAPSHOT", + "version": "2.46.5", "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 4b7185f0bb..5a3018b3d9 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", + "@scm-manager/ui-styles": "2.46.5", "@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-SNAPSHOT" + "@scm-manager/ui-buttons": "2.46.5" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 48f8913934..814acfbd69 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-SNAPSHOT", + "version": "2.46.5", "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-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", - "@scm-manager/ui-components": "2.46.5-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.5-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.5-SNAPSHOT", + "@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", "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-SNAPSHOT", - "@scm-manager/ui-tests": "2.46.5-SNAPSHOT", - "@scm-manager/ui-types": "2.46.5-SNAPSHOT", + "@scm-manager/ui-scripts": "2.46.5", + "@scm-manager/ui-tests": "2.46.5", + "@scm-manager/ui-types": "2.46.5", "@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 90ad8f3253..15e2b0e774 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-SNAPSHOT", + "version": "2.46.5", "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 64b8a11939..97812fde1b 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-SNAPSHOT", + "version": "2.46.5", "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 566db62a27..ba7c1a3e96 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-SNAPSHOT", + "version": "2.46.5", "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 1b2b75b7ca..dc57f32f27 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-SNAPSHOT", + "version": "2.46.5", "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 ff3b767836..070f50a555 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-SNAPSHOT", + "version": "2.46.5", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.46.5-SNAPSHOT", + "@scm-manager/ui-text": "2.46.5", "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 8a620a2113..ae95b98b97 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-SNAPSHOT", + "version": "2.46.5", "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 638cd1dd8e..bfde048d8e 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-SNAPSHOT", + "version": "2.46.5", "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 d7dd16c421..9ff82bb3c8 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-SNAPSHOT", + "version": "2.46.5", "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 c90608b1d4..743b46491e 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-SNAPSHOT", + "version": "2.46.5", "private": true, "dependencies": { "@headlessui/react": "^1.7.15", - "@scm-manager/ui-components": "2.46.5-SNAPSHOT", - "@scm-manager/ui-api": "2.46.5-SNAPSHOT", - "@scm-manager/ui-extensions": "2.46.5-SNAPSHOT", - "@scm-manager/ui-modules": "2.46.5-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.46.5-SNAPSHOT", - "@scm-manager/ui-text": "2.46.5-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.46.5-SNAPSHOT", - "@scm-manager/ui-legacy": "2.46.5-SNAPSHOT", - "@scm-manager/ui-forms": "2.46.5-SNAPSHOT", - "@scm-manager/ui-buttons": "2.46.5-SNAPSHOT", - "@scm-manager/ui-overlays": "2.46.5-SNAPSHOT", - "@scm-manager/ui-layout": "2.46.5-SNAPSHOT", + "@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", "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-SNAPSHOT", + "@scm-manager/ui-tests": "2.46.5", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3",