diff --git a/CHANGELOG.md b/CHANGELOG.md index 67ff0d751f..1da3aba188 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). +## [3.7.3] - 2025-02-24 +### Fixed +- Keep original timestamp on rebase +- Title in tags (for example for "done" tags in review plugin) + ## [3.7.1] - 2025-01-28 ### Fixed - Internal server error when creating tags in combination with some plugins @@ -1699,3 +1704,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [3.6.1]: https://scm-manager.org/download/3.6.1 [3.7.0]: https://scm-manager.org/download/3.7.0 [3.7.1]: https://scm-manager.org/download/3.7.1 +[3.7.3]: https://scm-manager.org/download/3.7.2 diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy index a98fdc178a..47c6964c27 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy @@ -34,8 +34,7 @@ class JavaModulePlugin implements Plugin { toolchain { languageVersion = JavaLanguageVersion.of(17) } - //TODO Fix javadoc errors which breaks the build -// withJavadocJar() + withJavadocJar() withSourcesJar() } diff --git a/gradle.properties b/gradle.properties index c396bb9eec..fa21fb74c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # group = sonia.scm -version = 3.7.2-SNAPSHOT +version = 3.7.4-SNAPSHOT org.gradle.jvmargs=-Xmx1024M org.gradle.caching=true diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian index 18a5515ae2..d2487a1008 100644 --- a/scm-packaging/docker/Dockerfile.debian +++ b/scm-packaging/docker/Dockerfile.debian @@ -28,7 +28,7 @@ RUN jlink \ # --- # SCM-Manager runtime -FROM debian:11.11-slim as runtime +FROM --platform=linux/amd64 debian:11.11-slim as runtime ENV SCM_HOME /var/lib/scm ENV CACHE_DIR /var/cache/scm/work diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 6d7ea39476..6c2ff5e76f 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.2-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/CommitHelper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/CommitHelper.java index 68139509be..6fa9ac1bdb 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/CommitHelper.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/CommitHelper.java @@ -66,12 +66,21 @@ class CommitHelper { String message, boolean sign, ObjectId... parentCommitIds) throws IOException, CanceledException, UnsupportedSigningFormatException { + return createCommit(treeId, createPersonIdent(author), committer, message, sign, parentCommitIds); + } + + ObjectId createCommit(ObjectId treeId, + PersonIdent author, + Person committer, + String message, + boolean sign, + ObjectId... parentCommitIds) throws IOException, CanceledException, UnsupportedSigningFormatException { log.trace("create commit for tree {} and parent ids {} in repository {}", treeId, parentCommitIds, context.getRepository()); try (ObjectInserter inserter = repository.newObjectInserter()) { CommitBuilder commitBuilder = new CommitBuilder(); commitBuilder.setTreeId(treeId); commitBuilder.setParentIds(parentCommitIds); - commitBuilder.setAuthor(createPersonIdent(author)); + commitBuilder.setAuthor(author); commitBuilder.setCommitter(createPersonIdent(committer)); commitBuilder.setMessage(message); if (sign) { diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java index 72ba89bca6..a2a2cd6614 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java @@ -85,7 +85,7 @@ class GitMergeRebase { PersonIdent originalAuthor = commit.getAuthorIdent(); targetRevision = commitHelper.createCommit( newTreeId, - new Person(originalAuthor.getName(), originalAuthor.getEmailAddress()), + originalAuthor, request.getAuthor(), commit.getFullMessage(), request.isSign(), diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java index c3f460a0d4..2b8d9439fd 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java @@ -543,6 +543,7 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { assertThat(mergeCommit.getParent(0).name()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec"); assertThat(mergeCommit.getName()).isEqualTo(mergeCommandResult.getNewHeadRevision()); assertThat(mergeCommit.getName()).doesNotStartWith("91b99de908fcd04772798a31c308a64aea1a5523"); + assertThat(mergeCommit.getAuthorIdent().getWhenAsInstant()).isEqualTo("2018-11-07T10:20:52Z"); // the timestamp of the original commit } @Test diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 3be00aad6c..c341f3ce64 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.2-SNAPSHOT", + "@scm-manager/ui-plugins": "3.7.4-SNAPSHOT", "react-query": "^3.25.1" }, "devDependencies": { diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 374be94a39..1830089c09 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.2-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.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 2df6c498ce..a0e8379ab6 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "3.7.2-SNAPSHOT" + "@scm-manager/ui-plugins": "3.7.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 73b1966a37..0dc6613e64 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.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 945470478d..69fd1bd7bd 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -26,7 +26,7 @@ "react-i18next": "11" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "tsup": "^5.12.6", "@types/react-test-renderer": "^17.0.1", "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index 7263e71479..3630432c6b 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "private": false, "main": "index.ts", "license": "AGPL-3.0-only", @@ -13,7 +13,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT" + "@scm-manager/ui-core": "3.7.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/prettier-config": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index bac5884dac..8c1f215e14 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -32,8 +32,8 @@ "react-query": "^3.39.2" }, "devDependencies": { - "@scm-manager/ui-tests": "3.7.2-SNAPSHOT", - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.4-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "@types/fetch-mock": "^7.3.1", "@types/react-select": "^2.0.19", "@types/unist": "^2.0.3", @@ -67,17 +67,17 @@ "@scm-manager/jest-preset": "^2.14.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-syntaxhighlighting": "3.7.2-SNAPSHOT", - "@scm-manager/ui-shortcuts": "3.7.2-SNAPSHOT", - "@scm-manager/ui-text": "3.7.2-SNAPSHOT" + "@scm-manager/ui-syntaxhighlighting": "3.7.4-SNAPSHOT", + "@scm-manager/ui-shortcuts": "3.7.4-SNAPSHOT", + "@scm-manager/ui-text": "3.7.4-SNAPSHOT" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT", - "@scm-manager/ui-overlays": "3.7.2-SNAPSHOT", - "@scm-manager/ui-layout": "3.7.2-SNAPSHOT", - "@scm-manager/ui-buttons": "3.7.2-SNAPSHOT", - "@scm-manager/ui-api": "3.7.2-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.2-SNAPSHOT", + "@scm-manager/ui-core": "3.7.4-SNAPSHOT", + "@scm-manager/ui-overlays": "3.7.4-SNAPSHOT", + "@scm-manager/ui-layout": "3.7.4-SNAPSHOT", + "@scm-manager/ui-buttons": "3.7.4-SNAPSHOT", + "@scm-manager/ui-api": "3.7.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.4-SNAPSHOT", "deepmerge": "^4.2.2", "hast-util-sanitize": "^3.0.2", "react-diff-view": "^2.4.10", diff --git a/scm-ui/ui-components/src/Tag.tsx b/scm-ui/ui-components/src/Tag.tsx index 43b7808e41..ee925c92c7 100644 --- a/scm-ui/ui-components/src/Tag.tsx +++ b/scm-ui/ui-components/src/Tag.tsx @@ -78,6 +78,7 @@ const Tag: FC = ({ }, size === "small" && smallClassNames )} + title={title} > {showIcon} {label} diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap index a74f7cb029..c6683459fa 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -85194,6 +85194,7 @@ exports[`Storyshots Tag With title 1`] = ` > hover me diff --git a/scm-ui/ui-core/package.json b/scm-ui/ui-core/package.json index 5f23441788..781500114a 100644 --- a/scm-ui/ui-core/package.json +++ b/scm-ui/ui-core/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-core", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "main": "./src/index.ts", "license": "AGPL-3.0-only", "scripts": { @@ -20,7 +20,7 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-api": "3.7.2-SNAPSHOT", + "@scm-manager/ui-api": "3.7.4-SNAPSHOT", "@radix-ui/react-radio-group": "^1.1.3", "@radix-ui/react-slot": "^1.0.1", "@radix-ui/react-visually-hidden": "^1.0.3", @@ -37,7 +37,7 @@ "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/tsconfig": "^2.12.0", "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "@types/mousetrap": "1.6.5", "@testing-library/react-hooks": "8.0.1", "@testing-library/react": "12.1.5", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 9904986bb0..ad9538c9b6 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "private": false, "author": "Sebastian Sdorra ", @@ -21,8 +21,8 @@ "react": "^17.0.1" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", - "@scm-manager/ui-tests": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.4-SNAPSHOT", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index f118738cc7..ed7f1391d5 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -21,7 +21,7 @@ "styled-components": "^5.3.5" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT" + "@scm-manager/ui-core": "3.7.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json index c2909bd4cf..6260102304 100644 --- a/scm-ui/ui-layout/package.json +++ b/scm-ui/ui-layout/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-layout", "private": false, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -14,7 +14,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT" + "@scm-manager/ui-core": "3.7.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 2193a246c3..113119ff91 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -13,13 +13,13 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-api": "3.7.2-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.2-SNAPSHOT", + "@scm-manager/ui-api": "3.7.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.4-SNAPSHOT", "react-redux": "^5.0.7", "redux": "^4.0.0" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "@types/react-redux": "5.0.7", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 4bdb065079..2cafa2d3fe 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "main": "index.ts", "scripts": { "depcheck": "depcheck" @@ -19,7 +19,7 @@ "classnames": "^2.3.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT" + "@scm-manager/ui-core": "3.7.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index b3cdcda4bf..fca595fa77 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-plugins", "description": "Defines the versions of SCM-Manager plugin dependencies provided by the core webapp. Exclusively used by the postinstall command of @scm-manager/plugin-scripts.", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "type": "module", "main": "./build/provided-modules.js", @@ -17,14 +17,14 @@ "react-router-dom": "^5.3.1", "react-i18next": "11", "styled-components": "^5.3.5", - "@scm-manager/ui-api": "3.7.2-SNAPSHOT", - "@scm-manager/ui-buttons": "3.7.2-SNAPSHOT", - "@scm-manager/ui-components": "3.7.2-SNAPSHOT", - "@scm-manager/ui-core": "3.7.2-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.2-SNAPSHOT", - "@scm-manager/ui-forms": "3.7.2-SNAPSHOT", - "@scm-manager/ui-layout": "3.7.2-SNAPSHOT", - "@scm-manager/ui-overlays": "3.7.2-SNAPSHOT", + "@scm-manager/ui-api": "3.7.4-SNAPSHOT", + "@scm-manager/ui-buttons": "3.7.4-SNAPSHOT", + "@scm-manager/ui-components": "3.7.4-SNAPSHOT", + "@scm-manager/ui-core": "3.7.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.4-SNAPSHOT", + "@scm-manager/ui-forms": "3.7.4-SNAPSHOT", + "@scm-manager/ui-layout": "3.7.4-SNAPSHOT", + "@scm-manager/ui-overlays": "3.7.4-SNAPSHOT", "classnames": "^2.3.1", "query-string": "6.14.1", "redux": "^4.0.0", @@ -43,8 +43,8 @@ "@scm-manager/plugin-scripts": "^1.6.1", "@scm-manager/prettier-config": "^2.12.0", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "3.7.2-SNAPSHOT", - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.4-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/i18next": "^13.0.0", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 7be18502c3..ddf7b9342d 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "license": "AGPL-3.0-only", "private": true, "main": "index.ts", @@ -18,7 +18,7 @@ "@scm-manager/tsconfig": "^2.13.0" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT" + "@scm-manager/ui-core": "3.7.4-SNAPSHOT" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 1acad7e612..c00c88087b 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index 3e3b0ede4a..d59011df5a 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "3.7.2-SNAPSHOT", + "@scm-manager/ui-text": "3.7.4-SNAPSHOT", "nanoid": "^3.3.8", "refractor": "^4.5.0" }, diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index cd96c63a1c..15e4cdc445 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "AGPL-3.0-only", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index e3570174ca..8513082cea 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "private": true, "main": "index.ts", "scripts": { @@ -10,7 +10,7 @@ "react": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-core": "3.7.2-SNAPSHOT" + "@scm-manager/ui-core": "3.7.4-SNAPSHOT" }, "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 2a19239d8f..7733b9472d 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.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 ef85dccb9a..e4f4d033ad 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-webapp", - "version": "3.7.2-SNAPSHOT", + "version": "3.7.4-SNAPSHOT", "private": true, "scripts": { "test": "jest", @@ -11,16 +11,16 @@ }, "dependencies": { "@headlessui/react": "^1.7.17", - "@scm-manager/ui-components": "3.7.2-SNAPSHOT", - "@scm-manager/ui-api": "3.7.2-SNAPSHOT", - "@scm-manager/ui-extensions": "3.7.2-SNAPSHOT", - "@scm-manager/ui-shortcuts": "3.7.2-SNAPSHOT", - "@scm-manager/ui-legacy": "3.7.2-SNAPSHOT", - "@scm-manager/ui-forms": "3.7.2-SNAPSHOT", - "@scm-manager/ui-core": "3.7.2-SNAPSHOT", - "@scm-manager/ui-overlays": "3.7.2-SNAPSHOT", - "@scm-manager/ui-layout": "3.7.2-SNAPSHOT", - "@scm-manager/ui-buttons": "3.7.2-SNAPSHOT", + "@scm-manager/ui-components": "3.7.4-SNAPSHOT", + "@scm-manager/ui-api": "3.7.4-SNAPSHOT", + "@scm-manager/ui-extensions": "3.7.4-SNAPSHOT", + "@scm-manager/ui-shortcuts": "3.7.4-SNAPSHOT", + "@scm-manager/ui-legacy": "3.7.4-SNAPSHOT", + "@scm-manager/ui-forms": "3.7.4-SNAPSHOT", + "@scm-manager/ui-core": "3.7.4-SNAPSHOT", + "@scm-manager/ui-overlays": "3.7.4-SNAPSHOT", + "@scm-manager/ui-layout": "3.7.4-SNAPSHOT", + "@scm-manager/ui-buttons": "3.7.4-SNAPSHOT", "@radix-ui/react-portal": "^1.0.4", "@react-aria/overlays": "^3.23.1", "classnames": "^2.3.1", @@ -46,10 +46,10 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.14.1", - "@scm-manager/ui-tests": "3.7.2-SNAPSHOT", - "@scm-manager/ui-plugins": "3.7.2-SNAPSHOT", + "@scm-manager/ui-tests": "3.7.4-SNAPSHOT", + "@scm-manager/ui-plugins": "3.7.4-SNAPSHOT", "@scm-manager/prettier-config": "^2.12.0", - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/react": "^17.0.1",