Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

update CHANGELOG.md

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-07-06 16:20:01 +02:00
parent 0b90367dab 4279573633
commit 46ffdcb5e2
41 changed files with 144 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CHANGELOG.md
View File

@@ -4,17 +4,21 @@ 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/), 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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased ## Unreleased
### Added ### Added
- Add branch link provider to access branch links in plugins [#1243](https://github.com/scm-manager/scm-manager/pull/1243)
## [2.2.0] - 2020-07-03
### Added
- Rename repository name (and namespace if permitted) ([#1218](https://github.com/scm-manager/scm-manager/pull/1218)) - Rename repository name (and namespace if permitted) ([#1218](https://github.com/scm-manager/scm-manager/pull/1218))
- enrich commit mentions in markdown viewer by internal links ([#1210](https://github.com/scm-manager/scm-manager/pull/1210)) - Enrich commit mentions in markdown viewer by internal links ([#1210](https://github.com/scm-manager/scm-manager/pull/1210))
- New extension point `changeset.description.tokens` to "enrich" commit messages ([#1231](https://github.com/scm-manager/scm-manager/pull/1231)) - New extension point `changeset.description.tokens` to "enrich" commit messages ([#1231](https://github.com/scm-manager/scm-manager/pull/1231))
- restart service after rpm or deb package upgrade - Restart service after rpm or deb package upgrade
### Changed ### Changed
- Checkboxes can now be 'indeterminate' ([#1215](https://github.com/scm-manager/scm-manager/pull/1215)) - Checkboxes can now be 'indeterminate' ([#1215](https://github.com/scm-manager/scm-manager/pull/1215))
- The old frontend extension point `changeset.description` is deprecated and should be replaced with `changeset.description.tokens` ([#1231](https://github.com/scm-manager/scm-manager/pull/1231)) - The old frontend extension point `changeset.description` is deprecated and should be replaced with `changeset.description.tokens` ([#1231](https://github.com/scm-manager/scm-manager/pull/1231))
- Required plugins will be updated, too, when a plugin is updated ([#1233](https://github.com/scm-manager/scm-manager/pull/1233))
### Fixed ### Fixed
- Fixed installation of debian packages on distros without preinstalled `at` ([#1216](https://github.com/scm-manager/scm-manager/issues/1216) and [#1217](https://github.com/scm-manager/scm-manager/pull/1217)) - Fixed installation of debian packages on distros without preinstalled `at` ([#1216](https://github.com/scm-manager/scm-manager/issues/1216) and [#1217](https://github.com/scm-manager/scm-manager/pull/1217))
@@ -23,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added missing architecture to debian installation documentation ([#1230](https://github.com/scm-manager/scm-manager/pull/1230)) - Added missing architecture to debian installation documentation ([#1230](https://github.com/scm-manager/scm-manager/pull/1230))
- Mercurial on Python 3 ([#1232](https://github.com/scm-manager/scm-manager/pull/1232)) - Mercurial on Python 3 ([#1232](https://github.com/scm-manager/scm-manager/pull/1232))
- Fixed wrong package information for deb and rpm packages ([#1229](https://github.com/scm-manager/scm-manager/pull/1229)) - Fixed wrong package information for deb and rpm packages ([#1229](https://github.com/scm-manager/scm-manager/pull/1229))
- Fixed missing content type on migration wizard ([#1234](https://github.com/scm-manager/scm-manager/pull/1234))
## [2.1.1] - 2020-06-23 ## [2.1.1] - 2020-06-23
### Fixed ### Fixed
@@ -210,12 +215,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Cache and x-requested-with header to bundle requests - Cache and x-requested-with header to bundle requests
- remove public flag from repository and migrate permissions to anonymous user - remove public flag from repository and migrate permissions to anonymous user
[2.0.0-rc1]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc1 [2.0.0-rc1]: https://www.scm-manager.org/download/2.0.0-rc1
[2.0.0-rc2]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc2 [2.0.0-rc2]: https://www.scm-manager.org/download/2.0.0-rc2
[2.0.0-rc3]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc3 [2.0.0-rc3]: https://www.scm-manager.org/download/2.0.0-rc3
[2.0.0-rc4]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc4 [2.0.0-rc4]: https://www.scm-manager.org/download/2.0.0-rc4
[2.0.0-rc5]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc5 [2.0.0-rc5]: https://www.scm-manager.org/download/2.0.0-rc5
[2.0.0-rc6]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc6 [2.0.0-rc6]: https://www.scm-manager.org/download/2.0.0-rc6
[2.0.0-rc7]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc7 [2.0.0-rc7]: https://www.scm-manager.org/download/2.0.0-rc7
[2.0.0-rc8]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0-rc8 [2.0.0-rc8]: https://www.scm-manager.org/download/2.0.0-rc8
[2.0.0]: https://github.com/scm-manager/scm-manager/releases/tag/2.0.0 [2.0.0]: https://www.scm-manager.org/download/2.0.0
[2.1.0]: https://www.scm-manager.org/download/2.1.0
[2.1.1]: https://www.scm-manager.org/download/2.1.1
[2.2.0]: https://www.scm-manager.org/download/2.2.0

2
lerna.json
View File

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

2
pom.xml
View File

@@ -32,7 +32,7 @@
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm</artifactId> <artifactId>scm</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<description> <description>
The easiest way to share your Git, Mercurial The easiest way to share your Git, Mercurial
and Subversion repositories. and Subversion repositories.

6
scm-annotation-processor/pom.xml
View File

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

4
scm-annotations/pom.xml
View File

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

8
scm-core/pom.xml
View File

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

8
scm-dao-xml/pom.xml
View File

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

20
scm-it/pom.xml
View File

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

8
scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
package sonia.scm.it; package sonia.scm.it;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -44,9 +44,7 @@ import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.Objects; import java.util.Objects;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static sonia.scm.it.utils.RegExMatcher.matchesPattern; import static sonia.scm.it.utils.RegExMatcher.matchesPattern;
import static sonia.scm.it.utils.RestUtil.createResourceUrl; import static sonia.scm.it.utils.RestUtil.createResourceUrl;
@@ -91,7 +89,7 @@ public class RepositoriesITCase {
.body( .body(
"name", equalTo("HeartOfGold-" + repositoryType), "name", equalTo("HeartOfGold-" + repositoryType),
"type", equalTo(repositoryType), "type", equalTo(repositoryType),
"creationDate", matchesPattern("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+Z"), "creationDate", matchesPattern("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?Z"),
"lastModified", is(nullValue()), "lastModified", is(nullValue()),
"_links.self.href", equalTo(repositoryUrl) "_links.self.href", equalTo(repositoryUrl)
); );

6
scm-packaging/deb/pom.xml
View File

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

4
scm-packaging/docker/pom.xml
View File

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

4
scm-packaging/helm/pom.xml
View File

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

4
scm-packaging/pom.xml
View File

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

4
scm-packaging/release-yaml/pom.xml
View File

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

6
scm-packaging/rpm/pom.xml
View File

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

4
scm-packaging/unix/pom.xml
View File

@@ -32,12 +32,12 @@
<parent> <parent>
<groupId>sonia.scm.packaging</groupId> <groupId>sonia.scm.packaging</groupId>
<artifactId>scm-packaging</artifactId> <artifactId>scm-packaging</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>unix</artifactId> <artifactId>unix</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<dependencies> <dependencies>

4
scm-packaging/windows/pom.xml
View File

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

10
scm-plugins/pom.xml
View File

@@ -31,13 +31,13 @@
<parent> <parent>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm</artifactId> <artifactId>scm</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-plugins</artifactId> <artifactId>scm-plugins</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<name>scm-plugins</name> <name>scm-plugins</name>
<modules> <modules>
@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId> <artifactId>scm-core</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -68,7 +68,7 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-annotation-processor</artifactId> <artifactId>scm-annotation-processor</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -98,7 +98,7 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId> <artifactId>scm-test</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

4
scm-plugins/scm-git-plugin/package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "@scm-manager/scm-git-plugin", "name": "@scm-manager/scm-git-plugin",
"private": true, "private": true,
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"license": "MIT", "license": "MIT",
"main": "./src/main/js/index.ts", "main": "./src/main/js/index.ts",
"scripts": { "scripts": {
@@ -20,6 +20,6 @@
}, },
"prettier": "@scm-manager/prettier-config", "prettier": "@scm-manager/prettier-config",
"dependencies": { "dependencies": {
"@scm-manager/ui-plugins": "^2.2.0-SNAPSHOT" "@scm-manager/ui-plugins": "^2.2.0"
} }
} }

2
scm-plugins/scm-git-plugin/pom.xml
View File

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

4
scm-plugins/scm-hg-plugin/package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "@scm-manager/scm-hg-plugin", "name": "@scm-manager/scm-hg-plugin",
"private": true, "private": true,
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"license": "MIT", "license": "MIT",
"main": "./src/main/js/index.ts", "main": "./src/main/js/index.ts",
"scripts": { "scripts": {
@@ -19,6 +19,6 @@
}, },
"prettier": "@scm-manager/prettier-config", "prettier": "@scm-manager/prettier-config",
"dependencies": { "dependencies": {
"@scm-manager/ui-plugins": "^2.2.0-SNAPSHOT" "@scm-manager/ui-plugins": "^2.2.0"
} }
} }

2
scm-plugins/scm-hg-plugin/pom.xml
View File

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

4
scm-plugins/scm-legacy-plugin/package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "@scm-manager/scm-legacy-plugin", "name": "@scm-manager/scm-legacy-plugin",
"private": true, "private": true,
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"license": "MIT", "license": "MIT",
"main": "./src/main/js/index.tsx", "main": "./src/main/js/index.tsx",
"scripts": { "scripts": {
@@ -19,6 +19,6 @@
}, },
"prettier": "@scm-manager/prettier-config", "prettier": "@scm-manager/prettier-config",
"dependencies": { "dependencies": {
"@scm-manager/ui-plugins": "^2.2.0-SNAPSHOT" "@scm-manager/ui-plugins": "^2.2.0"
} }
} }

4
scm-plugins/scm-legacy-plugin/pom.xml
View File

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

4
scm-plugins/scm-svn-plugin/package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "@scm-manager/scm-svn-plugin", "name": "@scm-manager/scm-svn-plugin",
"private": true, "private": true,
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"license": "MIT", "license": "MIT",
"main": "./src/main/js/index.ts", "main": "./src/main/js/index.ts",
"scripts": { "scripts": {
@@ -19,6 +19,6 @@
}, },
"prettier": "@scm-manager/prettier-config", "prettier": "@scm-manager/prettier-config",
"dependencies": { "dependencies": {
"@scm-manager/ui-plugins": "^2.2.0-SNAPSHOT" "@scm-manager/ui-plugins": "^2.2.0"
} }
} }

2
scm-plugins/scm-svn-plugin/pom.xml
View File

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

4
scm-server/pom.xml
View File

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

6
scm-test/pom.xml
View File

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

4
scm-ui/pom.xml
View File

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

2
scm-ui/ui-components/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@scm-manager/ui-components", "name": "@scm-manager/ui-components",
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"description": "UI Components for SCM-Manager and its plugins", "description": "UI Components for SCM-Manager and its plugins",
"main": "src/index.ts", "main": "src/index.ts",
"files": [ "files": [

4
scm-ui/ui-plugins/package.json
View File

@@ -1,12 +1,12 @@
{ {
"name": "@scm-manager/ui-plugins", "name": "@scm-manager/ui-plugins",
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"license": "MIT", "license": "MIT",
"bin": { "bin": {
"ui-plugins": "./bin/ui-plugins.js" "ui-plugins": "./bin/ui-plugins.js"
}, },
"dependencies": { "dependencies": {
"@scm-manager/ui-components": "^2.2.0-SNAPSHOT", "@scm-manager/ui-components": "^2.2.0",
"@scm-manager/ui-extensions": "^2.1.0", "@scm-manager/ui-extensions": "^2.1.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"query-string": "^5.0.1", "query-string": "^5.0.1",

4
scm-ui/ui-webapp/package.json
View File

@@ -1,9 +1,9 @@
{ {
"name": "@scm-manager/ui-webapp", "name": "@scm-manager/ui-webapp",
"version": "2.2.0-SNAPSHOT", "version": "2.2.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@scm-manager/ui-components": "^2.2.0-SNAPSHOT", "@scm-manager/ui-components": "^2.2.0",
"@scm-manager/ui-extensions": "^2.1.0", "@scm-manager/ui-extensions": "^2.1.0",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"history": "^4.10.1", "history": "^4.10.1",

2
scm-ui/ui-webapp/public/locales/de/admin.json
View File

@@ -61,7 +61,7 @@
"version": "Version", "version": "Version",
"currentVersion": "Installierte Version", "currentVersion": "Installierte Version",
"newVersion": "Neue Version", "newVersion": "Neue Version",
"dependencyNotification": "Mit diesem Plugin werden folgende Abhängigkeiten mit installiert, wenn sie noch nicht vorhanden sind!", "dependencyNotification": "Mit diesem Plugin werden folgende Abhängigkeiten mit installiert bzw. aktualisiert, wenn sie noch nicht in der aktuellen Version vorhanden sind!",
"dependencies": "Abhängigkeiten", "dependencies": "Abhängigkeiten",
"installedNotification": "Das Plugin wurde erfolgreich installiert. Um Änderungen an der UI zu sehen, muss die Seite neu geladen werden:", "installedNotification": "Das Plugin wurde erfolgreich installiert. Um Änderungen an der UI zu sehen, muss die Seite neu geladen werden:",
"updatedNotification": "Das Plugin wurde erfolgreich aktualisiert. Um Änderungen an der UI zu sehen, muss die Seite neu geladen werden:", "updatedNotification": "Das Plugin wurde erfolgreich aktualisiert. Um Änderungen an der UI zu sehen, muss die Seite neu geladen werden:",

2
scm-ui/ui-webapp/public/locales/en/admin.json
View File

@@ -61,7 +61,7 @@
"version": "Version", "version": "Version",
"currentVersion": "Installed version", "currentVersion": "Installed version",
"newVersion": "New version", "newVersion": "New version",
"dependencyNotification": "With this plugin, the following dependencies will be installed if they are not available yet!", "dependencyNotification": "With this plugin, the following dependencies will be installed/updated if their latest versions are not installed yet!",
"dependencies": "Dependencies", "dependencies": "Dependencies",
"installedNotification": "Successfully installed plugin. You have to reload the page, to see ui changes:", "installedNotification": "Successfully installed plugin. You have to reload the page, to see ui changes:",
"updatedNotification": "Successfully updated plugin. You have to reload the page, to see ui changes:", "updatedNotification": "Successfully updated plugin. You have to reload the page, to see ui changes:",

26
scm-webapp/pom.xml
View File

@@ -32,13 +32,13 @@
<parent> <parent>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm</artifactId> <artifactId>scm</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-webapp</artifactId> <artifactId>scm-webapp</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<name>scm-webapp</name> <name>scm-webapp</name>
<dependencies> <dependencies>
@@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-annotation-processor</artifactId> <artifactId>scm-annotation-processor</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -73,13 +73,13 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId> <artifactId>scm-core</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-dao-xml</artifactId> <artifactId>scm-dao-xml</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- security --> <!-- security -->
@@ -332,7 +332,7 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-test</artifactId> <artifactId>scm-test</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -394,7 +394,7 @@
<dependency> <dependency>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-git-plugin</artifactId> <artifactId>scm-git-plugin</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -402,14 +402,14 @@
<dependency> <dependency>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-git-plugin</artifactId> <artifactId>scm-git-plugin</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-hg-plugin</artifactId> <artifactId>scm-hg-plugin</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -417,14 +417,14 @@
<dependency> <dependency>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-hg-plugin</artifactId> <artifactId>scm-hg-plugin</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId> <artifactId>scm-svn-plugin</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -432,7 +432,7 @@
<dependency> <dependency>
<groupId>sonia.scm.plugins</groupId> <groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId> <artifactId>scm-svn-plugin</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -718,7 +718,7 @@
<dependency> <dependency>
<groupId>sonia.scm</groupId> <groupId>sonia.scm</groupId>
<artifactId>scm-ui</artifactId> <artifactId>scm-ui</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<type>war</type> <type>war</type>
</dependency> </dependency>

8
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -247,18 +247,18 @@ public class DefaultPluginManager implements PluginManager {
private List<AvailablePlugin> collectPluginsToInstall(String name) { private List<AvailablePlugin> collectPluginsToInstall(String name) {
List<AvailablePlugin> plugins = new ArrayList<>(); List<AvailablePlugin> plugins = new ArrayList<>();
collectPluginsToInstall(plugins, name, true); collectPluginsToInstallOrUpdate(plugins, name);
return plugins; return plugins;
} }
private void collectPluginsToInstall(List<AvailablePlugin> plugins, String name, boolean isUpdate) { private void collectPluginsToInstallOrUpdate(List<AvailablePlugin> plugins, String name) {
if (!isInstalledOrPending(name) || isUpdate && isUpdatable(name)) { if (!isInstalledOrPending(name) || isUpdatable(name)) {
AvailablePlugin plugin = getAvailable(name).orElseThrow(() -> NotFoundException.notFound(entity(AvailablePlugin.class, name))); AvailablePlugin plugin = getAvailable(name).orElseThrow(() -> NotFoundException.notFound(entity(AvailablePlugin.class, name)));
Set<String> dependencies = plugin.getDescriptor().getDependencies(); Set<String> dependencies = plugin.getDescriptor().getDependencies();
if (dependencies != null) { if (dependencies != null) {
for (String dependency : dependencies) { for (String dependency : dependencies) {
collectPluginsToInstall(plugins, dependency, false); collectPluginsToInstallOrUpdate(plugins, dependency);
} }
} }

5
scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
View File

@@ -34,8 +34,6 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext; import org.apache.shiro.util.ThreadContext;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.event.ScmEventBus;
import sonia.scm.lifecycle.RestartEvent;
import sonia.scm.lifecycle.Restarter; import sonia.scm.lifecycle.Restarter;
import sonia.scm.update.repository.DefaultMigrationStrategyDAO; import sonia.scm.update.repository.DefaultMigrationStrategyDAO;
import sonia.scm.update.repository.MigrationStrategy; import sonia.scm.update.repository.MigrationStrategy;
@@ -173,6 +171,9 @@ class MigrationWizardServlet extends HttpServlet {
MustacheFactory mf = new DefaultMustacheFactory(); MustacheFactory mf = new DefaultMustacheFactory();
Mustache template = mf.compile(templateName); Mustache template = mf.compile(templateName);
resp.setContentType("text/html");
resp.setCharacterEncoding("UTF-8");
PrintWriter writer; PrintWriter writer;
try { try {
writer = resp.getWriter(); writer = resp.getWriter();

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/DefaultBranchLinkProviderTest.java
View File

@@ -36,8 +36,6 @@ import sonia.scm.repository.RepositoryTestData;
import java.net.URI; import java.net.URI;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexResourceTest.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
package sonia.scm.api.v2.resources; package sonia.scm.api.v2.resources;
import com.github.sdorra.shiro.ShiroRule; import com.github.sdorra.shiro.ShiroRule;
@@ -166,7 +166,7 @@ public class IndexResourceTest {
Assertions.assertThat(index.getLinks().getLinksBy("autocomplete")) Assertions.assertThat(index.getLinks().getLinksBy("autocomplete"))
.extracting("name") .extracting("name")
.doesNotContainSequence("users", "groups"); .isEmpty();
} }
@Test @Test

18
scm-webapp/src/test/java/sonia/scm/plugin/DefaultPluginManagerTest.java
View File

@@ -227,7 +227,7 @@ class DefaultPluginManagerTest {
} }
@Test @Test
void shouldNotInstallAlreadyInstalledDependencies() { void shouldNotInstallAlreadyInstalledDependenciesWhenUpToDate() {
AvailablePlugin review = createAvailable("scm-review-plugin"); AvailablePlugin review = createAvailable("scm-review-plugin");
when(review.getDescriptor().getDependencies()).thenReturn(ImmutableSet.of("scm-mail-plugin")); when(review.getDescriptor().getDependencies()).thenReturn(ImmutableSet.of("scm-mail-plugin"));
AvailablePlugin mail = createAvailable("scm-mail-plugin"); AvailablePlugin mail = createAvailable("scm-mail-plugin");
@@ -244,6 +244,22 @@ class DefaultPluginManagerTest {
assertThat(captor.getValue().getDescriptor().getInformation().getName()).isEqualTo("scm-review-plugin"); assertThat(captor.getValue().getDescriptor().getInformation().getName()).isEqualTo("scm-review-plugin");
} }
@Test
void shouldUpdateAlreadyInstalledDependenciesWhenNewerVersionIsAvailable() {
AvailablePlugin review = createAvailable("scm-review-plugin");
when(review.getDescriptor().getDependencies()).thenReturn(ImmutableSet.of("scm-mail-plugin"));
AvailablePlugin mail = createAvailable("scm-mail-plugin", "1.1.0");
when(center.getAvailable()).thenReturn(ImmutableSet.of(review, mail));
InstalledPlugin installedMail = createInstalled("scm-mail-plugin", "1.0.0");
when(loader.getInstalledPlugins()).thenReturn(ImmutableList.of(installedMail));
manager.install("scm-review-plugin", false);
verify(installer).install(mail);
verify(installer).install(review);
}
@Test @Test
void shouldRollbackOnFailedInstallation() { void shouldRollbackOnFailedInstallation() {
AvailablePlugin review = createAvailable("scm-review-plugin"); AvailablePlugin review = createAvailable("scm-review-plugin");

13
scm-webapp/src/test/java/sonia/scm/plugin/PluginTestHelper.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
package sonia.scm.plugin; package sonia.scm.plugin;
import org.mockito.Answers; import org.mockito.Answers;
@@ -32,10 +32,7 @@ import static org.mockito.Mockito.when;
public class PluginTestHelper { public class PluginTestHelper {
public static AvailablePlugin createAvailable(String name) { public static AvailablePlugin createAvailable(String name) {
PluginInformation information = new PluginInformation(); return createAvailable(name, "1.0");
information.setName(name);
information.setVersion("1.0");
return createAvailable(information);
} }
public static AvailablePlugin createAvailable(String name, String version) { public static AvailablePlugin createAvailable(String name, String version) {
@@ -46,9 +43,13 @@ public class PluginTestHelper {
} }
public static InstalledPlugin createInstalled(String name) { public static InstalledPlugin createInstalled(String name) {
return createInstalled(name, "1.0");
}
public static InstalledPlugin createInstalled(String name, String version) {
PluginInformation information = new PluginInformation(); PluginInformation information = new PluginInformation();
information.setName(name); information.setName(name);
information.setVersion("1.0"); information.setVersion(version);
return createInstalled(information); return createInstalled(information);
} }