diff --git a/CHANGELOG.md b/CHANGELOG.md index e2e3fdc290..97644147c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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). -## Unreleased +## [2.7.0] - 2020-10-12 ### Added - Users can create API keys with limited permissions ([#1359](https://github.com/scm-manager/scm-manager/pull/1359)) diff --git a/lerna.json b/lerna.json index d490e6fcc1..2eb3066367 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } diff --git a/pom.xml b/pom.xml index 23322b99bc..506c11920f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT The easiest way to share your Git, Mercurial and Subversion repositories. @@ -429,7 +429,7 @@ junit junit - 4.13 + 4.13.1 test diff --git a/scm-annotation-processor/pom.xml b/scm-annotation-processor/pom.xml index 3bcfbfb4d5..28702106db 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-annotation-processor - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index 74c29df24d..f48c2dfb58 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-annotations - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 8e39de7e7e..e6b41a4e6c 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,11 +31,11 @@ scm sonia.scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-core - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-core @@ -54,7 +54,7 @@ sonia.scm scm-annotations - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT @@ -227,7 +227,7 @@ sonia.scm scm-annotation-processor - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index 62d4a90eff..25231dc4e7 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-dao-xml - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-dao-xml @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT @@ -58,7 +58,7 @@ sonia.scm scm-test - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index b950f99f51..ff9a7d87f8 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-it war - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-it sonia.scm scm-core - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-test - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm.plugins scm-git-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test sonia.scm.plugins scm-git-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT tests test diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index edd9a41863..6f0657736f 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT deb deb - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT Packaging for Debian/Ubuntu deb @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-packaging/docker/pom.xml b/scm-packaging/docker/pom.xml index 207878fd30..941a5c1516 100644 --- a/scm-packaging/docker/pom.xml +++ b/scm-packaging/docker/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT docker pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-packaging/helm/pom.xml b/scm-packaging/helm/pom.xml index eb227bb684..5ad0cf6fd3 100644 --- a/scm-packaging/helm/pom.xml +++ b/scm-packaging/helm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT helm helm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT 3.2.1 diff --git a/scm-packaging/helm/src/main/chart/Chart.yaml b/scm-packaging/helm/src/main/chart/Chart.yaml index cba31528e7..1b98a56cef 100644 --- a/scm-packaging/helm/src/main/chart/Chart.yaml +++ b/scm-packaging/helm/src/main/chart/Chart.yaml @@ -24,6 +24,30 @@ apiVersion: v1 appVersion: "1.0" -description: A Helm chart for SCM-Manager name: scm-manager version: 0.1.0 +description: The easiest way to share and manage your Git, Mercurial and Subversion repositories + +home: https://scm-manager.org +icon: https://raw.githubusercontent.com/scm-manager/scm-manager/2.7.0/docs/en/logo/scm-manager_logo_img.png + +keywords: +- git +- mercurial +- hg +- subversion +- svn +- plugins +- scm +- vcs + +maintainers: +- name: Sebastian Sdorra + url: https://github.com/sdorra + email: sebastian.sdorra@cloudogu.com +- name: René Pfeuffer + url: https://github.com/pfeuffer + email: rene.pfeuffer@cloudogu.com +- name: Eduard Heimbuch + url: https://github.com/eheimbuch + email: eduard.heimbuch@cloudogu.com diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml index da93203161..300f088af6 100644 --- a/scm-packaging/pom.xml +++ b/scm-packaging/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm.packaging scm-packaging pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT packages.scm-manager.org diff --git a/scm-packaging/release-yaml/pom.xml b/scm-packaging/release-yaml/pom.xml index dbd9fd33c2..27c2731b87 100644 --- a/scm-packaging/release-yaml/pom.xml +++ b/scm-packaging/release-yaml/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT release-yaml pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index 67a3e0fbfa..fee0719a8d 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT rpm rpm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT Packaging for RedHat/Centos/Fedora rpm @@ -52,7 +52,7 @@ sonia.scm scm-server - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-packaging/unix/pom.xml b/scm-packaging/unix/pom.xml index 34ff06cb95..5cd9e36a97 100644 --- a/scm-packaging/unix/pom.xml +++ b/scm-packaging/unix/pom.xml @@ -31,12 +31,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT unix pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-packaging/windows/pom.xml b/scm-packaging/windows/pom.xml index 6f59cfc812..593c17a151 100644 --- a/scm-packaging/windows/pom.xml +++ b/scm-packaging/windows/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT windows pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index a17ecc3218..24e002fc17 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm.plugins scm-plugins pom - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-plugins @@ -60,7 +60,7 @@ sonia.scm scm-core - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT provided @@ -69,7 +69,7 @@ sonia.scm scm-annotation-processor - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT provided @@ -99,7 +99,7 @@ sonia.scm scm-test - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 0a0571bfd0..1e61547668 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -20,6 +20,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.7.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.8.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 3abee3fdbb..d1d18f1329 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-git-plugin diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java index a9ce189250..0e1176e0d3 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java @@ -92,17 +92,17 @@ public class GitHookTagProvider implements HookTagProvider { } private Tag createTagFromNewId(RevWalk revWalk, ReceiveCommand rc, String tag) throws IOException { - final ObjectId newId = rc.getNewId(); + ObjectId newId = rc.getNewId(); return new Tag(tag, getId(unpeelTag(revWalk, newId)), GitUtil.getTagTime(revWalk, newId)); } private Tag createTagFromOldId(RevWalk revWalk, ReceiveCommand rc, String tag) throws IOException { - final ObjectId oldId = rc.getOldId(); + ObjectId oldId = rc.getOldId(); return new Tag(tag, getId(unpeelTag(revWalk, oldId)), GitUtil.getTagTime(revWalk, oldId)); } public ObjectId unpeelTag(RevWalk revWalk, ObjectId oldId) throws IOException { - final RevObject revObject = revWalk.parseAny(oldId); + RevObject revObject = revWalk.parseAny(oldId); if (revObject instanceof RevTag) { return unpeelTag(revWalk, ((RevTag) revObject).getObject()); } else { diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java index 524998ee39..0a1c543ef1 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java @@ -25,6 +25,7 @@ package sonia.scm.repository.api; import com.google.common.collect.Lists; +import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevObject; @@ -49,6 +50,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -78,8 +81,15 @@ public class GitHookTagProviderTest { * Set up mocks for upcoming tests. */ @Before - public void setUpMocks() { + public void setUpMocks() throws IOException { commands = Lists.newArrayList(command); + when(revWalk.parseAny(any(ObjectId.class))).thenAnswer(invocationOnMock -> { + ObjectId objectId = invocationOnMock.getArgument(0); + RevObject revObject = mock(RevObject.class); + String name = objectId.getName(); + when(revObject.name()).thenReturn(name); + return revObject; + }); } /** @@ -95,7 +105,7 @@ public class GitHookTagProviderTest { dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(revision))).thenReturn(timestamp); dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName); - dummy.when(() -> GitUtil.getId(ObjectId.fromString(revision))).thenReturn(revision); + dummy.when(() -> GitUtil.getId(hasObjectId(revision))).thenReturn(revision); GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, ref, revision, ZERO); @@ -117,7 +127,7 @@ public class GitHookTagProviderTest { dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(revision))).thenReturn(timestamp); dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName); - dummy.when(() -> GitUtil.getId(ObjectId.fromString(revision))).thenReturn(revision); + dummy.when(() -> GitUtil.getId(hasObjectId(revision))).thenReturn(revision); GitHookTagProvider provider = createProvider(ReceiveCommand.Type.DELETE, ref, ZERO, revision); @@ -154,8 +164,8 @@ public class GitHookTagProviderTest { dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(oldRevision))).thenReturn(timestamp); dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(newRevision))).thenReturn(null); dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName); - dummy.when(() -> GitUtil.getId(ObjectId.fromString(oldRevision))).thenReturn(oldRevision); - dummy.when(() -> GitUtil.getId(ObjectId.fromString(newRevision))).thenReturn(newRevision); + dummy.when(() -> GitUtil.getId(hasObjectId(oldRevision))).thenReturn(oldRevision); + dummy.when(() -> GitUtil.getId(hasObjectId(newRevision))).thenReturn(newRevision); GitHookTagProvider provider = createProvider(ReceiveCommand.Type.UPDATE, ref, newRevision, oldRevision); @@ -180,8 +190,8 @@ public class GitHookTagProviderTest { dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(newRevision))).thenReturn(timestamp); dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(oldRevision))).thenReturn(null); dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName); - dummy.when(() -> GitUtil.getId(ObjectId.fromString(oldRevision))).thenReturn(oldRevision); - dummy.when(() -> GitUtil.getId(ObjectId.fromString(newRevision))).thenReturn(newRevision); + dummy.when(() -> GitUtil.getId(hasObjectId(oldRevision))).thenReturn(oldRevision); + dummy.when(() -> GitUtil.getId(hasObjectId(newRevision))).thenReturn(newRevision); GitHookTagProvider provider = createProvider(ReceiveCommand.Type.UPDATE, ref, newRevision, oldRevision); @@ -200,16 +210,17 @@ public class GitHookTagProviderTest { String tagName = "1.0.0"; String ref = "refs/tags/" + tagName; - final RevTag mockedTag = mock(RevTag.class); + RevTag mockedTag = mock(RevTag.class); when(revWalk.parseAny(ObjectId.fromString(REVISION_1))).thenReturn(mockedTag); - final RevObject commitForTag = mock(RevObject.class); + RevObject commitForTag = mock(RevObject.class); + when(commitForTag.getName()).thenReturn(revisionOfCommit); when(mockedTag.getObject()).thenReturn(commitForTag); dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(REVISION_1))).thenReturn(timestampOfTag); dummy.when(() -> GitUtil.getTagTime(revWalk, commitForTag)).thenReturn(timestampOfCommit); dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(revisionOfTag))).thenReturn(timestampOfCommit); dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName); - dummy.when(() -> GitUtil.getId(commitForTag)).thenReturn(revisionOfCommit); + dummy.when(() -> GitUtil.getId(hasObjectId(revisionOfCommit))).thenReturn(revisionOfCommit); GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, ref, revisionOfTag, ZERO); @@ -218,6 +229,10 @@ public class GitHookTagProviderTest { } } + public AnyObjectId hasObjectId(String oldRevision) { + return argThat(anyObjectId -> oldRevision.equals(anyObjectId.name())); + } + private void assertTag(String name, String revision, Long date, List tags) { assertNotNull(tags); assertFalse(tags.isEmpty()); diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index fe931887b6..6683453f24 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.7.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.8.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 6382f47313..0a03731bd3 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -31,7 +31,7 @@ sonia.scm.plugins scm-plugins - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-hg-plugin diff --git a/scm-plugins/scm-integration-test-plugin/pom.xml b/scm-plugins/scm-integration-test-plugin/pom.xml index 2042dfc550..755348c9d7 100644 --- a/scm-plugins/scm-integration-test-plugin/pom.xml +++ b/scm-plugins/scm-integration-test-plugin/pom.xml @@ -29,12 +29,12 @@ sonia.scm.plugins scm-plugins - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-integration-test-plugin Add functions for integration tests. This is not intended for production systems. - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT smp diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index e8281149a0..510cdae1a6 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.7.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.8.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index bc22b87467..51c7e718a0 100644 --- a/scm-plugins/scm-legacy-plugin/pom.xml +++ b/scm-plugins/scm-legacy-plugin/pom.xml @@ -29,12 +29,12 @@ sonia.scm.plugins scm-plugins - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT smp diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index b504064f3a..c0b0051b1e 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.7.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.8.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index ad980a90bc..26c16a221c 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index dd88fe4385..5a10a9c098 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-server - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 4595cdd403..0544a10524 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-test - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT diff --git a/scm-ui/babel-preset/package.json b/scm-ui/babel-preset/package.json index 32cfa1ff87..37a15f5131 100644 --- a/scm-ui/babel-preset/package.json +++ b/scm-ui/babel-preset/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/babel-preset", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "description": "Babel configuration for scm-manager and its plugins", "main": "index.js", diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index e62676215e..bc1af44bbd 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/eslint-config/package.json b/scm-ui/eslint-config/package.json index 325add7af8..17cec9c9ee 100644 --- a/scm-ui/eslint-config/package.json +++ b/scm-ui/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/eslint-config", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "ESLint configuration for scm-manager and its plugins", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/jest-preset/package.json b/scm-ui/jest-preset/package.json index fedb039c94..6f8c5d71fc 100644 --- a/scm-ui/jest-preset/package.json +++ b/scm-ui/jest-preset/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/jest-preset", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "Jest presets for SCM-Manager and its plugins", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index bf3b242f11..fce99381c3 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-ui war - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-ui diff --git a/scm-ui/prettier-config/package.json b/scm-ui/prettier-config/package.json index e453ffecac..27c6e63597 100644 --- a/scm-ui/prettier-config/package.json +++ b/scm-ui/prettier-config/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/prettier-config", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "description": "Prettier configuration", "author": "Sebastian Sdorra ", diff --git a/scm-ui/tsconfig/package.json b/scm-ui/tsconfig/package.json index 86ea206b9a..7801717520 100644 --- a/scm-ui/tsconfig/package.json +++ b/scm-ui/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/tsconfig", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "description": "TypeScript configuration", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 95058b976f..cc0773fff1 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -18,7 +18,7 @@ "update-storyshots": "jest --testPathPattern=\"storyshots.test.ts\" --collectCoverage=false -u" }, "devDependencies": { - "@scm-manager/ui-tests": "^2.7.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.8.0-SNAPSHOT", "@storybook/addon-actions": "^5.2.3", "@storybook/addon-storyshots": "^5.2.3", "@storybook/react": "^5.2.3", @@ -47,8 +47,8 @@ "worker-plugin": "^3.2.0" }, "dependencies": { - "@scm-manager/ui-extensions": "^2.7.0-SNAPSHOT", - "@scm-manager/ui-types": "^2.7.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.8.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.8.0-SNAPSHOT", "classnames": "^2.2.6", "date-fns": "^2.4.1", "gitdiff-parser": "^0.1.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 9b826bc4e1..049d153b07 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "main": "src/index.ts", "license": "MIT", "private": false, diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index e9a259ad72..6bd7d2a93a 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,13 +1,13 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "^2.7.0-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.7.0-SNAPSHOT", + "@scm-manager/ui-components": "^2.8.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.8.0-SNAPSHOT", "classnames": "^2.2.6", "query-string": "^5.0.1", "react": "^16.10.2", @@ -18,14 +18,14 @@ "styled-components": "^5.1.0" }, "devDependencies": { - "@scm-manager/babel-preset": "^2.7.0-SNAPSHOT", - "@scm-manager/eslint-config": "^2.7.0-SNAPSHOT", - "@scm-manager/jest-preset": "^2.7.0-SNAPSHOT", - "@scm-manager/prettier-config": "^2.7.0-SNAPSHOT", - "@scm-manager/tsconfig": "^2.7.0-SNAPSHOT", - "@scm-manager/ui-scripts": "^2.7.0-SNAPSHOT", - "@scm-manager/ui-tests": "^2.7.0-SNAPSHOT", - "@scm-manager/ui-types": "^2.7.0-SNAPSHOT", + "@scm-manager/babel-preset": "^2.8.0-SNAPSHOT", + "@scm-manager/eslint-config": "^2.8.0-SNAPSHOT", + "@scm-manager/jest-preset": "^2.8.0-SNAPSHOT", + "@scm-manager/prettier-config": "^2.8.0-SNAPSHOT", + "@scm-manager/tsconfig": "^2.8.0-SNAPSHOT", + "@scm-manager/ui-scripts": "^2.8.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.8.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.8.0-SNAPSHOT", "@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 19f18bc7e8..bed6f43cb2 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "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 9d5b6b82c6..bbd3caac00 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 9cfef11c10..73a148dbe6 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 3e372e9308..0c8f3d3aae 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 93414a6d4f..9ffb7f4251 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.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "description": "Flow 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 2843feabff..1d5a332dc6 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,10 +1,10 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.7.0-SNAPSHOT", + "version": "2.8.0-SNAPSHOT", "private": true, "dependencies": { - "@scm-manager/ui-components": "^2.7.0-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.7.0-SNAPSHOT", + "@scm-manager/ui-components": "^2.8.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.8.0-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "^19.6.0", @@ -29,7 +29,7 @@ "test": "jest" }, "devDependencies": { - "@scm-manager/ui-tests": "^2.7.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.8.0-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-webapp/public/locales/de/admin.json b/scm-ui/ui-webapp/public/locales/de/admin.json index 6f8de6c7df..0501aa612d 100644 --- a/scm-ui/ui-webapp/public/locales/de/admin.json +++ b/scm-ui/ui-webapp/public/locales/de/admin.json @@ -38,8 +38,8 @@ }, "showPending": "Änderungen anzeigen", "executePending": "Änderungen ausführen", - "outdatedPlugins": "{{count}} veraltetes Plugin", - "outdatedPlugins_plural": "{{count}} veraltete Plugins", + "outdatedPlugins": "{{count}} Plugin aktualisieren", + "outdatedPlugins_plural": "{{count}} Plugins aktualisieren", "updateAll": "Alle Plugins aktualisieren", "cancelPending": "Änderungen abbrechen", "noPlugins": "Keine Plugins gefunden.", diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json index 535a03c4de..a1303555f4 100644 --- a/scm-ui/ui-webapp/public/locales/de/repos.json +++ b/scm-ui/ui-webapp/public/locales/de/repos.json @@ -139,7 +139,7 @@ "subtitle": "Repository bearbeiten", "submit": "Speichern", "initializeRepository": "Repository initiieren", - "dangerZone": "Gefahrenzone" + "dangerZone": "Umbenennen und Löschen" }, "sources": { "fileTree": { @@ -224,8 +224,8 @@ }, "deleteRepo": { "button": "Repository löschen", - "subtitle": "Löscht dieses Repository", - "description": "Diese Aktion kann nicht rückgangig gemacht werden.", + "subtitle": "Repository löschen", + "description": "Gelöschte Repositories können nicht wieder hergestellt werden.", "confirmAlert": { "title": "Repository löschen", "message": "Soll das Repository wirklich gelöscht werden?", @@ -235,9 +235,9 @@ }, "renameRepo": { "button": "Repository umbenennen", - "subtitle": "Benennt dieses Repository um", - "description1": "Es werden keine Weiterleitung auf den neuen Namen eingerichtet.", - "description2": "Berechtigungen aus dem Namespace werden bei einem Wechsel nicht übernommen.", + "subtitle": "Repository umbenennen", + "description1": "Das Repository kann nur über den neuen Namen erreicht werden.", + "description2": "Berechtigungen aus dem Namespace müssen erneut vergeben werden.", "modal": { "title": "Repository umbenennen", "label": { diff --git a/scm-ui/ui-webapp/public/locales/en/admin.json b/scm-ui/ui-webapp/public/locales/en/admin.json index ae404117fe..dfce59e70a 100644 --- a/scm-ui/ui-webapp/public/locales/en/admin.json +++ b/scm-ui/ui-webapp/public/locales/en/admin.json @@ -38,8 +38,8 @@ }, "showPending": "Show changes", "executePending": "Execute changes", - "outdatedPlugins": "{{count}} outdated plugin", - "outdatedPlugins_plural": "{{count}} outdated plugins", + "outdatedPlugins": "Update {{count}} plugin", + "outdatedPlugins_plural": "Update {{count}} plugins", "updateAll": "Update all plugins", "cancelPending": "Cancel changes", "noPlugins": "No plugins found.", diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json index aacc11f1f9..bbc21d3cad 100644 --- a/scm-ui/ui-webapp/public/locales/en/repos.json +++ b/scm-ui/ui-webapp/public/locales/en/repos.json @@ -139,7 +139,7 @@ "subtitle": "Edit Repository", "submit": "Save", "initializeRepository": "Initialize repository", - "dangerZone": "Danger Zone" + "dangerZone": "Rename and delete" }, "sources": { "fileTree": { @@ -224,8 +224,8 @@ }, "deleteRepo": { "button": "Delete Repository", - "subtitle": "Deletes this repository", - "description": "Once a repository was deleted, this cannot be undone. Please be careful with this action.", + "subtitle": "Delete repository", + "description": "Deleted repositories can not be restored.", "confirmAlert": { "title": "Delete repository", "message": "Do you really want to delete the repository?", @@ -236,8 +236,8 @@ "renameRepo": { "button": "Rename Repository", "subtitle": "Renames this repository", - "description1": "There will be no redirects to the renamed repository.", - "description2": "Permissions from the namespace will not be adapted when the namespace is changed.", + "description1": "The repository can only be accessed by its new name.", + "description2": "Namespace Permissions must be set again if the namespace is changed.", "modal": { "title": "Rename repository", "label": { diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index e9e4244636..f30c2cdb99 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-webapp war - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT sonia.scm scm-dao-xml - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT @@ -343,7 +343,7 @@ sonia.scm scm-test - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test @@ -405,7 +405,7 @@ sonia.scm.plugins scm-git-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT tests test @@ -413,14 +413,14 @@ sonia.scm.plugins scm-git-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT tests test @@ -428,14 +428,14 @@ sonia.scm.plugins scm-hg-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT tests test @@ -443,7 +443,7 @@ sonia.scm.plugins scm-svn-plugin - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT test @@ -729,7 +729,7 @@ sonia.scm scm-ui - 2.7.0-SNAPSHOT + 2.8.0-SNAPSHOT war