Merge branch 'develop' into bugfix/wrong_plugin_notification

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Added
+- Extension point to add links to the repository cards from plug ins ([#1041](https://github.com/scm-manager/scm-manager/pull/1041))
+
 ## 2.0.0-rc5 - 2020-03-12
 ### Added
 - Added footer extension points for links and avatar

docs/v2/Release process.md

@@ -1,69 +1,42 @@
 # How to release SCM-Manager v2 core
 
-To release a new version of SCM-Manager v2 you have to do the following steps (replace placeholders `<version>` and `<development-version>` accordingly, eg. with `2.1.0` and `2.2.0-SNAPSHOT`):
+To release a new version of SCM-Manager v2 you have to do the following steps (replace placeholders `<version>` accordingly, eg. with `2.1.0`):
 
 ## Check out default branch
 
-`hg checkout default`
+Make sure you have no changes you want to keep!
 
-## Set release version for maven artefacts:
+```
-
+git fetch && git checkout default && git reset --hard origin/default
-`mvn versions:set -DnewVersion=<version> -DgenerateBackupPoms=false`
+```
-
-## Set release version for Javascript artefacts:
-
-`yarn run set-version <version>`
 
 ## Modify Changelog
 
 Change "Unreleased" header in `CHANGELOG.md` to  `<version> - <current date>`
 
+## Create release branch:
+
+`git checkout -b release/<version>`
+
 ## Commit version changes
 
-`hg commit -m "Release version <version>"`
+```
+git add CHANGELOG.md
+git commit -m "Adjust changelog for release <version>"
+```
 
-## Run last test locally
+## Push release branch
 
-`mvn clean install -Pit -DClassLoaderLeakPreventor.threadWaitMs=10`
+`git push origin release/<version>`
-
-## Create tag
-
-`hg tag "<version>"`
-
-## Push
-
-`hg push -b .`
 
 ## Wait for Jenkins build
 
-## Deploy release version
+Jenkins will
 
-This only works with OpenJDK 8!
+- update `pom.xml` and `package.json`
-
+- merge with master branch
-`mvn clean deploy -DperformRelease`
+- build and deploy everything
-
+- set the new development version for the develop branch
-# Release docker image
-
-```
-docker build . -t scmmanager/scm-manager:<version>
-docker push scmmanager/scm-manager:<version>
-```
-
-## Set next development version for maven artefacts:
-
-`mvn versions:set -DnewVersion=<development-version> -DgenerateBackupPoms=false`
-
-## Set next development version for Javascript artefacts:
-
-`yarn run set-version <development-version>`
-
-## Commit version changes
-
-`hg commit -m "Prepare for next development iteration"`
-
-## Push
-
-`hg push -b .`
 
 ## Make a party
 
@@ -71,17 +44,27 @@ docker push scmmanager/scm-manager:<version>
 
 To release a new version of a Plugin for SCM-Manager v2 you have to do the following steps (replace placeholder `<version>` accordingly, eg. with `2.1.0`):
 
+## Update to latest version
+
+Make sure you have no changes you want to keep!
+
+```
+git fetch && git checkout develop && git reset --hard origin/develop
+```
+
 ## Set new version
 
 Edit `pom.xml`:
 
 - `version` and `scm.tag` have to be set to the new version.
 - ensure that all dependencies to other scm resources have released versions
+- ensure `parent.version` points to stable release
 
 Edit `package.json`:
 
 - `version` has to be set to the new version.
 - ensure that all dependencies to other scm resources have released versions
+- ensure the version of `@scm-manager/ui-plugins` points to the same version as `parent.version` in the `pom.xml`
 
 ## Modify Changelog
 
@@ -104,11 +87,10 @@ git push origin develop
 
 ## Merge with master branch
 
+The merge should be possible with a fast forward. If this fails, check for changes on the `master` branch that are not present on the `develop` branch. Merge these changes into the `develop` branch, first!
+
 ```
-git checkout master
+git checkout master && git pull && git merge develop --ff-only && git push origin master
-git pull
-git merge develop
-git push origin master
 ```
 
 ## Create and push tag

pom.xml

@@ -831,15 +831,15 @@
     <junit.version>5.2.0</junit.version>
 
     <!-- logging libraries -->
-    <slf4j.version>1.7.25</slf4j.version>
+    <slf4j.version>1.7.30</slf4j.version>
     <logback.version>1.2.3</logback.version>
     <servlet.version>3.0.1</servlet.version>
 
     <jaxrs.version>2.1.1</jaxrs.version>
-    <resteasy.version>4.4.1.Final</resteasy.version>
+    <resteasy.version>4.4.2.Final</resteasy.version>
     <jersey-client.version>1.19.4</jersey-client.version>
     <jackson.version>2.10.0</jackson.version>
-    <guice.version>4.0</guice.version>
+    <guice.version>4.2.2</guice.version>
     <jaxb.version>2.3.0</jaxb.version>
     <hibernate-validator.version>6.1.0.Final</hibernate-validator.version>
 
@@ -847,7 +847,7 @@
     <legman.version>1.6.2</legman.version>
 
     <!-- webserver -->
-    <jetty.version>9.4.22.v20191022</jetty.version>
+    <jetty.version>9.4.26.v20200117</jetty.version>
     <jetty.maven.version>9.4.22.v20191022</jetty.maven.version>
 
     <!-- security libraries -->

scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx

@@ -3,6 +3,7 @@ import { Repository } from "@scm-manager/ui-types";
 import { CardColumn, DateFromNow } from "@scm-manager/ui-components";
 import RepositoryEntryLink from "./RepositoryEntryLink";
 import RepositoryAvatar from "./RepositoryAvatar";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
 
 type Props = {
   repository: Repository;
@@ -47,6 +48,7 @@ class RepositoryEntry extends React.Component<Props> {
         {this.renderBranchesLink(repository, repositoryLink)}
         {this.renderChangesetsLink(repository, repositoryLink)}
         {this.renderSourcesLink(repository, repositoryLink)}
+        <ExtensionPoint name={"repository.card.quickLink"} props={{ repository, repositoryLink }} renderAll={true} />
         {this.renderModifyLink(repository, repositoryLink)}
       </>
     );