diff --git a/CHANGELOG.md b/CHANGELOG.md index 560d12dbb9..7065a5baef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.43.1] - 2023-05-12 +### Fixed +- Configuration of default branch in the git mirror command + ## [2.43.0] - 2023-04-12 ### Added - Extension points for bottom of information table @@ -1262,3 +1266,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.42.2]: https://scm-manager.org/download/2.42.2 [2.42.3]: https://scm-manager.org/download/2.42.3 [2.43.0]: https://scm-manager.org/download/2.43.0 +[2.43.1]: https://scm-manager.org/download/2.43.1 diff --git a/gradle.properties b/gradle.properties index 229a6f1b35..39a3dcdd49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.43.1-SNAPSHOT +version = 2.43.1 org.gradle.jvmargs=-Xmx1024M diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 64c774e9fb..86f385dd6c 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -11,7 +11,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.43.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.43.1" }, "devDependencies": { "@scm-manager/babel-preset": "^2.13.1", diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMirrorCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMirrorCommand.java index 35409eb32d..78015c1962 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMirrorCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMirrorCommand.java @@ -26,6 +26,7 @@ package sonia.scm.repository.spi; import com.google.common.base.Stopwatch; import com.google.common.base.Strings; +import org.apache.commons.lang.StringUtils; import org.eclipse.jgit.api.FetchCommand; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; @@ -214,7 +215,9 @@ public class GitMirrorCommand extends AbstractGitCommand implements MirrorComman return new MirrorCommandResult(result, mirrorLog, stopwatch.stop().elapsed(), lfsUpdateResult); } - defaultBranchSelector.newDefaultBranch().ifPresent(this::setNewDefaultBranch); + String currentDefaultBranchInRepository = getCurrentDefaultBranch(); + defaultBranchSelector.newDefaultBranch(currentDefaultBranchInRepository) + .ifPresent(this::setNewDefaultBranch); String[] pushRefSpecs = generatePushRefSpecs().toArray(new String[0]); forcePush(pushRefSpecs); @@ -223,17 +226,18 @@ public class GitMirrorCommand extends AbstractGitCommand implements MirrorComman } private void setNewDefaultBranch(String newDefaultBranch) { - mirrorLog.add("Old default branch deleted. Setting default branch to '" + newDefaultBranch + "'."); - try { - String oldBranch = git.getRepository().getBranch(); - RefUpdate refUpdate = git.getRepository().getRefDatabase().newUpdate(Constants.HEAD, true); - refUpdate.setForceUpdate(true); - RefUpdate.Result result = refUpdate.link(Constants.R_HEADS + newDefaultBranch); - if (result != RefUpdate.Result.FORCED) { - throw new InternalRepositoryException(getRepository(), "Could not set HEAD to new default branch"); + String oldBranch = getCurrentDefaultBranch(); + if (!StringUtils.equals(oldBranch, newDefaultBranch)) { + mirrorLog.add("Old default branch deleted. Setting default branch to '" + newDefaultBranch + "'."); + RefUpdate refUpdate = git.getRepository().getRefDatabase().newUpdate(Constants.HEAD, true); + refUpdate.setForceUpdate(true); + RefUpdate.Result result = refUpdate.link(Constants.R_HEADS + newDefaultBranch); + if (result != RefUpdate.Result.FORCED) { + throw new InternalRepositoryException(getRepository(), "Could not set HEAD to new default branch"); + } + git.branchDelete().setBranchNames(oldBranch).setForce(true).call(); } - git.branchDelete().setBranchNames(oldBranch).setForce(true).call(); } catch (GitAPIException | IOException e) { throw new InternalRepositoryException(getRepository(), "Error while switching branch to change default branch", e); } @@ -242,6 +246,14 @@ public class GitMirrorCommand extends AbstractGitCommand implements MirrorComman storeProvider.setDefaultBranch(repository, newDefaultBranch); } + private String getCurrentDefaultBranch() { + try { + return git.getRepository().getBranch(); + } catch (IOException e) { + return null; + } + } + private Collection generatePushRefSpecs() { Collection refSpecs = new ArrayList<>(); refSpecs.add("refs/heads/*:refs/heads/*"); @@ -759,9 +771,9 @@ public class GitMirrorCommand extends AbstractGitCommand implements MirrorComman return changed; } - public Optional newDefaultBranch() { - if (initialDefaultBranch == null && newBranches.contains("master") || remainingBranches.contains(initialDefaultBranch)) { - return empty(); + public Optional newDefaultBranch(String currentDefaultBranchInRepository) { + if (initialDefaultBranch == null && newBranches.contains(currentDefaultBranchInRepository) || remainingBranches.contains(initialDefaultBranch)) { + return of(currentDefaultBranchInRepository); } else if (!newBranches.isEmpty() && initialBranches.isEmpty()) { return of(newBranches.iterator().next()); } else if (initialDefaultBranch == null && newBranches.isEmpty()) { diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMirrorCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMirrorCommandTest.java index 536d608779..e73369b1df 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMirrorCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMirrorCommandTest.java @@ -78,6 +78,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static sonia.scm.repository.api.MirrorCommandResult.ResultType.FAILED; import static sonia.scm.repository.api.MirrorCommandResult.ResultType.OK; @@ -165,7 +166,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { @Test public void shouldAcceptEmptyInitialMirror() throws IOException, GitAPIException { - MirrorCommandResult result = callMirrorCommand(repositoryDirectory.getAbsolutePath(), c -> { + MirrorCommandResult result = callMirrorCommand(repositoryDirectory.getAbsolutePath(), c -> c.setFilter(new MirrorFilter() { @Override public Filter getFilter(FilterContext context) { @@ -181,8 +182,8 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { } }; } - }); - }); + }) + ); assertThat(result.getResult()).isEqualTo(REJECTED_UPDATES); assertThat(result.getLog()).contains("Branches:") @@ -200,7 +201,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { @Test public void shouldAcceptOnlyTagInInitialMirror() { assertThrows(IllegalStateException.class, () -> - callMirrorCommand(repositoryDirectory.getAbsolutePath(), c -> { + callMirrorCommand(repositoryDirectory.getAbsolutePath(), c -> c.setFilter(new MirrorFilter() { @Override public Filter getFilter(FilterContext context) { @@ -211,13 +212,13 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { } }; } - }); - })); + }) + )); } @Test public void shouldFilterMasterBranchWhenFilteredOnInitialMirror() throws IOException, GitAPIException { - MirrorCommandResult result = callMirrorCommand(repositoryDirectory.getAbsolutePath(), c -> { + MirrorCommandResult result = callMirrorCommand(repositoryDirectory.getAbsolutePath(), c -> c.setFilter(new MirrorFilter() { @Override public Filter getFilter(FilterContext context) { @@ -232,8 +233,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { } }; } - }); - }); + })); assertThat(result.getResult()).isEqualTo(REJECTED_UPDATES); assertThat(result.getLog()) @@ -808,6 +808,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { @Test public void shouldSelectNewHeadIfOldHeadIsDeleted() throws IOException, GitAPIException { callMirrorCommand(); + reset(storeProvider); try (Git updatedSource = Git.open(repositoryDirectory)) { updatedSource.checkout().setName("test-branch").call(); @@ -879,7 +880,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.accepted(BRANCH, "master"); selector.accepted(BRANCH, "something"); - assertThat(selector.newDefaultBranch()).isEmpty(); + assertThat(selector.newDefaultBranch("master")).get().isEqualTo("master"); } @Test @@ -890,7 +891,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.accepted(BRANCH, "new"); selector.deleted(BRANCH, "two"); - assertThat(selector.newDefaultBranch()).isEmpty(); + assertThat(selector.newDefaultBranch("master")).get().isEqualTo("master"); } @Test @@ -900,7 +901,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.deleted(BRANCH, "master"); - assertThat(selector.newDefaultBranch()).get().isIn("one", "two", "three"); + assertThat(selector.newDefaultBranch("master")).get().isIn("one", "two", "three"); } @Test @@ -912,7 +913,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.deleted(BRANCH, "one"); selector.deleted(BRANCH, "three"); - assertThat(selector.newDefaultBranch()).get().isEqualTo("two"); + assertThat(selector.newDefaultBranch("master")).get().isEqualTo("two"); } @Test @@ -924,7 +925,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.deleted(BRANCH, "one"); selector.deleted(BRANCH, "three"); - assertThat(selector.newDefaultBranch()).get().isEqualTo("two"); + assertThat(selector.newDefaultBranch("master")).get().isEqualTo("two"); } @Test @@ -938,7 +939,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.accepted(BRANCH, "new"); selector.deleted(BRANCH, "three"); - assertThrows(IllegalStateException.class, selector::newDefaultBranch); + assertThrows(IllegalStateException.class, () -> selector.newDefaultBranch("master")); } @Test @@ -949,7 +950,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.accepted(BRANCH, "main"); selector.deleted(BRANCH, "master"); - assertThat(selector.newDefaultBranch()).get().isEqualTo("main"); + assertThat(selector.newDefaultBranch("master")).get().isEqualTo("main"); } @Test @@ -959,7 +960,7 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { selector.accepted(BRANCH, "main"); - assertThat(selector.newDefaultBranch()).get().isEqualTo("main"); + assertThat(selector.newDefaultBranch("master")).get().isEqualTo("main"); } } @@ -1113,4 +1114,10 @@ public class GitMirrorCommandTest extends AbstractGitCommandTestBase { workdirAfterClose = workdir; } } + + @Override + protected String getZippedRepositoryResource() + { + return "sonia/scm/repository/spi/scm-git-spi-mirror-test.zip"; + } } diff --git a/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-mirror-test.zip b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-mirror-test.zip new file mode 100644 index 0000000000..ddd9c68a97 Binary files /dev/null and b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-mirror-test.zip differ diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 6304701a1b..d28e22abef 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.43.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.43.1" }, "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 5faee08ffc..9c394d77d8 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.43.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.43.1" }, "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 bc9953061a..49edefbedb 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -10,7 +10,7 @@ "typecheck": "tsc" }, "dependencies": { - "@scm-manager/ui-plugins": "2.43.1-SNAPSHOT" + "@scm-manager/ui-plugins": "2.43.1" }, "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 d247a93950..460100cd2c 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "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 ec4d623136..abaa854ff3 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "description": "React hook api for the SCM-Manager backend", "main": "build/index.js", "module": "build/index.mjs", @@ -29,7 +29,7 @@ "tsup": "^5.12.6" }, "dependencies": { - "@scm-manager/ui-types": "2.43.1-SNAPSHOT", + "@scm-manager/ui-types": "2.43.1", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json index dac5d94269..f040826a26 100644 --- a/scm-ui/ui-buttons/package.json +++ b/scm-ui/ui-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-buttons", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "private": false, "main": "build/index.js", "module": "build/index.mjs", @@ -24,11 +24,11 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.3.1", "classnames": "^2.2.6", - "@scm-manager/ui-components": "2.43.1-SNAPSHOT" + "@scm-manager/ui-components": "2.43.1" }, "devDependencies": { "@scm-manager/prettier-config": "^2.11.1", - "@scm-manager/ui-api": "2.43.1-SNAPSHOT", + "@scm-manager/ui-api": "2.43.1", "@scm-manager/eslint-config": "^2.17.0", "@babel/core": "^7.17.8", "@scm-manager/tsconfig": "^2.12.0", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index c8037dc328..6bd217ca36 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -20,15 +20,15 @@ "update-storyshots": "jest --testPathPattern=\"storyshots.test.ts\" --collectCoverage=false -u" }, "devDependencies": { - "@scm-manager/ui-syntaxhighlighting": "2.43.1-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.43.1-SNAPSHOT", - "@scm-manager/ui-text": "2.43.1-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "2.43.1", + "@scm-manager/ui-shortcuts": "2.43.1", + "@scm-manager/ui-text": "2.43.1", "@scm-manager/babel-preset": "^2.13.1", "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "2.43.1-SNAPSHOT", + "@scm-manager/ui-tests": "2.43.1", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -67,9 +67,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.43.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.43.1-SNAPSHOT", - "@scm-manager/ui-types": "2.43.1-SNAPSHOT", + "@scm-manager/ui-api": "2.43.1", + "@scm-manager/ui-extensions": "2.43.1", + "@scm-manager/ui-types": "2.43.1", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 6b226d5d2f..93c8ce0cbc 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "private": false, "author": "Sebastian Sdorra ", @@ -17,7 +17,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "2.43.1-SNAPSHOT", + "@scm-manager/ui-types": "2.43.1", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json index 739bac566c..e46adcd98e 100644 --- a/scm-ui/ui-forms/package.json +++ b/scm-ui/ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-forms", "private": false, - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.43.1-SNAPSHOT", + "@scm-manager/ui-styles": "2.43.1", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", @@ -32,7 +32,7 @@ "tsup": "^6.2.3" }, "peerDependencies": { - "@scm-manager/ui-components": "2.43.1-SNAPSHOT", + "@scm-manager/ui-components": "2.43.1", "classnames": "^2.3.1", "react": "17", "react-hook-form": "7", @@ -41,9 +41,9 @@ "styled-components": "5" }, "dependencies": { - "@scm-manager/ui-buttons": "2.43.1-SNAPSHOT", - "@scm-manager/ui-overlays": "2.43.1-SNAPSHOT", - "@scm-manager/ui-api": "2.43.1-SNAPSHOT" + "@scm-manager/ui-buttons": "2.43.1", + "@scm-manager/ui-overlays": "2.43.1", + "@scm-manager/ui-api": "2.43.1" }, "prettier": "@scm-manager/prettier-config", "eslintConfig": { diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index c3b0e9a7c6..db404d69c2 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "private": true, "main": "build/index.js", "module": "build/index.mjs", @@ -12,9 +12,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@scm-manager/ui-api": "2.43.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.43.1-SNAPSHOT", - "@scm-manager/ui-types": "2.43.1-SNAPSHOT", + "@scm-manager/ui-api": "2.43.1", + "@scm-manager/ui-extensions": "2.43.1", + "@scm-manager/ui-types": "2.43.1", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index d9b9e420a2..f28af9829e 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json index 73e7780b02..6b71301097 100644 --- a/scm-ui/ui-overlays/package.json +++ b/scm-ui/ui-overlays/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/ui-overlays", "private": false, - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index.mjs", @@ -16,7 +16,7 @@ "@scm-manager/eslint-config": "^2.16.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-styles": "2.43.1-SNAPSHOT", + "@scm-manager/ui-styles": "2.43.1", "@storybook/addon-actions": "^6.5.10", "@storybook/addon-essentials": "^6.5.10", "@storybook/addon-interactions": "^6.5.10", diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 19c7487ed2..e64bf9cefe 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,15 +1,15 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "2.43.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.43.1-SNAPSHOT", - "@scm-manager/ui-forms": "2.43.1-SNAPSHOT", - "@scm-manager/ui-buttons": "2.43.1-SNAPSHOT", + "@scm-manager/ui-components": "2.43.1", + "@scm-manager/ui-extensions": "2.43.1", + "@scm-manager/ui-forms": "2.43.1", + "@scm-manager/ui-buttons": "2.43.1", "classnames": "^2.2.6", "query-string": "6.14.1", "react": "^17.0.1", @@ -28,9 +28,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "2.43.1-SNAPSHOT", - "@scm-manager/ui-tests": "2.43.1-SNAPSHOT", - "@scm-manager/ui-types": "2.43.1-SNAPSHOT", + "@scm-manager/ui-scripts": "2.43.1", + "@scm-manager/ui-tests": "2.43.1", + "@scm-manager/ui-types": "2.43.1", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 5a4ad05be3..ae2d43786b 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index 28120f7764..6260627bbe 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json index 4988600321..9eab051d98 100644 --- a/scm-ui/ui-shortcuts/package.json +++ b/scm-ui/ui-shortcuts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-shortcuts", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "license": "MIT", "private": true, "main": "build/index.js", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index a47203f81e..002ba5b684 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index d08659db5c..c50fa67b7f 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "private": true, "main": "src/index.ts", "scripts": { @@ -13,7 +13,7 @@ "depcheck": "depcheck" }, "dependencies": { - "@scm-manager/ui-text": "2.43.1-SNAPSHOT", + "@scm-manager/ui-text": "2.43.1", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 0eb071aa68..b3e9ce29db 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index 8c6760077f..2e383bbb05 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "private": true, "main": "build/index.js", "module": "build/index.mjs", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 009e7f1ba8..3f935d8bd4 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "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 e678094450..b8e846bb2a 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,21 +1,21 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.43.1-SNAPSHOT", + "version": "2.43.1", "private": true, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "2.43.1-SNAPSHOT", - "@scm-manager/ui-components": "2.43.1-SNAPSHOT", - "@scm-manager/ui-extensions": "2.43.1-SNAPSHOT", - "@scm-manager/ui-modules": "2.43.1-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "2.43.1-SNAPSHOT", - "@scm-manager/ui-text": "2.43.1-SNAPSHOT", - "@scm-manager/ui-shortcuts": "2.43.1-SNAPSHOT", - "@scm-manager/ui-legacy": "2.43.1-SNAPSHOT", - "@scm-manager/ui-forms": "2.43.1-SNAPSHOT", - "@scm-manager/ui-buttons": "2.43.1-SNAPSHOT", - "@scm-manager/ui-overlays": "2.43.1-SNAPSHOT", - "@scm-manager/ui-layout": "2.43.1-SNAPSHOT", + "@scm-manager/ui-api": "2.43.1", + "@scm-manager/ui-components": "2.43.1", + "@scm-manager/ui-extensions": "2.43.1", + "@scm-manager/ui-modules": "2.43.1", + "@scm-manager/ui-syntaxhighlighting": "2.43.1", + "@scm-manager/ui-text": "2.43.1", + "@scm-manager/ui-shortcuts": "2.43.1", + "@scm-manager/ui-legacy": "2.43.1", + "@scm-manager/ui-forms": "2.43.1", + "@scm-manager/ui-buttons": "2.43.1", + "@scm-manager/ui-overlays": "2.43.1", + "@scm-manager/ui-layout": "2.43.1", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "21", @@ -43,7 +43,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.17.0", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "2.43.1-SNAPSHOT", + "@scm-manager/ui-tests": "2.43.1", "@testing-library/react": "^12.1.5", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3",