Merge branch 'develop' of github.com:scm-manager/scm-manager into feature/syntax-highlighting

This commit is contained in:
Konstantin Schaper
2020-10-14 09:08:48 +02:00
52 changed files with 184 additions and 145 deletions

View File

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

View File

@@ -5,5 +5,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "2.7.0-SNAPSHOT"
"version": "2.8.0-SNAPSHOT"
}

View File

@@ -32,7 +32,7 @@
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<description>
The easiest way to share your Git, Mercurial
and Subversion repositories.
@@ -429,7 +429,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

View File

@@ -31,12 +31,12 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm</groupId>
<artifactId>scm-annotation-processor</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-annotation-processor</name>
<dependencies>
@@ -46,7 +46,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-annotations</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<!-- rest api -->

View File

@@ -31,11 +31,11 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-annotations</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-annotations</name>
<dependencies>

View File

@@ -31,11 +31,11 @@
<parent>
<artifactId>scm</artifactId>
<groupId>sonia.scm</groupId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-core</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-core</name>
<dependencies>
@@ -54,7 +54,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-annotations</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -227,7 +227,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-annotation-processor</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

View File

@@ -31,11 +31,11 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-dao-xml</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-dao-xml</name>
<dependencies>
@@ -50,7 +50,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<!-- test -->
@@ -58,7 +58,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

View File

@@ -31,40 +31,40 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm</groupId>
<artifactId>scm-it</artifactId>
<!-- we need type war, because the jetty plugin does not work with jar or pom -->
<packaging>war</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-it</name>
<dependencies>
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-git-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-git-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -72,14 +72,14 @@
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-hg-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-hg-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -87,14 +87,14 @@
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

View File

@@ -32,12 +32,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>deb</artifactId>
<packaging>deb</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<description>Packaging for Debian/Ubuntu</description>
<name>deb</name>
@@ -46,7 +46,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-server</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@@ -32,12 +32,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>docker</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<dependencies>

View File

@@ -32,12 +32,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>helm</artifactId>
<packaging>helm</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<properties>
<helm.version>3.2.1</helm.version>

View File

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

View File

@@ -31,13 +31,13 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<properties>
<deployment.serverId>packages.scm-manager.org</deployment.serverId>

View File

@@ -32,12 +32,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>release-yaml</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<build>
<plugins>

View File

@@ -32,12 +32,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>rpm</artifactId>
<packaging>rpm</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<description>Packaging for RedHat/Centos/Fedora</description>
<name>rpm</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-server</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@@ -31,12 +31,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>unix</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<dependencies>

View File

@@ -32,12 +32,12 @@
<parent>
<groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>windows</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<dependencies>

View File

@@ -31,13 +31,13 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-plugins</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-plugins</name>
<modules>
@@ -60,7 +60,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-annotation-processor</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -99,7 +99,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

View File

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

View File

@@ -31,7 +31,7 @@
<parent>
<artifactId>scm-plugins</artifactId>
<groupId>sonia.scm.plugins</groupId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-git-plugin</artifactId>

View File

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

View File

@@ -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<Tag> tags) {
assertNotNull(tags);
assertFalse(tags.isEmpty());

View File

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

View File

@@ -31,7 +31,7 @@
<parent>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-plugins</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-hg-plugin</artifactId>

View File

@@ -29,12 +29,12 @@
<parent>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-plugins</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-integration-test-plugin</artifactId>
<description>Add functions for integration tests. This is not intended for production systems.</description>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<packaging>smp</packaging>
<dependencies>

View File

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

View File

@@ -29,12 +29,12 @@
<parent>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-plugins</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-legacy-plugin</artifactId>
<description>Support migrated repository urls and v1 passwords</description>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<packaging>smp</packaging>
<dependencies>

View File

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

View File

@@ -31,7 +31,7 @@
<parent>
<artifactId>scm-plugins</artifactId>
<groupId>sonia.scm.plugins</groupId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<artifactId>scm-svn-plugin</artifactId>

View File

@@ -31,12 +31,12 @@
<parent>
<artifactId>scm</artifactId>
<groupId>sonia.scm</groupId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm</groupId>
<artifactId>scm-server</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-server</name>
<packaging>jar</packaging>

View File

@@ -31,12 +31,12 @@
<parent>
<artifactId>scm</artifactId>
<groupId>sonia.scm</groupId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-test</name>
<dependencies>
@@ -50,7 +50,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<dependency>

View File

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

View File

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

View File

@@ -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 <s.sdorra@gmail.com>",

View File

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

View File

@@ -32,13 +32,13 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm</groupId>
<artifactId>scm-ui</artifactId>
<packaging>war</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-ui</name>
<properties>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -32,13 +32,13 @@
<parent>
<groupId>sonia.scm</groupId>
<artifactId>scm</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</parent>
<groupId>sonia.scm</groupId>
<artifactId>scm-webapp</artifactId>
<packaging>war</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<name>scm-webapp</name>
<dependencies>
@@ -48,7 +48,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-annotation-processor</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -73,13 +73,13 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-dao-xml</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
</dependency>
<!-- security -->
@@ -343,7 +343,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -405,7 +405,7 @@
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-git-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -413,14 +413,14 @@
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-git-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-hg-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -428,14 +428,14 @@
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-hg-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -443,7 +443,7 @@
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -729,7 +729,7 @@
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-ui</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<type>war</type>
</dependency>