From 91b9946a7277017ce7b5e7adfa28af30799f3fb7 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Wed, 21 Jun 2023 09:34:53 +0200 Subject: [PATCH 1/3] Internal server error with external groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a null pointer exception resulting in an internal server error in the permission overview for users with external groups, for example from ldap or cas. Committed-by: Eduard Heimbuch Co-authored-by: René Pfeuffer --- gradle/changelog/permission_overview.yaml | 2 + ...OverviewToPermissionOverviewDtoMapper.java | 2 + ...viewToPermissionOverviewDtoMapperTest.java | 124 ++++++++++-------- 3 files changed, 76 insertions(+), 52 deletions(-) create mode 100644 gradle/changelog/permission_overview.yaml diff --git a/gradle/changelog/permission_overview.yaml b/gradle/changelog/permission_overview.yaml new file mode 100644 index 0000000000..4aa950d71e --- /dev/null +++ b/gradle/changelog/permission_overview.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Internal server error with external groups in permission overview diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapper.java index ef6a0a9732..dde0653d0a 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapper.java @@ -34,6 +34,7 @@ import sonia.scm.user.PermissionOverview; import javax.inject.Inject; import java.util.List; +import java.util.Objects; import static de.otto.edison.hal.Links.linkingTo; import static java.util.stream.Collectors.toList; @@ -83,6 +84,7 @@ abstract class PermissionOverviewToPermissionOverviewDtoMapper { .stream() .map(PermissionOverview.GroupEntry::getName) .map(groupManager::get) + .filter(Objects::nonNull) .map(groupToGroupDtoMapper::map) .collect(toList()); Embedded.Builder embedded = new Embedded.Builder() diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapperTest.java index abb336d6d2..133e32a2b6 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionOverviewToPermissionOverviewDtoMapperTest.java @@ -26,6 +26,7 @@ package sonia.scm.api.v2.resources; import de.otto.edison.hal.Links; 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.InjectMocks; @@ -100,57 +101,78 @@ class PermissionOverviewToPermissionOverviewDtoMapperTest { .thenAnswer(invocation -> new NamespaceDto(invocation.getArgument(0, String.class), Links.emptyLinks())); } - @BeforeEach - void initGroupMapper() { + @Nested + class WithInternalGroups { + @BeforeEach + void initGroupMapper() { + when(groupManager.get(anyString())) + .thenAnswer(invocation -> new Group("xml", invocation.getArgument(0, String.class))); + when(groupToGroupDtoMapper.map(any())) + .thenAnswer(invocation -> { + GroupDto groupDto = new GroupDto(); + groupDto.setName(invocation.getArgument(0, Group.class).getName()); + return groupDto; + }); + } + + @Test + void shouldMapRepositories() { + PermissionOverviewDto dto = permissionOverviewToPermissionOverviewDtoMapper + .toDto(PERMISSION_OVERVIEW, "Neo"); + + assertThat(dto.getRelevantRepositories()) + .extracting("namespace") + .contains("hog", "vogon"); + assertThat(dto.getRelevantRepositories()) + .extracting("name") + .contains("marvin", "jeltz"); + + assertThat( + dto. + getEmbedded() + .getItemsBy("repositories") + ).hasSize(2); + } + + @Test + void shouldMapNamespaces() { + PermissionOverviewDto dto = permissionOverviewToPermissionOverviewDtoMapper + .toDto(PERMISSION_OVERVIEW, "Neo"); + + assertThat(dto.getRelevantNamespaces()) + .contains("hog", "earth"); + + assertThat(dto.getEmbedded().getItemsBy("relevantNamespaces")) + .hasSize(2) + .extracting("namespace") + .contains("hog", "earth"); + assertThat(dto.getEmbedded().getItemsBy("otherNamespaces")) + .hasSize(1) + .extracting("namespace") + .contains("vogon"); + } + + @Test + void shouldMapGroups() { + PermissionOverviewDto dto = permissionOverviewToPermissionOverviewDtoMapper + .toDto(PERMISSION_OVERVIEW, "Neo"); + + assertThat(dto.getRelevantGroups()) + .extracting("name") + .contains("hitchhiker", "vogons"); + + assertThat(dto.getEmbedded().getItemsBy("groups")) + .hasSize(2) + .extracting("name") + .contains("hitchhiker", "vogons"); + } + } + + @Test + void shouldExcludeExternalGroups() { when(groupManager.get(anyString())) - .thenAnswer(invocation -> new Group("xml", invocation.getArgument(0, String.class))); - when(groupToGroupDtoMapper.map(any())) - .thenAnswer(invocation -> { - GroupDto groupDto = new GroupDto(); - groupDto.setName(invocation.getArgument(0, Group.class).getName()); - return groupDto; - }); - } + .thenAnswer(invocation -> null); - @Test - void shouldMapRepositories() { - PermissionOverviewDto dto = permissionOverviewToPermissionOverviewDtoMapper - .toDto(PERMISSION_OVERVIEW, "Neo"); - - assertThat(dto.getRelevantRepositories()) - .extracting("namespace") - .contains("hog", "vogon"); - assertThat(dto.getRelevantRepositories()) - .extracting("name") - .contains("marvin", "jeltz"); - - assertThat( - dto. - getEmbedded() - .getItemsBy("repositories") - ).hasSize(2); - } - - @Test - void shouldMapNamespaces() { - PermissionOverviewDto dto = permissionOverviewToPermissionOverviewDtoMapper - .toDto(PERMISSION_OVERVIEW, "Neo"); - - assertThat(dto.getRelevantNamespaces()) - .contains("hog", "earth"); - - assertThat(dto.getEmbedded().getItemsBy("relevantNamespaces")) - .hasSize(2) - .extracting("namespace") - .contains("hog", "earth"); - assertThat(dto.getEmbedded().getItemsBy("otherNamespaces")) - .hasSize(1) - .extracting("namespace") - .contains("vogon"); - } - - @Test - void shouldMapGroups() { PermissionOverviewDto dto = permissionOverviewToPermissionOverviewDtoMapper .toDto(PERMISSION_OVERVIEW, "Neo"); @@ -159,8 +181,6 @@ class PermissionOverviewToPermissionOverviewDtoMapperTest { .contains("hitchhiker", "vogons"); assertThat(dto.getEmbedded().getItemsBy("groups")) - .hasSize(2) - .extracting("name") - .contains("hitchhiker", "vogons"); + .isEmpty(); } } From 16ea804b34894654a858f19b9138a393e79e7ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 23 Jun 2023 09:46:02 +0200 Subject: [PATCH 2/3] Adjust changelog for release 2.44.2 --- CHANGELOG.md | 5 +++++ gradle/changelog/permission_overview.yaml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 gradle/changelog/permission_overview.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index de87e1e47e..db9c19aaff 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.44.2] - 2023-06-23 +### Fixed +- Internal server error with external groups in permission overview + ## [2.44.1] - 2023-06-13 ### Fixed - Performance (prevent reading of repositories in namespace mapper) @@ -1296,3 +1300,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.43.1]: https://scm-manager.org/download/2.43.1 [2.44.0]: https://scm-manager.org/download/2.44.0 [2.44.1]: https://scm-manager.org/download/2.44.1 +[2.44.2]: https://scm-manager.org/download/2.44.2 diff --git a/gradle/changelog/permission_overview.yaml b/gradle/changelog/permission_overview.yaml deleted file mode 100644 index 4aa950d71e..0000000000 --- a/gradle/changelog/permission_overview.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Internal server error with external groups in permission overview From b30b9d2110bd589356eaae5ae460593b060d6030 Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Fri, 23 Jun 2023 07:54:34 +0000 Subject: [PATCH 3/3] Release version 2.44.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 | 8 +++---- 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, 77 insertions(+), 77 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc0dedb856..8def116644 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.44.2-SNAPSHOT +version = 2.44.2 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index d80544ddb9..232bd981e6 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.44.2-SNAPSHOT", + "version": "2.44.2", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.44.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.44.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 ed0f1bc11d..1639db8447 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.44.2-SNAPSHOT", + "version": "2.44.2", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.44.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.44.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 fd5d5b4789..014d64793e 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.44.2-SNAPSHOT", + "version": "2.44.2", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.44.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.44.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 797fd49264..fc701b0d32 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.44.2-SNAPSHOT", + "version": "2.44.2", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.44.2-SNAPSHOT" + "@scm-manager/ui-plugins": "2.44.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 31e4adf0a2..7d8b576d57 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.44.2-SNAPSHOT", + "version": "2.44.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 7c716ebcf9..0e8dc07710 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.44.2-SNAPSHOT", + "version": "2.44.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.44.2-SNAPSHOT", + "@scm-manager/ui-types": "2.44.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 95a19c3055..b883a7858e 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.44.2-SNAPSHOT", + "version": "2.44.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.44.2-SNAPSHOT" + "@scm-manager/ui-components": "2.44.2" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.44.2-SNAPSHOT", + "@scm-manager/ui-api": "2.44.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 e444f87aa2..ee43630384 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.44.2-SNAPSHOT", + "version": "2.44.2", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -20,15 +20,15 @@ "update-storyshots": "jest --testPathPattern=\"storyshots.test.ts\" --collectCoverage=false -u" }, "devDependencies": { - "@scm-manager/ui-syntaxhighlighting": "2.44.2-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.44.2-SNAPSHOT", - "@scm-manager/ui-text": "2.44.2-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.44.2", + "@scm-manager/ui-shortcuts": "2.44.2", + "@scm-manager/ui-text": "2.44.2", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "2.44.2-SNAPSHOT", + "@scm-manager/ui-tests": "2.44.2", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -67,9 +67,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.44.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.44.2-SNAPSHOT", - "@scm-manager/ui-types": "2.44.2-SNAPSHOT", + "@scm-manager/ui-api": "2.44.2", + "@scm-manager/ui-extensions": "2.44.2", + "@scm-manager/ui-types": "2.44.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 25206c201b..0f5ed94175 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.44.2-SNAPSHOT", + "version": "2.44.2", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.44.2-SNAPSHOT", + "@scm-manager/ui-types": "2.44.2", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index e8db23918c..fd9d5e7c31 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.44.2-SNAPSHOT", + "version": "2.44.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.44.2-SNAPSHOT", + "@scm-manager/ui-styles": "2.44.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.44.2-SNAPSHOT", + "@scm-manager/ui-components": "2.44.2", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.44.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.44.2-SNAPSHOT", - "@scm-manager/ui-api": "2.44.2-SNAPSHOT", + "@scm-manager/ui-buttons": "2.44.2", + "@scm-manager/ui-overlays": "2.44.2", + "@scm-manager/ui-api": "2.44.2", "@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 e7737196f3..4d9939e417 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.44.2-SNAPSHOT", + "version": "2.44.2", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,9 +16,9 @@ "@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.44.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.44.2-SNAPSHOT", - "@scm-manager/ui-buttons": "2.44.2-SNAPSHOT", + "@scm-manager/ui-styles": "2.44.2", + "@scm-manager/ui-overlays": "2.44.2", + "@scm-manager/ui-buttons": "2.44.2", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index eaba6b35cf..4d19eaf44e 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.44.2-SNAPSHOT", + "version": "2.44.2", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.44.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.44.2-SNAPSHOT", - "@scm-manager/ui-types": "2.44.2-SNAPSHOT", + "@scm-manager/ui-api": "2.44.2", + "@scm-manager/ui-extensions": "2.44.2", + "@scm-manager/ui-types": "2.44.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 fcb3c48649..1ab46c04fd 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.44.2-SNAPSHOT", + "version": "2.44.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 326d3e8664..8baf10a038 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.44.2-SNAPSHOT", + "version": "2.44.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.44.2-SNAPSHOT", + "@scm-manager/ui-styles": "2.44.2", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -42,7 +42,7 @@ "dependencies": { "@radix-ui/react-tooltip": "1.0.2", "@radix-ui/react-dropdown-menu": "2.0.4", - "@scm-manager/ui-buttons": "2.44.2-SNAPSHOT" + "@scm-manager/ui-buttons": "2.44.2" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index bab100bce3..ba5f96b03a 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.44.2-SNAPSHOT", + "version": "2.44.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.44.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.44.2-SNAPSHOT", - "@scm-manager/ui-components": "2.44.2-SNAPSHOT", - "@scm-manager/ui-forms": "2.44.2-SNAPSHOT", - "@scm-manager/ui-buttons": "2.44.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.44.2-SNAPSHOT", - "@scm-manager/ui-layout": "2.44.2-SNAPSHOT", + "@scm-manager/ui-api": "2.44.2", + "@scm-manager/ui-extensions": "2.44.2", + "@scm-manager/ui-components": "2.44.2", + "@scm-manager/ui-forms": "2.44.2", + "@scm-manager/ui-buttons": "2.44.2", + "@scm-manager/ui-overlays": "2.44.2", + "@scm-manager/ui-layout": "2.44.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.44.2-SNAPSHOT", - "@scm-manager/ui-tests": "2.44.2-SNAPSHOT", - "@scm-manager/ui-types": "2.44.2-SNAPSHOT", + "@scm-manager/ui-scripts": "2.44.2", + "@scm-manager/ui-tests": "2.44.2", + "@scm-manager/ui-types": "2.44.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 a1cce6e2da..7b22d21760 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.44.2-SNAPSHOT", + "version": "2.44.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 3d4cf09fed..36620b5db0 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.44.2-SNAPSHOT", + "version": "2.44.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 41e3510d7a..569b81b7af 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.44.2-SNAPSHOT", + "version": "2.44.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 9dfb932e41..18ea43fc81 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.44.2-SNAPSHOT", + "version": "2.44.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 3c9a4f4445..59cf80055a 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.44.2-SNAPSHOT", + "version": "2.44.2", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.44.2-SNAPSHOT", + "@scm-manager/ui-text": "2.44.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 1048c6428f..c9bc3b1d08 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.44.2-SNAPSHOT", + "version": "2.44.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 50c9e10bca..f8cb835257 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.44.2-SNAPSHOT", + "version": "2.44.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 b1bdcd8720..25785533c2 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.44.2-SNAPSHOT", + "version": "2.44.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 f67c947731..2e638a62ca 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.44.2-SNAPSHOT", + "version": "2.44.2", "private": true, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.44.2-SNAPSHOT", - "@scm-manager/ui-components": "2.44.2-SNAPSHOT", - "@scm-manager/ui-extensions": "2.44.2-SNAPSHOT", - "@scm-manager/ui-modules": "2.44.2-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.44.2-SNAPSHOT", - "@scm-manager/ui-text": "2.44.2-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.44.2-SNAPSHOT", - "@scm-manager/ui-legacy": "2.44.2-SNAPSHOT", - "@scm-manager/ui-forms": "2.44.2-SNAPSHOT", - "@scm-manager/ui-buttons": "2.44.2-SNAPSHOT", - "@scm-manager/ui-overlays": "2.44.2-SNAPSHOT", - "@scm-manager/ui-layout": "2.44.2-SNAPSHOT", + "@scm-manager/ui-api": "2.44.2", + "@scm-manager/ui-components": "2.44.2", + "@scm-manager/ui-extensions": "2.44.2", + "@scm-manager/ui-modules": "2.44.2", + "@scm-manager/ui-syntaxhighlighting": "2.44.2", + "@scm-manager/ui-text": "2.44.2", + "@scm-manager/ui-shortcuts": "2.44.2", + "@scm-manager/ui-legacy": "2.44.2", + "@scm-manager/ui-forms": "2.44.2", + "@scm-manager/ui-buttons": "2.44.2", + "@scm-manager/ui-overlays": "2.44.2", + "@scm-manager/ui-layout": "2.44.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.44.2-SNAPSHOT", + "@scm-manager/ui-tests": "2.44.2", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3",