Merge commit 'main' into develop

This commit is contained in:
René Pfeuffer
2025-02-25 13:19:59 +01:00
31 changed files with 98 additions and 81 deletions

View File

@@ -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

View File

@@ -34,8 +34,7 @@ class JavaModulePlugin implements Plugin<Project> {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
//TODO Fix javadoc errors which breaks the build
// withJavadocJar()
withJavadocJar()
withSourcesJar()
}

View File

@@ -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

View File

@@ -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

View File

@@ -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",

View File

@@ -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) {

View File

@@ -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(),

View File

@@ -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

View File

@@ -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": {

View File

@@ -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",

View File

@@ -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",

View File

@@ -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 <eduard.heimbuch@cloudogu.com>",

View File

@@ -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",

View File

@@ -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",

View File

@@ -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",

View File

@@ -78,6 +78,7 @@ const Tag: FC<Props> = ({
},
size === "small" && smallClassNames
)}
title={title}
>
{showIcon}
{label}

View File

@@ -85194,6 +85194,7 @@ exports[`Storyshots Tag With title 1`] = `
>
<span
className="tag is-light is-normal"
title="good job"
>
hover me
</span>

View File

@@ -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",

View File

@@ -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 <sebastian.sdorra@cloudogu.com>",
@@ -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",

View File

@@ -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",

View File

@@ -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",

View File

@@ -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",

View File

@@ -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",

View File

@@ -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",

View File

@@ -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": {

View File

@@ -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",

View File

@@ -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"
},

View File

@@ -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 <sebastian.sdorra@cloudogu.com>",
"license": "AGPL-3.0-only",

View File

@@ -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",

View File

@@ -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": [

View File

@@ -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",