From 8bcb814f942618ae45ded10aea08dc538692445d Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Thu, 20 Feb 2025 09:58:56 +0100 Subject: [PATCH 01/13] Keep original timestamp on rebase Squash commits of branch bugfix/keep_original_timestamp_on_rebase: - Keep original timestamp on rebase --- .../changelog/keep_original_timestamp_on_rebase .yaml | 2 ++ .../java/sonia/scm/repository/spi/CommitHelper.java | 11 ++++++++++- .../java/sonia/scm/repository/spi/GitMergeRebase.java | 2 +- .../sonia/scm/repository/spi/GitMergeCommandTest.java | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 gradle/changelog/keep_original_timestamp_on_rebase .yaml diff --git a/gradle/changelog/keep_original_timestamp_on_rebase .yaml b/gradle/changelog/keep_original_timestamp_on_rebase .yaml new file mode 100644 index 0000000000..81a582d21f --- /dev/null +++ b/gradle/changelog/keep_original_timestamp_on_rebase .yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Keep original timestamp on rebase 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 From 2e16941e9eecd11f8fd5aba86509eb48054be1ad Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 21 Feb 2025 09:51:14 +0100 Subject: [PATCH 02/13] Fix display of titles in tags Squash commits of branch bugfix/title_in_tag: - Fix display of titles in tags - Fix storyshots --- gradle/changelog/title_in_tag.yaml | 2 ++ scm-ui/ui-components/src/Tag.tsx | 1 + scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap | 1 + 3 files changed, 4 insertions(+) create mode 100644 gradle/changelog/title_in_tag.yaml diff --git a/gradle/changelog/title_in_tag.yaml b/gradle/changelog/title_in_tag.yaml new file mode 100644 index 0000000000..f9e7048ada --- /dev/null +++ b/gradle/changelog/title_in_tag.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Title in tags (for example for "done" tags in review plugin) 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 aed5f205e5..9bc31d3554 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -85187,6 +85187,7 @@ exports[`Storyshots Tag With title 1`] = ` > hover me From 9e5c3b49e278af81359aecab52f21dce586b1d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 24 Feb 2025 11:54:11 +0100 Subject: [PATCH 03/13] Enable JavaDoc --- .../src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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() } From 5c31b0f8e866127b86826c2c976265ee447caac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 24 Feb 2025 14:46:44 +0100 Subject: [PATCH 04/13] Adjust changelog for release 3.7.3 --- CHANGELOG.md | 6 ++++++ gradle/changelog/keep_original_timestamp_on_rebase .yaml | 2 -- gradle/changelog/title_in_tag.yaml | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 gradle/changelog/keep_original_timestamp_on_rebase .yaml delete mode 100644 gradle/changelog/title_in_tag.yaml 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/gradle/changelog/keep_original_timestamp_on_rebase .yaml b/gradle/changelog/keep_original_timestamp_on_rebase .yaml deleted file mode 100644 index 81a582d21f..0000000000 --- a/gradle/changelog/keep_original_timestamp_on_rebase .yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Keep original timestamp on rebase diff --git a/gradle/changelog/title_in_tag.yaml b/gradle/changelog/title_in_tag.yaml deleted file mode 100644 index f9e7048ada..0000000000 --- a/gradle/changelog/title_in_tag.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Title in tags (for example for "done" tags in review plugin) From 87ec747c6db8107842151d2437a9ea591d72a0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 09:32:28 +0100 Subject: [PATCH 05/13] Remove npmToken to avoid frontend publish --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7159878b3d..0bd5fb43d4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -298,7 +298,6 @@ void withPublishEnvironment(Closure closure) { withCredentials([ usernamePassword(credentialsId: 'packages-scm-manager-org', usernameVariable: 'ORG_GRADLE_PROJECT_packagesScmManagerUsername', passwordVariable: 'ORG_GRADLE_PROJECT_packagesScmManagerPassword'), string(credentialsId: 'SCM-Manager_ApiKey', variable: 'ORG_GRADLE_PROJECT_ecosystemApiToken'), - string(credentialsId: 'npm-token-scm-manager', variable: 'ORG_GRADLE_PROJECT_npmToken'), file(credentialsId: 'gpg_packages-scm-manager-org', variable: 'GPG_KEY_RING'), usernamePassword(credentialsId: 'gpg_packages-scm-manager-org-credentials', usernameVariable: 'GPG_KEY_ID', passwordVariable: 'GPG_KEY_PASSWORD') ]) { From df020b0aab0a56f8b59b1526f5253cd723917da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 10:21:42 +0100 Subject: [PATCH 06/13] Debug: Run docker commands on their own --- scm-packaging/docker/Dockerfile.debian | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian index b6d1366e9a..92cebf300f 100644 --- a/scm-packaging/docker/Dockerfile.debian +++ b/scm-packaging/docker/Dockerfile.debian @@ -39,17 +39,13 @@ COPY --from=jre-build /javaruntime "${JAVA_HOME}" COPY build/docker/etc /etc COPY build/docker/opt /opt -RUN set -x \ - && apt-get update \ - # libfreetype6 libfontconfig1 graphviz - && apt-get install -y --no-install-recommends libfreetype6 libfontconfig1 graphviz mercurial bash ca-certificates \ - # use gid 0 for openshift compatibility - && useradd -d "${SCM_HOME}" -u 1000 -g 0 -m -s /bin/bash scm \ - && mkdir -p ${SCM_HOME} ${CACHE_DIR} \ - && chmod +x /opt/scm-server/bin/scm-server \ - # set permissions to group 0 for openshift compatibility - && chown 1000:0 ${SCM_HOME} ${CACHE_DIR} \ - && chmod -R g=u ${SCM_HOME} ${CACHE_DIR} +RUN apt-get update +RUN apt-get install -y --no-install-recommends libfreetype6 libfontconfig1 graphviz mercurial bash ca-certificates +RUN useradd -d "${SCM_HOME}" -u 1000 -g 0 -m -s /bin/bash scm +RUN mkdir -p ${SCM_HOME} ${CACHE_DIR} +RUN chmod +x /opt/scm-server/bin/scm-server +RUN chown 1000:0 ${SCM_HOME} ${CACHE_DIR} +RUN chmod -R g=u ${SCM_HOME} ${CACHE_DIR} USER 1000 From 3811d3413488d1e8101f70c0040cf1e4f4585d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 10:22:41 +0100 Subject: [PATCH 07/13] Skip test steps --- Jenkinsfile | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0bd5fb43d4..49c4a150ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,51 +67,6 @@ pipeline { } } - stage('Check') { - steps { - catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { - gradle 'check' - } - junit allowEmptyResults: true, testResults: '**/build/test-results/test/TEST-*.xml,**/build/test-results/tests/test/TEST-*.xml,**/build/jest-reports/TEST-*.xml' - } - } - - // in parallel with check? - stage('Integration Tests') { - steps { - // To rerun integration tests with each build, add '-PrerunIntegrationTests' to the gradle command - gradle 'integrationTest' - junit allowEmptyResults: true, testResults: 'scm-it/build/test-results/javaIntegrationTests/*.xml,scm-ui/build/reports/e2e/*.xml' - archiveArtifacts allowEmptyArchive: true, artifacts: 'scm-ui/e2e-tests/cypress/videos/*.mp4' - archiveArtifacts allowEmptyArchive: true, artifacts: 'scm-ui/e2e-tests/cypress/screenshots/**/*.png' - } - } - - 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 { From 0ca53a5d35bca5b8182685d6b17b7170d03423cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 10:54:10 +0100 Subject: [PATCH 08/13] Revert "Debug: Run docker commands on their own" This reverts commit df020b0aab0a56f8b59b1526f5253cd723917da7. --- scm-packaging/docker/Dockerfile.debian | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian index 92cebf300f..b6d1366e9a 100644 --- a/scm-packaging/docker/Dockerfile.debian +++ b/scm-packaging/docker/Dockerfile.debian @@ -39,13 +39,17 @@ COPY --from=jre-build /javaruntime "${JAVA_HOME}" COPY build/docker/etc /etc COPY build/docker/opt /opt -RUN apt-get update -RUN apt-get install -y --no-install-recommends libfreetype6 libfontconfig1 graphviz mercurial bash ca-certificates -RUN useradd -d "${SCM_HOME}" -u 1000 -g 0 -m -s /bin/bash scm -RUN mkdir -p ${SCM_HOME} ${CACHE_DIR} -RUN chmod +x /opt/scm-server/bin/scm-server -RUN chown 1000:0 ${SCM_HOME} ${CACHE_DIR} -RUN chmod -R g=u ${SCM_HOME} ${CACHE_DIR} +RUN set -x \ + && apt-get update \ + # libfreetype6 libfontconfig1 graphviz + && apt-get install -y --no-install-recommends libfreetype6 libfontconfig1 graphviz mercurial bash ca-certificates \ + # use gid 0 for openshift compatibility + && useradd -d "${SCM_HOME}" -u 1000 -g 0 -m -s /bin/bash scm \ + && mkdir -p ${SCM_HOME} ${CACHE_DIR} \ + && chmod +x /opt/scm-server/bin/scm-server \ + # set permissions to group 0 for openshift compatibility + && chown 1000:0 ${SCM_HOME} ${CACHE_DIR} \ + && chmod -R g=u ${SCM_HOME} ${CACHE_DIR} USER 1000 From 7b0a21fcce68f49e48df0c85d34f8ac32e0aeff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 10:54:58 +0100 Subject: [PATCH 09/13] Bump debian version --- scm-packaging/docker/Dockerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian index b6d1366e9a..18a5515ae2 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.7-slim as runtime +FROM debian:11.11-slim as runtime ENV SCM_HOME /var/lib/scm ENV CACHE_DIR /var/cache/scm/work From 7eff877e01b4649985f9b550ecd57d031cac1baf Mon Sep 17 00:00:00 2001 From: Anna Vetcininova Date: Tue, 25 Feb 2025 12:15:41 +0100 Subject: [PATCH 10/13] Set architecture to amd64 platform --- scm-packaging/docker/Dockerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian index 18a5515ae2..d6b6bbc44a 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.7-slim as runtime ENV SCM_HOME /var/lib/scm ENV CACHE_DIR /var/cache/scm/work From 13da6f9c54c41adb77a779422d5b5db47c586522 Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Tue, 25 Feb 2025 11:17:13 +0000 Subject: [PATCH 11/13] Release version 3.7.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 | 4 ++-- scm-ui/ui-components/package.json | 24 +++++++++---------- scm-ui/ui-core/package.json | 6 ++--- scm-ui/ui-extensions/package.json | 6 ++--- scm-ui/ui-forms/package.json | 4 ++-- scm-ui/ui-layout/package.json | 4 ++-- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-overlays/package.json | 4 ++-- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-shortcuts/package.json | 4 ++-- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-syntaxhighlighting/package.json | 4 ++-- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-text/package.json | 4 ++-- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 23 files changed, 76 insertions(+), 76 deletions(-) diff --git a/gradle.properties b/gradle.properties index c396bb9eec..b811df93f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # group = sonia.scm -version = 3.7.2-SNAPSHOT +version = 3.7.3 org.gradle.jvmargs=-Xmx1024M org.gradle.caching=true diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 6d7ea39476..277cf9c4bd 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.3", "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.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 5112bd3b6f..23d6cb7b53 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.3", "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.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 374be94a39..c300ecd6bd 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.3", "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.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 2df6c498ce..8124cc04c0 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.3", "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.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 38646a1f4f..6a24c98ac7 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.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 945470478d..80c9b2fc73 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.3", "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.3", "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..a93a3ac1e7 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.3", "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.3" }, "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 0d2c08044c..bdb0ea75bd 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.3", "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.3", + "@scm-manager/ui-types": "3.7.3", "@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.3", + "@scm-manager/ui-shortcuts": "3.7.3", + "@scm-manager/ui-text": "3.7.3" }, "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.3", + "@scm-manager/ui-overlays": "3.7.3", + "@scm-manager/ui-layout": "3.7.3", + "@scm-manager/ui-buttons": "3.7.3", + "@scm-manager/ui-api": "3.7.3", + "@scm-manager/ui-extensions": "3.7.3", "deepmerge": "^4.2.2", "hast-util-sanitize": "^3.0.2", "react-diff-view": "^2.4.10", diff --git a/scm-ui/ui-core/package.json b/scm-ui/ui-core/package.json index 5f23441788..211168fc1f 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.3", "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.3", "@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.3", "@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..b077a1085f 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.3", "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.3", + "@scm-manager/ui-tests": "3.7.3", "@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..647adfed2c 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.3", "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.3" }, "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..4f999b959a 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.3", "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.3" }, "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..cd8a7099c1 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.3", "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.3", + "@scm-manager/ui-extensions": "3.7.3", "react-redux": "^5.0.7", "redux": "^4.0.0" }, "devDependencies": { - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.3", "@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..92b155a1d4 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.3", "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.3" }, "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..795c5188f3 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.3", "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.3", + "@scm-manager/ui-buttons": "3.7.3", + "@scm-manager/ui-components": "3.7.3", + "@scm-manager/ui-core": "3.7.3", + "@scm-manager/ui-extensions": "3.7.3", + "@scm-manager/ui-forms": "3.7.3", + "@scm-manager/ui-layout": "3.7.3", + "@scm-manager/ui-overlays": "3.7.3", "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.3", + "@scm-manager/ui-types": "3.7.3", "@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..ab3c65fa92 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.3", "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.3" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index c5843a9989..025f3f3305 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.3", "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 d7fd8e7657..320ba56b91 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.3", "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.3", "nanoid": "^3.3.2", "refractor": "^4.5.0" }, diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index cd96c63a1c..6887a4dc8a 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.3", "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..7b563c7921 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.3", "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.3" }, "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..d8c90ce4b5 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.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 51bb668828..a997464013 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.3", "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.3", + "@scm-manager/ui-api": "3.7.3", + "@scm-manager/ui-extensions": "3.7.3", + "@scm-manager/ui-shortcuts": "3.7.3", + "@scm-manager/ui-legacy": "3.7.3", + "@scm-manager/ui-forms": "3.7.3", + "@scm-manager/ui-core": "3.7.3", + "@scm-manager/ui-overlays": "3.7.3", + "@scm-manager/ui-layout": "3.7.3", + "@scm-manager/ui-buttons": "3.7.3", "@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.3", + "@scm-manager/ui-plugins": "3.7.3", "@scm-manager/prettier-config": "^2.12.0", - "@scm-manager/ui-types": "3.7.2-SNAPSHOT", + "@scm-manager/ui-types": "3.7.3", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/react": "^17.0.1", From ae0f366a88ba6e4523e0f4f6b99f2717f392e45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 13:13:34 +0100 Subject: [PATCH 12/13] Revert changes for debug --- Jenkinsfile | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 49c4a150ab..7159878b3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,6 +67,51 @@ pipeline { } } + stage('Check') { + steps { + catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { + gradle 'check' + } + junit allowEmptyResults: true, testResults: '**/build/test-results/test/TEST-*.xml,**/build/test-results/tests/test/TEST-*.xml,**/build/jest-reports/TEST-*.xml' + } + } + + // in parallel with check? + stage('Integration Tests') { + steps { + // To rerun integration tests with each build, add '-PrerunIntegrationTests' to the gradle command + gradle 'integrationTest' + junit allowEmptyResults: true, testResults: 'scm-it/build/test-results/javaIntegrationTests/*.xml,scm-ui/build/reports/e2e/*.xml' + archiveArtifacts allowEmptyArchive: true, artifacts: 'scm-ui/e2e-tests/cypress/videos/*.mp4' + archiveArtifacts allowEmptyArchive: true, artifacts: 'scm-ui/e2e-tests/cypress/screenshots/**/*.png' + } + } + + 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 { @@ -253,6 +298,7 @@ void withPublishEnvironment(Closure closure) { withCredentials([ usernamePassword(credentialsId: 'packages-scm-manager-org', usernameVariable: 'ORG_GRADLE_PROJECT_packagesScmManagerUsername', passwordVariable: 'ORG_GRADLE_PROJECT_packagesScmManagerPassword'), string(credentialsId: 'SCM-Manager_ApiKey', variable: 'ORG_GRADLE_PROJECT_ecosystemApiToken'), + string(credentialsId: 'npm-token-scm-manager', variable: 'ORG_GRADLE_PROJECT_npmToken'), file(credentialsId: 'gpg_packages-scm-manager-org', variable: 'GPG_KEY_RING'), usernamePassword(credentialsId: 'gpg_packages-scm-manager-org-credentials', usernameVariable: 'GPG_KEY_ID', passwordVariable: 'GPG_KEY_PASSWORD') ]) { From a4e51ebfe6b01b3d1f12d4971bdb1414d2fd286d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Feb 2025 13:16:32 +0100 Subject: [PATCH 13/13] Prepare for next development iteration --- gradle.properties | 2 +- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-ui/e2e-tests/package.json | 2 +- scm-ui/ui-api/package.json | 4 ++-- scm-ui/ui-buttons/package.json | 4 ++-- scm-ui/ui-components/package.json | 24 +++++++++---------- scm-ui/ui-core/package.json | 6 ++--- scm-ui/ui-extensions/package.json | 6 ++--- scm-ui/ui-forms/package.json | 4 ++-- scm-ui/ui-layout/package.json | 4 ++-- scm-ui/ui-legacy/package.json | 8 +++---- scm-ui/ui-overlays/package.json | 4 ++-- scm-ui/ui-plugins/package.json | 22 ++++++++--------- scm-ui/ui-shortcuts/package.json | 4 ++-- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-syntaxhighlighting/package.json | 4 ++-- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-text/package.json | 4 ++-- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 28 +++++++++++----------- 23 files changed, 76 insertions(+), 76 deletions(-) diff --git a/gradle.properties b/gradle.properties index b811df93f2..fa21fb74c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # group = sonia.scm -version = 3.7.3 +version = 3.7.4-SNAPSHOT org.gradle.jvmargs=-Xmx1024M org.gradle.caching=true diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 277cf9c4bd..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.3", + "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.3" + "@scm-manager/ui-plugins": "3.7.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 23d6cb7b53..87dea5a380 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.3", + "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.3" + "@scm-manager/ui-plugins": "3.7.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 c300ecd6bd..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.3", + "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.3" + "@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 8124cc04c0..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.3", + "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.3" + "@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 6a24c98ac7..e55e48a174 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.3", + "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 80c9b2fc73..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.3", + "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.3", + "@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 a93a3ac1e7..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.3", + "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.3" + "@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 bdb0ea75bd..fa3e56e981 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.3", + "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.3", - "@scm-manager/ui-types": "3.7.3", + "@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.3", - "@scm-manager/ui-shortcuts": "3.7.3", - "@scm-manager/ui-text": "3.7.3" + "@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.3", - "@scm-manager/ui-overlays": "3.7.3", - "@scm-manager/ui-layout": "3.7.3", - "@scm-manager/ui-buttons": "3.7.3", - "@scm-manager/ui-api": "3.7.3", - "@scm-manager/ui-extensions": "3.7.3", + "@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-core/package.json b/scm-ui/ui-core/package.json index 211168fc1f..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.3", + "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.3", + "@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.3", + "@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 b077a1085f..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.3", + "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.3", - "@scm-manager/ui-tests": "3.7.3", + "@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 647adfed2c..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.3", + "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.3" + "@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 4f999b959a..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.3", + "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.3" + "@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 cd8a7099c1..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.3", + "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.3", - "@scm-manager/ui-extensions": "3.7.3", + "@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.3", + "@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 92b155a1d4..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.3", + "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.3" + "@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 795c5188f3..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.3", + "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.3", - "@scm-manager/ui-buttons": "3.7.3", - "@scm-manager/ui-components": "3.7.3", - "@scm-manager/ui-core": "3.7.3", - "@scm-manager/ui-extensions": "3.7.3", - "@scm-manager/ui-forms": "3.7.3", - "@scm-manager/ui-layout": "3.7.3", - "@scm-manager/ui-overlays": "3.7.3", + "@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.3", - "@scm-manager/ui-types": "3.7.3", + "@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 ab3c65fa92..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.3", + "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.3" + "@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 025f3f3305..a852cb941b 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.3", + "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 320ba56b91..c1e29e478a 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.3", + "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.3", + "@scm-manager/ui-text": "3.7.4-SNAPSHOT", "nanoid": "^3.3.2", "refractor": "^4.5.0" }, diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 6887a4dc8a..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.3", + "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 7b563c7921..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.3", + "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.3" + "@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 d8c90ce4b5..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.3", + "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 a997464013..24b5a9a5d2 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.3", + "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.3", - "@scm-manager/ui-api": "3.7.3", - "@scm-manager/ui-extensions": "3.7.3", - "@scm-manager/ui-shortcuts": "3.7.3", - "@scm-manager/ui-legacy": "3.7.3", - "@scm-manager/ui-forms": "3.7.3", - "@scm-manager/ui-core": "3.7.3", - "@scm-manager/ui-overlays": "3.7.3", - "@scm-manager/ui-layout": "3.7.3", - "@scm-manager/ui-buttons": "3.7.3", + "@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.3", - "@scm-manager/ui-plugins": "3.7.3", + "@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.3", + "@scm-manager/ui-types": "3.7.4-SNAPSHOT", "@types/classnames": "^2.3.1", "@types/enzyme": "^3.10.18", "@types/react": "^17.0.1",