From 46db6e7fc994aa4bc5281eaf38125cdb30ab96e9 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 13 Mar 2020 09:02:42 +0100 Subject: [PATCH 1/8] added notes to parent version and ui-plugins --- docs/v2/Release process.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/v2/Release process.md b/docs/v2/Release process.md index 39c1e47298..6667ec1273 100644 --- a/docs/v2/Release process.md +++ b/docs/v2/Release process.md @@ -77,11 +77,13 @@ 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 @@ -131,4 +133,4 @@ Edit `package.json`: `version` has to be set to the new development version. ``` git commit -am "Prepare for next development iteration" git push origin develop -``` \ No newline at end of file +``` From cbfc9ce6e79da87a662fb00c821832f3005a0c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 13 Mar 2020 15:30:52 +0100 Subject: [PATCH 2/8] Add hints for release of plugins --- docs/v2/Release process.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/v2/Release process.md b/docs/v2/Release process.md index 6667ec1273..ebbea4088c 100644 --- a/docs/v2/Release process.md +++ b/docs/v2/Release process.md @@ -71,6 +71,16 @@ docker push scmmanager/scm-manager: To release a new version of a Plugin for SCM-Manager v2 you have to do the following steps (replace placeholder `` accordingly, eg. with `2.1.0`): +## Update to latest version + +Make sure you have no changes you want to keep. + +``` +git checkout develop +git fetch +git reset --hard origin/develop +``` + ## Set new version Edit `pom.xml`: @@ -106,10 +116,12 @@ 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 pull -git merge develop +git merge develop --ff-only git push origin master ``` From 5b0c98fd3c3b72836472c53970080af24c8363a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 13 Mar 2020 15:44:35 +0100 Subject: [PATCH 3/8] Update release documentation --- docs/v2/Release process.md | 78 +++++++++++--------------------------- 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/docs/v2/Release process.md b/docs/v2/Release process.md index ebbea4088c..3ebf091572 100644 --- a/docs/v2/Release process.md +++ b/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 `` and `` 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 `` 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: - -`mvn versions:set -DnewVersion= -DgenerateBackupPoms=false` - -## Set release version for Javascript artefacts: - -`yarn run set-version ` +``` +git fetch && git checkout default && git reset --hard origin/default +``` ## Modify Changelog Change "Unreleased" header in `CHANGELOG.md` to ` - ` +## Create release branch: + +`git checkout -b release/` + ## Commit version changes -`hg commit -m "Release version "` +``` +git add CHANGELOG.md +git commit -m "Adjust changelog for release " +``` -## Run last test locally +## Push release branch -`mvn clean install -Pit -DClassLoaderLeakPreventor.threadWaitMs=10` - -## Create tag - -`hg tag ""` - -## Push - -`hg push -b .` +`git push origin release/` ## Wait for Jenkins build -## Deploy release version +Jenkins will -This only works with OpenJDK 8! - -`mvn clean deploy -DperformRelease` - -# Release docker image - -``` -docker build . -t scmmanager/scm-manager: -docker push scmmanager/scm-manager: -``` - -## Set next development version for maven artefacts: - -`mvn versions:set -DnewVersion= -DgenerateBackupPoms=false` - -## Set next development version for Javascript artefacts: - -`yarn run set-version ` - -## Commit version changes - -`hg commit -m "Prepare for next development iteration"` - -## Push - -`hg push -b .` +- update `pom.xml` and `package.json` +- merge with master branch +- build and deploy everything +- set the new development version for the develop branch ## Make a party @@ -73,12 +46,10 @@ To release a new version of a Plugin for SCM-Manager v2 you have to do the follo ## Update to latest version -Make sure you have no changes you want to keep. +Make sure you have no changes you want to keep! ``` -git checkout develop -git fetch -git reset --hard origin/develop +git fetch && git checkout develop && git reset --hard origin/develop ``` ## Set new version @@ -119,10 +90,7 @@ git push origin develop 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 pull -git merge develop --ff-only -git push origin master +git checkout master && git pull && git merge develop --ff-only && git push origin master ``` ## Create and push tag From 176f19fb1a8b94838672feb43067577b8bbf8cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Sat, 14 Mar 2020 20:50:25 +0100 Subject: [PATCH 4/8] Add extension point for repository links in card --- CHANGELOG.md | 4 ++++ .../ui-webapp/src/repos/components/list/RepositoryEntry.tsx | 2 ++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ef56053a6..bd6ceb194b 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx b/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx index b0aba7cfb3..8f4f0c295a 100644 --- a/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx +++ b/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 { {this.renderBranchesLink(repository, repositoryLink)} {this.renderChangesetsLink(repository, repositoryLink)} {this.renderSourcesLink(repository, repositoryLink)} + {this.renderModifyLink(repository, repositoryLink)} ); From 124aaa3e80df9cd793005f634b23e8b0c88a1f0f Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 14 Mar 2020 21:16:11 +0000 Subject: [PATCH 5/8] fix: upgrade org.eclipse.jetty:jetty-jmx from 9.4.22.v20191022 to 9.4.26.v20200117 Snyk has created this PR to upgrade org.eclipse.jetty:jetty-jmx from 9.4.22.v20191022 to 9.4.26.v20200117. See this package in NPM: https://www.npmjs.com/package/org.eclipse.jetty:jetty-jmx See this project in Snyk: https://app.snyk.io/org/scm-manager/project/9ae37cfe-98a5-4b6b-bbf7-ffa5cde55e58?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a6a28ca542..faa2460349 100644 --- a/pom.xml +++ b/pom.xml @@ -847,7 +847,7 @@ 1.6.2 - 9.4.22.v20191022 + 9.4.26.v20200117 9.4.22.v20191022 @@ -870,7 +870,7 @@ 8 UTF-8 SCM-BSD - + 1.2.0.Final From 9f51f96a4fcca91df99493dd3ca87f070d6e1e96 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 14 Mar 2020 21:57:45 +0000 Subject: [PATCH 6/8] fix: upgrade org.slf4j:slf4j-simple from 1.7.25 to 1.7.30 Snyk has created this PR to upgrade org.slf4j:slf4j-simple from 1.7.25 to 1.7.30. See this package in NPM: https://www.npmjs.com/package/org.slf4j:slf4j-simple See this project in Snyk: https://app.snyk.io/org/scm-manager/project/c575ed09-e310-44e7-afc8-22b77c5873cf?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a6a28ca542..6d3ae0defb 100644 --- a/pom.xml +++ b/pom.xml @@ -831,7 +831,7 @@ 5.2.0 - 1.7.25 + 1.7.30 1.2.3 3.0.1 @@ -870,7 +870,7 @@ 8 UTF-8 SCM-BSD - + 1.2.0.Final From cd7b79a0d777f8077d0e40823f112bb59d0121a6 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 14 Mar 2020 21:57:49 +0000 Subject: [PATCH 7/8] fix: upgrade com.google.inject:guice from 4.0 to 4.2.2 Snyk has created this PR to upgrade com.google.inject:guice from 4.0 to 4.2.2. See this package in NPM: https://www.npmjs.com/package/com.google.inject:guice See this project in Snyk: https://app.snyk.io/org/scm-manager/project/c575ed09-e310-44e7-afc8-22b77c5873cf?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a6a28ca542..dda86a9077 100644 --- a/pom.xml +++ b/pom.xml @@ -839,7 +839,7 @@ 4.4.1.Final 1.19.4 2.10.0 - 4.0 + 4.2.2 2.3.0 6.1.0.Final @@ -870,7 +870,7 @@ 8 UTF-8 SCM-BSD - + 1.2.0.Final From 5b7247b8af052fef52e44db25f44a4bf64bb9362 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 14 Mar 2020 21:57:54 +0000 Subject: [PATCH 8/8] fix: upgrade org.jboss.resteasy:resteasy-core from 4.4.1.Final to 4.4.2.Final Snyk has created this PR to upgrade org.jboss.resteasy:resteasy-core from 4.4.1.Final to 4.4.2.Final. See this package in NPM: https://www.npmjs.com/package/org.jboss.resteasy:resteasy-core See this project in Snyk: https://app.snyk.io/org/scm-manager/project/c575ed09-e310-44e7-afc8-22b77c5873cf?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a6a28ca542..569d80a8f2 100644 --- a/pom.xml +++ b/pom.xml @@ -836,7 +836,7 @@ 3.0.1 2.1.1 - 4.4.1.Final + 4.4.2.Final 1.19.4 2.10.0 4.0 @@ -870,7 +870,7 @@ 8 UTF-8 SCM-BSD - + 1.2.0.Final