From 825f5fcdb4d9a4e008afddf046c39892f0a750e3 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 8 Apr 2020 15:20:35 +0200 Subject: [PATCH 01/13] Update behavior when optional props are not passed, Consistency towards two CardColumns established --- .../ui-components/src/CardColumn.stories.tsx | 15 ++- scm-ui/ui-components/src/CardColumn.tsx | 105 ++++++++++-------- .../src/CardColumnSmall.stories.tsx | 5 +- scm-ui/ui-components/src/CardColumnSmall.tsx | 13 ++- .../src/__snapshots__/storyshots.test.ts.snap | 105 +++++++++++++++--- yarn.lock | 66 ++--------- 6 files changed, 177 insertions(+), 132 deletions(-) diff --git a/scm-ui/ui-components/src/CardColumn.stories.tsx b/scm-ui/ui-components/src/CardColumn.stories.tsx index fbf8ffdf78..276e357bbe 100644 --- a/scm-ui/ui-components/src/CardColumn.stories.tsx +++ b/scm-ui/ui-components/src/CardColumn.stories.tsx @@ -35,9 +35,9 @@ const Wrapper = styled.div` const Container: FC = ({ children }) => {children}; -const title = title; -const avatar = ; const link = "/foo/bar"; +const avatar = ; +const title = title; const footerLeft = left footer; const footerRight = right footer; @@ -46,10 +46,17 @@ storiesOf("CardColumn", module) .addDecorator(storyFn => {storyFn()}) .add("default", () => ( + )) + .add("minimal", () => ( + diff --git a/scm-ui/ui-components/src/CardColumn.tsx b/scm-ui/ui-components/src/CardColumn.tsx index 2ef488e746..c85e15371a 100644 --- a/scm-ui/ui-components/src/CardColumn.tsx +++ b/scm-ui/ui-components/src/CardColumn.tsx @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -import React, { ReactNode } from "react"; +import React, { FC, ReactNode } from "react"; import classNames from "classnames"; import styled from "styled-components"; import { Link } from "react-router-dom"; type Props = { + link?: string; + avatar?: ReactNode; title: ReactNode; description?: string; - avatar: ReactNode; contentRight?: ReactNode; footerLeft: ReactNode; footerRight: ReactNode; - link?: string; action?: () => void; className?: string; }; @@ -76,51 +76,60 @@ const InheritFlexShrinkDiv = styled.div` flex-shrink: inherit; `; -export default class CardColumn extends React.Component { - createLink = () => { - const { link, action } = this.props; - if (link) { - return ; - } else if (action) { - return ( - { - e.preventDefault(); - action(); - }} - href="#" - /> - ); - } - return null; - }; +const CardColumn: FC = ({ + link, + avatar, + title, + description, + contentRight, + footerLeft, + footerRight, + action, + className +}) => { + const renderAvatar = avatar ? {avatar} : null; + const renderDescription = description ?

{description}

: null; + const renderContentRight = contentRight ? {contentRight} : null; - render() { - const { avatar, title, description, contentRight, footerLeft, footerRight, className } = this.props; - const link = this.createLink(); - return ( - <> - {link} - - {avatar} - -
- -

{title}

-

{description}

- - {contentRight} -
- - {footerLeft} - - {footerRight} - - - - - + let createLink = null; + if (link) { + createLink = ; + } else if (action) { + createLink = ( + { + e.preventDefault(); + action(); + }} + href="#" + /> ); } -} + + return ( + <> + {createLink} + + {renderAvatar} + +
+ +

{title}

+ {renderDescription} + + {renderContentRight} +
+ + {footerLeft} + + {footerRight} + + + + + + ); +}; + +export default CardColumn; diff --git a/scm-ui/ui-components/src/CardColumnSmall.stories.tsx b/scm-ui/ui-components/src/CardColumnSmall.stories.tsx index d94f8af7c6..029e5b1548 100644 --- a/scm-ui/ui-components/src/CardColumnSmall.stories.tsx +++ b/scm-ui/ui-components/src/CardColumnSmall.stories.tsx @@ -44,5 +44,8 @@ storiesOf("CardColumnSmall", module) .addDecorator(story => {story()}) .addDecorator(storyFn => {storyFn()}) .add("default", () => ( - + + )) + .add("minimal", () => ( + )); diff --git a/scm-ui/ui-components/src/CardColumnSmall.tsx b/scm-ui/ui-components/src/CardColumnSmall.tsx index 82b4889b91..4e1acbbc72 100644 --- a/scm-ui/ui-components/src/CardColumnSmall.tsx +++ b/scm-ui/ui-components/src/CardColumnSmall.tsx @@ -29,7 +29,7 @@ import { Link } from "react-router-dom"; type Props = { link: string; - icon: ReactNode; + avatar?: ReactNode; contentLeft: ReactNode; contentRight: ReactNode; footer?: ReactNode; @@ -62,21 +62,24 @@ const StyledLink = styled(Link)` } `; -const IconWrapper = styled.figure` +const AvatarWrapper = styled.figure` margin-right: 0.5rem; `; -const CardColumnSmall: FC = ({ link, icon, contentLeft, contentRight, footer }) => { +const CardColumnSmall: FC = ({ link, avatar, contentLeft, contentRight, footer }) => { + const renderAvatar = avatar ? {avatar} : null; + const renderFooter = footer ? {footer} : null; + return (
- {icon} + {renderAvatar} {contentLeft} {contentRight} - {footer} + {renderFooter}
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap index ccd2fcd609..1c61844bf6 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -486,9 +486,54 @@ exports[`Storyshots CardColumn default 1`] = ` A description can be added here.

+ +
+ className="CardColumn__RightMarginDiv-sc-1w6lsih-6 dbLPPh level-left is-hidden-mobile" + > + + left footer + +
+
+ + right footer + +
+
+ + + +`; + +exports[`Storyshots CardColumn minimal 1`] = ` +
+
+
+
+
+

+ + title + +

+
- +
+ + + +`; + +exports[`Storyshots CardColumnSmall minimal 1`] = ` +
+ +
+
+
+
+ + main content + +
+
+ + more text + +
+
@@ -34564,9 +34649,6 @@ exports[`Storyshots RepositoryEntry Avatar EP 1`] = ` The starship Heart of Gold was the first spacecraft to make use of the Infinite Improbability Drive

-
-
-
-
Date: Wed, 8 Apr 2020 21:41:50 +0200 Subject: [PATCH 02/13] Use next version of smp maven plugin This enables plugins to use the new release pipeline. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f806be11d7..3967feb3f2 100644 --- a/pom.xml +++ b/pom.xml @@ -494,7 +494,7 @@ sonia.scm.maven smp-maven-plugin - 1.0.0-rc5 + 1.0.0-rc6 From 9cdec81ec080f28e1d07a63d432f1cf7c2f103f9 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 9 Apr 2020 09:31:13 +0200 Subject: [PATCH 03/13] make right content in cardcolumn hoverable --- .../ui-components/src/CardColumn.stories.tsx | 11 ++- scm-ui/ui-components/src/CardColumn.tsx | 1 + .../src/__snapshots__/storyshots.test.ts.snap | 67 +++++++++++++++++-- 3 files changed, 72 insertions(+), 7 deletions(-) diff --git a/scm-ui/ui-components/src/CardColumn.stories.tsx b/scm-ui/ui-components/src/CardColumn.stories.tsx index 276e357bbe..d2a59e0d4b 100644 --- a/scm-ui/ui-components/src/CardColumn.stories.tsx +++ b/scm-ui/ui-components/src/CardColumn.stories.tsx @@ -27,6 +27,8 @@ import { storiesOf } from "@storybook/react"; import CardColumn from "./CardColumn"; import Icon from "./Icon"; import styled from "styled-components"; +import { DateFromNow } from "."; +import repository from "./__resources__/repository"; const Wrapper = styled.div` margin: 2rem; @@ -40,6 +42,7 @@ const avatar = ; const title = title; const footerLeft = left footer; const footerRight = right footer; +const baseDate = "2020-03-26T12:13:42+02:00"; storiesOf("CardColumn", module) .addDecorator(story => {story()}) @@ -60,4 +63,10 @@ storiesOf("CardColumn", module) footerLeft={footerLeft} footerRight={footerRight} /> - )); + )) + .add("with hoverable date", () => ( + + + } /> + )); diff --git a/scm-ui/ui-components/src/CardColumn.tsx b/scm-ui/ui-components/src/CardColumn.tsx index c85e15371a..70d3da1946 100644 --- a/scm-ui/ui-components/src/CardColumn.tsx +++ b/scm-ui/ui-components/src/CardColumn.tsx @@ -74,6 +74,7 @@ const RightMarginDiv = styled.div` const InheritFlexShrinkDiv = styled.div` flex-shrink: inherit; + pointer-events: all; `; const CardColumn: FC = ({ diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap index 1c61844bf6..26b6c0c320 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -498,7 +498,7 @@ exports[`Storyshots CardColumn default 1`] = `
right footer @@ -546,7 +546,7 @@ exports[`Storyshots CardColumn minimal 1`] = `
right footer @@ -558,6 +558,61 @@ exports[`Storyshots CardColumn minimal 1`] = `
`; +exports[`Storyshots CardColumn with hoverable date 1`] = ` +
+
+
+
+
+

+ + title + +

+
+
+
+
+ + left footer + +
+
+ + + +
+
+
+
+
+`; + exports[`Storyshots CardColumnSmall default 1`] = `
Date: Thu, 9 Apr 2020 19:45:24 +0200 Subject: [PATCH 04/13] Update for new plugin release process --- docs/v2/release-process.md | 57 ++++++++++++-------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/docs/v2/release-process.md b/docs/v2/release-process.md index 83f4db8ce2..6e30aa74cf 100644 --- a/docs/v2/release-process.md +++ b/docs/v2/release-process.md @@ -14,7 +14,7 @@ git fetch && git checkout develop && git reset --hard origin/develop Change "Unreleased" header in `CHANGELOG.md` to ` - ` -## Create release branch: +## Create release branch `git checkout -b release/` @@ -37,6 +37,7 @@ Jenkins will - merge with master branch - build and deploy everything - set the new development version for the develop branch +- delete the release branch ## Make a party @@ -44,7 +45,7 @@ Jenkins will 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 +## Check out default branch Make sure you have no changes you want to keep! @@ -52,20 +53,6 @@ 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 Change "Unreleased" header in `CHANGELOG.md` to ` - ` @@ -78,42 +65,34 @@ Change "Unreleased" header in `CHANGELOG.md` to ` - ` `mvn clean install` +## Create release branch + +``` +git checkout -b release/ +``` + ## Commit and push release ``` git commit -am "Release version " -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! +## Push release branch ``` -git checkout master && git pull && git merge develop --ff-only && git push origin master +git push origin release/ ``` -## Create and push tag +## Wait for Jenkins build -``` -git tag -s -a -m "" -git push --tags origin -``` +Jenkins will -## Prepare next development version +- update versions in pom.xml and package.json +- merge with master branch +- build and deploy everything +- set the new development version for the develop branch +- delete the release branch -``` -git checkout develop -``` - -Edit `pom.xml`: `version` has to be set to the new development version, `tag` to `HEAD`. - -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 -``` ## Attention: Creating new plugins If you are creating a new plugin which doesn't exist in the SCM-Manager Plugin-Center yet, your plugin will not be shown after the release. First you have to create a `index.md` in the Plugin-Center Repository. From 313f589ea832868986f2dd42e6b83d8bdea76619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 9 Apr 2020 19:36:29 +0200 Subject: [PATCH 05/13] Adjust changelog for release 2.0.0-rc7 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2101b427ab..36842f0851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,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.0.0-rc7 - 2020-04-09 ### Added - Fire various plugin events ([#1088](https://github.com/scm-manager/scm-manager/pull/1088)) - Display version for plugins ([#1089](https://github.com/scm-manager/scm-manager/pull/1089) From 3cf675f30d05ca1af9cfcc18192fb55f9f1f248e Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Thu, 9 Apr 2020 18:37:13 +0000 Subject: [PATCH 06/13] release version 2.0.0-rc7 --- lerna.json | 2 +- pom.xml | 2 +- scm-annotation-processor/pom.xml | 6 ++--- scm-annotations/pom.xml | 4 ++-- scm-core/pom.xml | 8 +++---- scm-dao-xml/pom.xml | 8 +++---- scm-it/pom.xml | 20 ++++++++--------- scm-plugins/pom.xml | 10 ++++----- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-git-plugin/pom.xml | 2 +- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/pom.xml | 2 +- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/pom.xml | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/pom.xml | 2 +- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 ++--- scm-ui/babel-preset/package.json | 2 +- scm-ui/eslint-config/package.json | 2 +- scm-ui/jest-preset/package.json | 2 +- scm-ui/pom.xml | 4 ++-- scm-ui/prettier-config/package.json | 2 +- scm-ui/tsconfig/package.json | 2 +- scm-ui/ui-components/package.json | 8 +++---- scm-ui/ui-extensions/package.json | 2 +- scm-ui/ui-plugins/package.json | 22 +++++++++--------- scm-ui/ui-polyfill/package.json | 2 +- scm-ui/ui-scripts/package.json | 2 +- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 8 +++---- scm-webapp/pom.xml | 26 +++++++++++----------- 34 files changed, 93 insertions(+), 93 deletions(-) diff --git a/lerna.json b/lerna.json index 405d16a397..b8214565d4 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.0.0-SNAPSHOT" + "version": "2.0.0-rc7" } diff --git a/pom.xml b/pom.xml index 3967feb3f2..80759a65dd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.0.0-SNAPSHOT + 2.0.0-rc7 The easiest way to share your Git, Mercurial and Subversion repositories over http. diff --git a/scm-annotation-processor/pom.xml b/scm-annotation-processor/pom.xml index eafc3f5c58..67a4185f69 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-annotation-processor - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.0.0-SNAPSHOT + 2.0.0-rc7 diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index dfc7b8d62a..9dd974adfc 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-annotations - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index ac86a33f4d..93c907900c 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-core - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-core @@ -55,7 +55,7 @@ sonia.scm scm-annotations - 2.0.0-SNAPSHOT + 2.0.0-rc7 @@ -213,7 +213,7 @@ sonia.scm scm-annotation-processor - 2.0.0-SNAPSHOT + 2.0.0-rc7 provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index 42f49dd8f3..ba2b78e82f 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-dao-xml - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-dao-xml @@ -51,7 +51,7 @@ sonia.scm scm-core - 2.0.0-SNAPSHOT + 2.0.0-rc7 @@ -59,7 +59,7 @@ sonia.scm scm-test - 2.0.0-SNAPSHOT + 2.0.0-rc7 test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 146a7b33b2..2bb99c6110 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-it war - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-it sonia.scm scm-core - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-test - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm.plugins scm-git-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 test sonia.scm.plugins scm-git-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 test sonia.scm.plugins scm-hg-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 test sonia.scm.plugins scm-svn-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 tests test diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 5467725199..70cfabef7d 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm.plugins scm-plugins pom - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-plugins @@ -59,7 +59,7 @@ sonia.scm scm-core - 2.0.0-SNAPSHOT + 2.0.0-rc7 provided @@ -68,7 +68,7 @@ sonia.scm scm-annotation-processor - 2.0.0-SNAPSHOT + 2.0.0-rc7 provided @@ -98,7 +98,7 @@ sonia.scm scm-test - 2.0.0-SNAPSHOT + 2.0.0-rc7 test diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 01572012d1..f45603515f 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -20,6 +20,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.0.0-rc7" } } diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 6a3e2235cc..b6602d9f6b 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-git-plugin diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index f6bb8709f8..d55a127d99 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.0.0-rc7" } } diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 37da213210..4015d42963 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -31,7 +31,7 @@ sonia.scm.plugins scm-plugins - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-hg-plugin diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index abd99dc69a..762fbfc591 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.0.0-rc7" } } diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index 46bc9d99f2..00dc660c17 100644 --- a/scm-plugins/scm-legacy-plugin/pom.xml +++ b/scm-plugins/scm-legacy-plugin/pom.xml @@ -29,12 +29,12 @@ sonia.scm.plugins scm-plugins - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.0.0-SNAPSHOT + 2.0.0-rc7 smp diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 8be18995df..a8891b3ca4 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" + "@scm-manager/ui-plugins": "^2.0.0-rc7" } } diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 0a75769180..7eb9609e2c 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index 08fbe4dc39..c6ff9e31da 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-server - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index a24e048f55..cc1b4cdfba 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-test - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.0.0-SNAPSHOT + 2.0.0-rc7 diff --git a/scm-ui/babel-preset/package.json b/scm-ui/babel-preset/package.json index cb0ea1ac52..998642e0bd 100644 --- a/scm-ui/babel-preset/package.json +++ b/scm-ui/babel-preset/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/babel-preset", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "description": "Babel configuration for scm-manager and its plugins", "main": "index.js", diff --git a/scm-ui/eslint-config/package.json b/scm-ui/eslint-config/package.json index ec7216fe5b..362a60617b 100644 --- a/scm-ui/eslint-config/package.json +++ b/scm-ui/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/eslint-config", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "ESLint configuration for scm-manager and its plugins", "main": "index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/jest-preset/package.json b/scm-ui/jest-preset/package.json index 4384226cd9..49aaae6ddf 100644 --- a/scm-ui/jest-preset/package.json +++ b/scm-ui/jest-preset/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/jest-preset", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "Jest presets for SCM-Manager and its plugins", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index f4d64a9951..c6eeee52c5 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-ui war - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-ui diff --git a/scm-ui/prettier-config/package.json b/scm-ui/prettier-config/package.json index 5c5fce4869..404aa749c0 100644 --- a/scm-ui/prettier-config/package.json +++ b/scm-ui/prettier-config/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/prettier-config", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "description": "Prettier configuration", "author": "Sebastian Sdorra ", diff --git a/scm-ui/tsconfig/package.json b/scm-ui/tsconfig/package.json index 9595f56444..261b6ff3ac 100644 --- a/scm-ui/tsconfig/package.json +++ b/scm-ui/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/tsconfig", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "description": "TypeScript configuration", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 8900a701e3..77e75a4ddf 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "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.0.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.0.0-rc7", "@storybook/addon-actions": "^5.2.3", "@storybook/addon-storyshots": "^5.2.3", "@storybook/react": "^5.2.3", @@ -46,8 +46,8 @@ "worker-plugin": "^3.2.0" }, "dependencies": { - "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", - "@scm-manager/ui-types": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.0.0-rc7", + "@scm-manager/ui-types": "^2.0.0-rc7", "classnames": "^2.2.6", "date-fns": "^2.4.1", "gitdiff-parser": "^0.1.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index a652c703f7..438c451502 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "main": "src/index.ts", "license": "MIT", "private": false, diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index b88637e3f5..2c54b3d157 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,13 +1,13 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "^2.0.0-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-components": "^2.0.0-rc7", + "@scm-manager/ui-extensions": "^2.0.0-rc7", "classnames": "^2.2.6", "query-string": "^5.0.1", "react": "^16.10.2", @@ -18,14 +18,14 @@ "styled-components": "^4.4.0" }, "devDependencies": { - "@scm-manager/babel-preset": "^2.0.0-SNAPSHOT", - "@scm-manager/eslint-config": "^2.0.0-SNAPSHOT", - "@scm-manager/jest-preset": "^2.0.0-SNAPSHOT", - "@scm-manager/prettier-config": "^2.0.0-SNAPSHOT", - "@scm-manager/tsconfig": "^2.0.0-SNAPSHOT", - "@scm-manager/ui-scripts": "^2.0.0-SNAPSHOT", - "@scm-manager/ui-tests": "^2.0.0-SNAPSHOT", - "@scm-manager/ui-types": "^2.0.0-SNAPSHOT", + "@scm-manager/babel-preset": "^2.0.0-rc7", + "@scm-manager/eslint-config": "^2.0.0-rc7", + "@scm-manager/jest-preset": "^2.0.0-rc7", + "@scm-manager/prettier-config": "^2.0.0-rc7", + "@scm-manager/tsconfig": "^2.0.0-rc7", + "@scm-manager/ui-scripts": "^2.0.0-rc7", + "@scm-manager/ui-tests": "^2.0.0-rc7", + "@scm-manager/ui-types": "^2.0.0-rc7", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 8beb8d5836..9ccac02a19 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index d99b2209ae..b7ab7306bf 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 15ca4c1ec4..df7dad8714 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index be53c4164d..eb78cd937c 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index a366ad3a1b..23e8765c17 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "description": "Flow types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index ba54fb7689..fe41658cf3 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,10 +1,10 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.0.0-SNAPSHOT", + "version": "2.0.0-rc7", "private": true, "dependencies": { - "@scm-manager/ui-components": "^2.0.0-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-components": "^2.0.0-rc7", + "@scm-manager/ui-extensions": "^2.0.0-rc7", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "^17.3.0", @@ -29,7 +29,7 @@ "test": "jest" }, "devDependencies": { - "@scm-manager/ui-tests": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.0.0-rc7", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index f0f576b02f..0a55ff58bc 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-webapp war - 2.0.0-SNAPSHOT + 2.0.0-rc7 scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.0.0-SNAPSHOT + 2.0.0-rc7 provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.0.0-SNAPSHOT + 2.0.0-rc7 sonia.scm scm-dao-xml - 2.0.0-SNAPSHOT + 2.0.0-rc7 @@ -332,7 +332,7 @@ sonia.scm scm-test - 2.0.0-SNAPSHOT + 2.0.0-rc7 test @@ -394,7 +394,7 @@ sonia.scm.plugins scm-git-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 tests test @@ -402,14 +402,14 @@ sonia.scm.plugins scm-git-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 test sonia.scm.plugins scm-hg-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 tests test @@ -417,14 +417,14 @@ sonia.scm.plugins scm-hg-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 test sonia.scm.plugins scm-svn-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 tests test @@ -432,7 +432,7 @@ sonia.scm.plugins scm-svn-plugin - 2.0.0-SNAPSHOT + 2.0.0-rc7 test @@ -704,7 +704,7 @@ sonia.scm scm-ui - 2.0.0-SNAPSHOT + 2.0.0-rc7 war From d5847e7965287597f6830edab573ebce882ed3f3 Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Thu, 9 Apr 2020 19:03:13 +0000 Subject: [PATCH 07/13] prepare for next development iteration --- pom.xml | 2 +- scm-annotation-processor/pom.xml | 6 +++--- scm-annotations/pom.xml | 4 ++-- scm-core/pom.xml | 8 ++++---- scm-dao-xml/pom.xml | 8 ++++---- scm-it/pom.xml | 20 ++++++++++---------- scm-plugins/pom.xml | 10 +++++----- scm-plugins/scm-git-plugin/pom.xml | 2 +- scm-plugins/scm-hg-plugin/pom.xml | 2 +- scm-plugins/scm-legacy-plugin/pom.xml | 4 ++-- scm-plugins/scm-svn-plugin/pom.xml | 2 +- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 +++--- scm-ui/pom.xml | 4 ++-- scm-webapp/pom.xml | 26 +++++++++++++------------- 15 files changed, 54 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index 80759a65dd..bc505d0614 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.0.0-rc7 + 2.1.0-SNAPSHOT The easiest way to share your Git, Mercurial and Subversion repositories over http. diff --git a/scm-annotation-processor/pom.xml b/scm-annotation-processor/pom.xml index 67a4185f69..446e091a79 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-annotation-processor - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.0.0-rc7 + 2.1.0-SNAPSHOT diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index 9dd974adfc..d921d3686b 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-annotations - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 93c907900c..686b4f5afa 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-core - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-core @@ -55,7 +55,7 @@ sonia.scm scm-annotations - 2.0.0-rc7 + 2.1.0-SNAPSHOT @@ -213,7 +213,7 @@ sonia.scm scm-annotation-processor - 2.0.0-rc7 + 2.1.0-SNAPSHOT provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index ba2b78e82f..6f6dde92e1 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-dao-xml - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-dao-xml @@ -51,7 +51,7 @@ sonia.scm scm-core - 2.0.0-rc7 + 2.1.0-SNAPSHOT @@ -59,7 +59,7 @@ sonia.scm scm-test - 2.0.0-rc7 + 2.1.0-SNAPSHOT test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 2bb99c6110..84257fd9f3 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-it war - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-it sonia.scm scm-core - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-test - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm.plugins scm-git-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT test sonia.scm.plugins scm-git-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT tests test diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 70cfabef7d..9e8f7db2cb 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm.plugins scm-plugins pom - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-plugins @@ -59,7 +59,7 @@ sonia.scm scm-core - 2.0.0-rc7 + 2.1.0-SNAPSHOT provided @@ -68,7 +68,7 @@ sonia.scm scm-annotation-processor - 2.0.0-rc7 + 2.1.0-SNAPSHOT provided @@ -98,7 +98,7 @@ sonia.scm scm-test - 2.0.0-rc7 + 2.1.0-SNAPSHOT test diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index b6602d9f6b..2f1190c4ea 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-git-plugin diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 4015d42963..b1471fcc60 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -31,7 +31,7 @@ sonia.scm.plugins scm-plugins - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-hg-plugin diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index 00dc660c17..842a25dbfa 100644 --- a/scm-plugins/scm-legacy-plugin/pom.xml +++ b/scm-plugins/scm-legacy-plugin/pom.xml @@ -29,12 +29,12 @@ sonia.scm.plugins scm-plugins - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.0.0-rc7 + 2.1.0-SNAPSHOT smp diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 7eb9609e2c..0e7f43804a 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index c6ff9e31da..4d08467bde 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-server - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index cc1b4cdfba..96a4e6c834 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-test - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.0.0-rc7 + 2.1.0-SNAPSHOT diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index c6eeee52c5..ee9f40bd70 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-ui war - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-ui diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 0a55ff58bc..63ee9e3948 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-webapp war - 2.0.0-rc7 + 2.1.0-SNAPSHOT scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.0.0-rc7 + 2.1.0-SNAPSHOT provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.0.0-rc7 + 2.1.0-SNAPSHOT sonia.scm scm-dao-xml - 2.0.0-rc7 + 2.1.0-SNAPSHOT @@ -332,7 +332,7 @@ sonia.scm scm-test - 2.0.0-rc7 + 2.1.0-SNAPSHOT test @@ -394,7 +394,7 @@ sonia.scm.plugins scm-git-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT tests test @@ -402,14 +402,14 @@ sonia.scm.plugins scm-git-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT tests test @@ -417,14 +417,14 @@ sonia.scm.plugins scm-hg-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT tests test @@ -432,7 +432,7 @@ sonia.scm.plugins scm-svn-plugin - 2.0.0-rc7 + 2.1.0-SNAPSHOT test @@ -704,7 +704,7 @@ sonia.scm scm-ui - 2.0.0-rc7 + 2.1.0-SNAPSHOT war From 80b843d0bf7d8a0a23862dc398fa8bf995d8bd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 9 Apr 2020 21:07:54 +0200 Subject: [PATCH 08/13] Reset to original master branch In case the master branch had been checked out before with a different commit from an earlier build, we reset it to the commit from origin. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a6ca00bb51..c910f01521 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,6 +53,7 @@ node('docker') { // merge release branch into master sh "git checkout master" + sh "git reset --hard origin/master" sh "git merge --ff-only ${env.BRANCH_NAME}" // set tag From c4fc0615b53b8d6d7fcbb6db1d3413177e1e16a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 9 Apr 2020 21:08:58 +0200 Subject: [PATCH 09/13] Set version back to 2.0.0-SNAPSHOT --- lerna.json | 2 +- pom.xml | 2 +- scm-annotation-processor/pom.xml | 6 ++--- scm-annotations/pom.xml | 4 ++-- scm-core/pom.xml | 8 +++---- scm-dao-xml/pom.xml | 8 +++---- scm-it/pom.xml | 20 ++++++++--------- scm-plugins/pom.xml | 10 ++++----- scm-plugins/scm-git-plugin/package.json | 4 ++-- scm-plugins/scm-git-plugin/pom.xml | 2 +- scm-plugins/scm-hg-plugin/package.json | 4 ++-- scm-plugins/scm-hg-plugin/pom.xml | 2 +- scm-plugins/scm-legacy-plugin/package.json | 4 ++-- scm-plugins/scm-legacy-plugin/pom.xml | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 4 ++-- scm-plugins/scm-svn-plugin/pom.xml | 2 +- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 ++--- scm-ui/babel-preset/package.json | 2 +- scm-ui/eslint-config/package.json | 2 +- scm-ui/jest-preset/package.json | 2 +- scm-ui/pom.xml | 4 ++-- scm-ui/prettier-config/package.json | 2 +- scm-ui/tsconfig/package.json | 2 +- scm-ui/ui-components/package.json | 8 +++---- scm-ui/ui-extensions/package.json | 2 +- scm-ui/ui-plugins/package.json | 22 +++++++++--------- scm-ui/ui-polyfill/package.json | 2 +- scm-ui/ui-scripts/package.json | 2 +- scm-ui/ui-styles/package.json | 2 +- scm-ui/ui-tests/package.json | 2 +- scm-ui/ui-types/package.json | 2 +- scm-ui/ui-webapp/package.json | 8 +++---- scm-webapp/pom.xml | 26 +++++++++++----------- 34 files changed, 93 insertions(+), 93 deletions(-) diff --git a/lerna.json b/lerna.json index b8214565d4..405d16a397 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.0.0-rc7" + "version": "2.0.0-SNAPSHOT" } diff --git a/pom.xml b/pom.xml index bc505d0614..3967feb3f2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT The easiest way to share your Git, Mercurial and Subversion repositories over http. diff --git a/scm-annotation-processor/pom.xml b/scm-annotation-processor/pom.xml index 446e091a79..eafc3f5c58 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-annotation-processor - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index d921d3686b..dfc7b8d62a 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-annotations - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 686b4f5afa..ac86a33f4d 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-core - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-core @@ -55,7 +55,7 @@ sonia.scm scm-annotations - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT @@ -213,7 +213,7 @@ sonia.scm scm-annotation-processor - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index 6f6dde92e1..42f49dd8f3 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-dao-xml - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-dao-xml @@ -51,7 +51,7 @@ sonia.scm scm-core - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT @@ -59,7 +59,7 @@ sonia.scm scm-test - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 84257fd9f3..146a7b33b2 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-it war - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-it sonia.scm scm-core - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-test - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm.plugins scm-git-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test sonia.scm.plugins scm-git-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT tests test diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 9e8f7db2cb..5467725199 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm.plugins scm-plugins pom - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-plugins @@ -59,7 +59,7 @@ sonia.scm scm-core - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT provided @@ -68,7 +68,7 @@ sonia.scm scm-annotation-processor - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT provided @@ -98,7 +98,7 @@ sonia.scm scm-test - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index f45603515f..01572012d1 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-git-plugin", "private": true, - "version": "2.0.0-rc7", + "version": "2.0.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.0.0-rc7" + "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 2f1190c4ea..6a3e2235cc 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-git-plugin diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index d55a127d99..f6bb8709f8 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-hg-plugin", "private": true, - "version": "2.0.0-rc7", + "version": "2.0.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.0.0-rc7" + "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index b1471fcc60..37da213210 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -31,7 +31,7 @@ sonia.scm.plugins scm-plugins - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-hg-plugin diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 762fbfc591..abd99dc69a 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-legacy-plugin", "private": true, - "version": "2.0.0-rc7", + "version": "2.0.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.0.0-rc7" + "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index 842a25dbfa..46bc9d99f2 100644 --- a/scm-plugins/scm-legacy-plugin/pom.xml +++ b/scm-plugins/scm-legacy-plugin/pom.xml @@ -29,12 +29,12 @@ sonia.scm.plugins scm-plugins - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT smp diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index a8891b3ca4..8be18995df 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@scm-manager/scm-svn-plugin", "private": true, - "version": "2.0.0-rc7", + "version": "2.0.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.0.0-rc7" + "@scm-manager/ui-plugins": "^2.0.0-SNAPSHOT" } } diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 0e7f43804a..0a75769180 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -31,7 +31,7 @@ scm-plugins sonia.scm.plugins - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index 4d08467bde..08fbe4dc39 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-server - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 96a4e6c834..a24e048f55 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-test - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/scm-ui/babel-preset/package.json b/scm-ui/babel-preset/package.json index 998642e0bd..cb0ea1ac52 100644 --- a/scm-ui/babel-preset/package.json +++ b/scm-ui/babel-preset/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/babel-preset", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "license": "MIT", "description": "Babel configuration for scm-manager and its plugins", "main": "index.js", diff --git a/scm-ui/eslint-config/package.json b/scm-ui/eslint-config/package.json index 362a60617b..ec7216fe5b 100644 --- a/scm-ui/eslint-config/package.json +++ b/scm-ui/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/eslint-config", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "ESLint configuration for scm-manager and its plugins", "main": "index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/jest-preset/package.json b/scm-ui/jest-preset/package.json index 49aaae6ddf..4384226cd9 100644 --- a/scm-ui/jest-preset/package.json +++ b/scm-ui/jest-preset/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/jest-preset", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "Jest presets for SCM-Manager and its plugins", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index ee9f40bd70..f4d64a9951 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-ui war - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-ui diff --git a/scm-ui/prettier-config/package.json b/scm-ui/prettier-config/package.json index 404aa749c0..5c5fce4869 100644 --- a/scm-ui/prettier-config/package.json +++ b/scm-ui/prettier-config/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/prettier-config", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "license": "MIT", "description": "Prettier configuration", "author": "Sebastian Sdorra ", diff --git a/scm-ui/tsconfig/package.json b/scm-ui/tsconfig/package.json index 261b6ff3ac..9595f56444 100644 --- a/scm-ui/tsconfig/package.json +++ b/scm-ui/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/tsconfig", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "license": "MIT", "description": "TypeScript configuration", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 77e75a4ddf..8900a701e3 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.0.0-rc7", + "version": "2.0.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.0.0-rc7", + "@scm-manager/ui-tests": "^2.0.0-SNAPSHOT", "@storybook/addon-actions": "^5.2.3", "@storybook/addon-storyshots": "^5.2.3", "@storybook/react": "^5.2.3", @@ -46,8 +46,8 @@ "worker-plugin": "^3.2.0" }, "dependencies": { - "@scm-manager/ui-extensions": "^2.0.0-rc7", - "@scm-manager/ui-types": "^2.0.0-rc7", + "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.0.0-SNAPSHOT", "classnames": "^2.2.6", "date-fns": "^2.4.1", "gitdiff-parser": "^0.1.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index 438c451502..a652c703f7 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "main": "src/index.ts", "license": "MIT", "private": false, diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 2c54b3d157..b88637e3f5 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,13 +1,13 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "^2.0.0-rc7", - "@scm-manager/ui-extensions": "^2.0.0-rc7", + "@scm-manager/ui-components": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", "classnames": "^2.2.6", "query-string": "^5.0.1", "react": "^16.10.2", @@ -18,14 +18,14 @@ "styled-components": "^4.4.0" }, "devDependencies": { - "@scm-manager/babel-preset": "^2.0.0-rc7", - "@scm-manager/eslint-config": "^2.0.0-rc7", - "@scm-manager/jest-preset": "^2.0.0-rc7", - "@scm-manager/prettier-config": "^2.0.0-rc7", - "@scm-manager/tsconfig": "^2.0.0-rc7", - "@scm-manager/ui-scripts": "^2.0.0-rc7", - "@scm-manager/ui-tests": "^2.0.0-rc7", - "@scm-manager/ui-types": "^2.0.0-rc7", + "@scm-manager/babel-preset": "^2.0.0-SNAPSHOT", + "@scm-manager/eslint-config": "^2.0.0-SNAPSHOT", + "@scm-manager/jest-preset": "^2.0.0-SNAPSHOT", + "@scm-manager/prettier-config": "^2.0.0-SNAPSHOT", + "@scm-manager/tsconfig": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-scripts": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.0.0-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 9ccac02a19..8beb8d5836 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index b7ab7306bf..d99b2209ae 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index df7dad8714..15ca4c1ec4 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index eb78cd937c..be53c4164d 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index 23e8765c17..a366ad3a1b 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "description": "Flow types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index fe41658cf3..ba54fb7689 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,10 +1,10 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.0.0-rc7", + "version": "2.0.0-SNAPSHOT", "private": true, "dependencies": { - "@scm-manager/ui-components": "^2.0.0-rc7", - "@scm-manager/ui-extensions": "^2.0.0-rc7", + "@scm-manager/ui-components": "^2.0.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.0.0-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "^17.3.0", @@ -29,7 +29,7 @@ "test": "jest" }, "devDependencies": { - "@scm-manager/ui-tests": "^2.0.0-rc7", + "@scm-manager/ui-tests": "^2.0.0-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 63ee9e3948..f0f576b02f 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-webapp war - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT sonia.scm scm-dao-xml - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT @@ -332,7 +332,7 @@ sonia.scm scm-test - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test @@ -394,7 +394,7 @@ sonia.scm.plugins scm-git-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT tests test @@ -402,14 +402,14 @@ sonia.scm.plugins scm-git-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT tests test @@ -417,14 +417,14 @@ sonia.scm.plugins scm-hg-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT tests test @@ -432,7 +432,7 @@ sonia.scm.plugins scm-svn-plugin - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT test @@ -704,7 +704,7 @@ sonia.scm scm-ui - 2.1.0-SNAPSHOT + 2.0.0-SNAPSHOT war From 98ef04579b2bb6f3a0ee12644f806ea4205d7e8e Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 10 Apr 2020 21:57:08 +0000 Subject: [PATCH 10/13] fix: upgrade com.google.inject:guice from 4.2.2 to 4.2.3 Snyk has created this PR to upgrade com.google.inject:guice from 4.2.2 to 4.2.3. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3967feb3f2..fc5be2237a 100644 --- a/pom.xml +++ b/pom.xml @@ -913,7 +913,7 @@ 4.5.2.Final 1.19.4 2.10.3 - 4.2.2 + 4.2.3 2.3.1 6.1.2.Final From b953b1258bd7de226b8b80effd9ca63037704e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Sat, 11 Apr 2020 22:06:37 +0200 Subject: [PATCH 11/13] Remove arbitrary apache exception --- .../scm/repository/spi/SimpleSvnWorkDirFactory.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkDirFactory.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkDirFactory.java index c02e656821..dcd06f9207 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkDirFactory.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkDirFactory.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository.spi; -import org.apache.commons.lang.exception.CloneFailedException; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.wc2.SvnCheckout; import org.tmatesoft.svn.core.wc2.SvnOperationFactory; import org.tmatesoft.svn.core.wc2.SvnTarget; +import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.Repository; import sonia.scm.repository.SvnWorkDirFactory; import sonia.scm.repository.util.SimpleWorkdirFactory; @@ -37,7 +37,6 @@ import sonia.scm.repository.util.WorkdirProvider; import javax.inject.Inject; import java.io.File; -import java.io.IOException; public class SimpleSvnWorkDirFactory extends SimpleWorkdirFactory implements SvnWorkDirFactory { @@ -60,7 +59,7 @@ public class SimpleSvnWorkDirFactory extends SimpleWorkdirFactory Date: Tue, 14 Apr 2020 01:00:21 +0000 Subject: [PATCH 12/13] fix: upgrade org.junit.jupiter:junit-jupiter-engine from 5.6.0 to 5.6.1 Snyk has created this PR to upgrade org.junit.jupiter:junit-jupiter-engine from 5.6.0 to 5.6.1. See this package in NPM: https://www.npmjs.com/package/org.junit.jupiter:junit-jupiter-engine See this project in Snyk: https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc5be2237a..cbbb7656f6 100644 --- a/pom.xml +++ b/pom.xml @@ -902,7 +902,7 @@ 2.28.2 1.3 - 5.6.0 + 5.6.1 1.7.30 From a4b3454601f36da6eb408bca9e94c20f081d1270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 14 Apr 2020 15:37:18 +0200 Subject: [PATCH 13/13] Fix process --- docs/v2/release-process.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/v2/release-process.md b/docs/v2/release-process.md index 6e30aa74cf..d30b0d6289 100644 --- a/docs/v2/release-process.md +++ b/docs/v2/release-process.md @@ -53,17 +53,22 @@ Make sure you have no changes you want to keep! git fetch && git checkout develop && git reset --hard origin/develop ``` -## Modify Changelog +## Update SCM parent if necessary -Change "Unreleased" header in `CHANGELOG.md` to ` - ` +If you need to update the parent of the plugin to a new release of SCM-Manager, change it now: -## Remove old dependencies +- `pom.xml`: `parent.version` +- `package.json`: `dependencies.ui-plugins` -`rm -rf node_modules yarn.lock` +``` +rm -rf node_modules yarn.lock +mvn clean install +git add yarn.lock pom.xml package.json +git commit -m "Update to new version of SCM-Manager" +git push +``` -## Build - -`mvn clean install` +Wait for Jenkins to be green. ## Create release branch @@ -71,10 +76,14 @@ Change "Unreleased" header in `CHANGELOG.md` to ` - ` git checkout -b release/ ``` +## Modify Changelog + +Change "Unreleased" header in `CHANGELOG.md` to ` - ` + ## Commit and push release ``` -git commit -am "Release version " +git commit -am "Prepare release of " ``` ## Push release branch