From 4875ef963968b92a4f1b74509bedb870004b3901 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Fri, 18 Jan 2019 11:25:59 +0100 Subject: [PATCH 01/21] Use recent ui-extensions version b/c of a required bugfix --- scm-plugins/scm-git-plugin/package.json | 2 +- scm-plugins/scm-git-plugin/yarn.lock | 7 ++++--- scm-plugins/scm-hg-plugin/package.json | 2 +- scm-plugins/scm-hg-plugin/yarn.lock | 7 ++++--- scm-plugins/scm-svn-plugin/package.json | 2 +- scm-plugins/scm-svn-plugin/yarn.lock | 7 ++++--- scm-ui-components/packages/ui-components/package.json | 2 +- scm-ui-components/packages/ui-components/yarn.lock | 6 +++--- scm-ui/package.json | 2 +- scm-ui/yarn.lock | 7 ++++--- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 3145b6a338..1805f0665b 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -9,7 +9,7 @@ "flow": "flow check" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-git-plugin/yarn.lock b/scm-plugins/scm-git-plugin/yarn.lock index 234ed65102..64c47a247d 100644 --- a/scm-plugins/scm-git-plugin/yarn.lock +++ b/scm-plugins/scm-git-plugin/yarn.lock @@ -747,9 +747,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 0638a464de..849d8a92cb 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -6,7 +6,7 @@ "build": "ui-bundler plugin" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-hg-plugin/yarn.lock b/scm-plugins/scm-hg-plugin/yarn.lock index 0666ef408d..b47e6e6e32 100644 --- a/scm-plugins/scm-hg-plugin/yarn.lock +++ b/scm-plugins/scm-hg-plugin/yarn.lock @@ -681,9 +681,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index e51f3b9bfd..e5cddc0bba 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -6,7 +6,7 @@ "build": "ui-bundler plugin" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-svn-plugin/yarn.lock b/scm-plugins/scm-svn-plugin/yarn.lock index 0666ef408d..b47e6e6e32 100644 --- a/scm-plugins/scm-svn-plugin/yarn.lock +++ b/scm-plugins/scm-svn-plugin/yarn.lock @@ -681,9 +681,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json index 06e007e871..bb8e5c738e 100644 --- a/scm-ui-components/packages/ui-components/package.json +++ b/scm-ui-components/packages/ui-components/package.json @@ -26,7 +26,7 @@ "react-router-enzyme-context": "^1.2.0" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1", + "@scm-manager/ui-extensions": "^0.1.2", "@scm-manager/ui-types": "2.0.0-SNAPSHOT", "classnames": "^2.2.6", "moment": "^2.22.2", diff --git a/scm-ui-components/packages/ui-components/yarn.lock b/scm-ui-components/packages/ui-components/yarn.lock index 062bb75ab1..2fd20f2870 100644 --- a/scm-ui-components/packages/ui-components/yarn.lock +++ b/scm-ui-components/packages/ui-components/yarn.lock @@ -727,9 +727,9 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-ui/package.json b/scm-ui/package.json index 2f68b75317..bf4e272fb0 100644 --- a/scm-ui/package.json +++ b/scm-ui/package.json @@ -7,7 +7,7 @@ "dependencies": { "@babel/polyfill": "^7.0.0", "@fortawesome/fontawesome-free": "^5.3.1", - "@scm-manager/ui-extensions": "^0.1.1", + "@scm-manager/ui-extensions": "^0.1.2", "bulma": "^0.7.1", "bulma-tooltip": "^2.0.2", "classnames": "^2.2.5", diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock index 3ddf27be96..5c656ab243 100644 --- a/scm-ui/yarn.lock +++ b/scm-ui/yarn.lock @@ -738,9 +738,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" From cd66549495392c74e52e6a15bbc82f4a25d6e4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 22 Jan 2019 10:28:50 +0100 Subject: [PATCH 02/21] render next and previous button small if they mark the previous and next page number --- .../packages/ui-components/src/LinkPaginator.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/LinkPaginator.js b/scm-ui-components/packages/ui-components/src/LinkPaginator.js index aaf13d7b15..d09306e04c 100644 --- a/scm-ui-components/packages/ui-components/src/LinkPaginator.js +++ b/scm-ui-components/packages/ui-components/src/LinkPaginator.js @@ -25,13 +25,13 @@ class LinkPaginator extends React.Component { ); } - renderPreviousButton(label?: string) { + renderPreviousButton(className: string, label?: string) { const { page } = this.props; const previousPage = page - 1; return ( diff --git a/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js b/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js index 45bbdd3026..70f5cb5107 100644 --- a/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js +++ b/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js @@ -28,7 +28,7 @@ export class DeleteGroupNavLink extends React.Component { buttons: [ { label: t("delete-group-button.confirm-alert.submit"), - onClick: () => this.deleteGroup() + onClick: () => this.deleteGroup(), }, { label: t("delete-group-button.confirm-alert.cancel"), From c31e6fcecac305ac9432b5a8f191a7d9c49448d6 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 16:37:45 +0000 Subject: [PATCH 06/21] Close branch bugfix/differentSizesOfPagingNumbers From 3b589cfcb709373cc4499fdca790f970de595f7f Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 17:56:20 +0000 Subject: [PATCH 07/21] Close branch bugfix/deleteButtonNotReachable From d790c38be5fb9942b643797be5087a972101ed77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Thu, 24 Jan 2019 13:31:42 +0100 Subject: [PATCH 08/21] fix error --- .../repos/components/list/RepositoryEntry.js | 14 ++----------- scm-ui/styles/scm.scss | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/scm-ui/src/repos/components/list/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js index 122128db3a..28a6fe1ad3 100644 --- a/scm-ui/src/repos/components/list/RepositoryEntry.js +++ b/scm-ui/src/repos/components/list/RepositoryEntry.js @@ -9,16 +9,6 @@ import classNames from "classnames"; import RepositoryAvatar from "./RepositoryAvatar"; const styles = { - overlayFullColumn: { - position: "absolute", - height: "calc(120px - 0.5rem)", - width: "calc(100% - 1.5rem)" - }, - overlayHalfColumn: { - position: "absolute", - height: "calc(120px - 1.5rem)", - width: "calc(50% - 3rem)" - }, inner: { position: "relative", pointerEvents: "none", @@ -86,8 +76,8 @@ class RepositoryEntry extends React.Component { const repositoryLink = this.createLink(repository); const halfColumn = fullColumnWidth ? "is-full" : "is-half"; const overlayLinkClass = fullColumnWidth - ? classes.overlayFullColumn - : classes.overlayHalfColumn; + ? "overlay-full-column" + : "overlay-half-column"; return (
Date: Thu, 24 Jan 2019 12:53:21 +0000 Subject: [PATCH 09/21] Close branch bugfix/makeReposClickableInMobileView From 9670232ad27f1a452ca7cb60a8df5db1230fecc0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 25 Jan 2019 12:35:16 +0100 Subject: [PATCH 10/21] extension point for changeset description should be only rendered once --- .../ui-components/src/repos/changesets/ChangesetRow.js | 2 +- scm-ui/src/repos/components/changesets/ChangesetDetails.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js index d74e3631d1..7609bc2171 100644 --- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js +++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js @@ -69,7 +69,7 @@ class ChangesetRow extends React.Component { {description.title} diff --git a/scm-ui/src/repos/components/changesets/ChangesetDetails.js b/scm-ui/src/repos/components/changesets/ChangesetDetails.js index 034ee36263..217b236122 100644 --- a/scm-ui/src/repos/components/changesets/ChangesetDetails.js +++ b/scm-ui/src/repos/components/changesets/ChangesetDetails.js @@ -50,7 +50,7 @@ class ChangesetDetails extends React.Component { {description.title} @@ -83,7 +83,7 @@ class ChangesetDetails extends React.Component { {item} From f9d0a316c56a17f3542d690298d320dc9b57f3ee Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 25 Jan 2019 12:35:33 +0100 Subject: [PATCH 11/21] close branch feature/bugfix_issuetracker From b877cf21461e9fcc75d75f75976ca540b2f03e13 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 25 Jan 2019 13:15:04 +0100 Subject: [PATCH 12/21] set is-info to is-link color and changed wrong class uses --- .../packages/ui-components/src/buttons/DownloadButton.js | 6 ++---- scm-ui/src/repos/sources/components/content/ButtonGroup.js | 4 ++-- scm-ui/styles/scm.scss | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js b/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js index 3a99dc876b..279c472f0e 100644 --- a/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js +++ b/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js @@ -1,7 +1,5 @@ //@flow import React from "react"; -import Button, { type ButtonProps } from "./Button"; -import type {File} from "@scm-manager/ui-types"; type Props = { displayName: string, @@ -10,9 +8,9 @@ type Props = { class DownloadButton extends React.Component { render() { - const {displayName, url} = this.props; + const { displayName, url } = this.props; return ( - + diff --git a/scm-ui/src/repos/sources/components/content/ButtonGroup.js b/scm-ui/src/repos/sources/components/content/ButtonGroup.js index 5befbd94d5..055ee115a5 100644 --- a/scm-ui/src/repos/sources/components/content/ButtonGroup.js +++ b/scm-ui/src/repos/sources/components/content/ButtonGroup.js @@ -25,9 +25,9 @@ class ButtonGroup extends React.Component { let historyColor = ""; if (historyIsSelected) { - historyColor = "info is-selected"; + historyColor = "link is-selected"; } else { - sourcesColor = "info is-selected"; + sourcesColor = "link is-selected"; } const sourcesLabel = ( diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss index 946e392300..d31f40ceea 100644 --- a/scm-ui/styles/scm.scss +++ b/scm-ui/styles/scm.scss @@ -4,6 +4,8 @@ $blue: #33b2e8; $mint: #11dfd0; +$info: $blue; + // $footer-background-color .is-ellipsis-overflow { From 8566c294da84f3e12de48e6b2b18a01aa8d9cbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 25 Jan 2019 13:34:09 +0100 Subject: [PATCH 13/21] Fix permission check for permission link --- .../scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java index f15f7c4b00..19929b63ba 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java @@ -41,6 +41,8 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper Date: Fri, 25 Jan 2019 15:57:45 +0100 Subject: [PATCH 14/21] implemented fix --- scm-ui/src/users/components/UserForm.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js index 2d3a519f15..d33354ab76 100644 --- a/scm-ui/src/users/components/UserForm.js +++ b/scm-ui/src/users/components/UserForm.js @@ -105,17 +105,9 @@ class UserForm extends React.Component { } return (
-
+
{nameField} -
{ helpText={t("help.mailHelpText")} />
+
+ +
From 4453f07c3b1dcf8704e93ada8412d60bf1428f17 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 25 Jan 2019 15:58:36 +0100 Subject: [PATCH 15/21] small correction --- scm-ui/src/users/components/UserForm.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js index d33354ab76..abf6c9d087 100644 --- a/scm-ui/src/users/components/UserForm.js +++ b/scm-ui/src/users/components/UserForm.js @@ -89,14 +89,16 @@ class UserForm extends React.Component { let passwordChangeField = null; if (!this.props.user) { nameField = ( - +
+ +
); passwordChangeField = ( @@ -106,9 +108,7 @@ class UserForm extends React.Component { return (
-
- {nameField} -
+ {nameField}
Date: Fri, 25 Jan 2019 16:04:04 +0100 Subject: [PATCH 16/21] swapped displayname and mail --- scm-ui/src/users/components/UserForm.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js index abf6c9d087..ba1e2f6753 100644 --- a/scm-ui/src/users/components/UserForm.js +++ b/scm-ui/src/users/components/UserForm.js @@ -109,16 +109,6 @@ class UserForm extends React.Component {
{nameField} -
- -
{ helpText={t("help.displayNameHelpText")} />
+
+ +
From bd26de83e2ba97b2d00848ff730a71a2c850bbff Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 25 Jan 2019 17:09:14 +0100 Subject: [PATCH 17/21] added radio component and used it in permissions --- .../packages/ui-components/src/forms/Radio.js | 45 ++++++++++++++ .../packages/ui-components/src/forms/index.js | 1 + .../components/CreatePermissionForm.js | 61 ++++++++----------- 3 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 scm-ui-components/packages/ui-components/src/forms/Radio.js diff --git a/scm-ui-components/packages/ui-components/src/forms/Radio.js b/scm-ui-components/packages/ui-components/src/forms/Radio.js new file mode 100644 index 0000000000..2b1c626d7b --- /dev/null +++ b/scm-ui-components/packages/ui-components/src/forms/Radio.js @@ -0,0 +1,45 @@ +//@flow +import React from "react"; +import { Help } from "../index"; + +type Props = { + label?: string, + name?: string, + value?: string, + checked: boolean, + onChange?: (value: boolean, name?: string) => void, + disabled?: boolean, + helpText?: string +}; + +class Radio extends React.Component { + renderHelp = () => { + const helpText = this.props.helpText; + if (helpText) { + return ; + } + }; + + render() { + return ( +
+
+ +
+
+ ); + } +} + +export default Radio; diff --git a/scm-ui-components/packages/ui-components/src/forms/index.js b/scm-ui-components/packages/ui-components/src/forms/index.js index 8d27ab05cd..ef4d7a1ae4 100644 --- a/scm-ui-components/packages/ui-components/src/forms/index.js +++ b/scm-ui-components/packages/ui-components/src/forms/index.js @@ -4,6 +4,7 @@ export { default as AddEntryToTableField } from "./AddEntryToTableField.js"; export { default as AutocompleteAddEntryToTableField } from "./AutocompleteAddEntryToTableField.js"; export { default as MemberNameTable } from "./MemberNameTable.js"; export { default as Checkbox } from "./Checkbox.js"; +export { default as Radio } from "./Radio.js"; export { default as InputField } from "./InputField.js"; export { default as Select } from "./Select.js"; export { default as Textarea } from "./Textarea.js"; diff --git a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js index 5fd8224be4..488ed7ce2b 100644 --- a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js +++ b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js @@ -1,7 +1,7 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { Autocomplete, SubmitButton } from "@scm-manager/ui-components"; +import { Autocomplete, Radio, SubmitButton } from "@scm-manager/ui-components"; import TypeSelector from "./TypeSelector"; import type { PermissionCollection, @@ -132,43 +132,34 @@ class CreatePermissionForm extends React.Component { {t("permission.add-permission.add-permission-heading")} -
- - -
- -
+ + +
- {this.renderAutocompletionField()} + {this.renderAutocompletionField()}
- +
-
-
+
+
{ disabled={!this.state.valid || this.state.name === ""} />
-
+
); From 67438b1d72212a08b2934488709a539a00bd1746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Mon, 28 Jan 2019 12:47:18 +0000 Subject: [PATCH 18/21] Close branch feature/blau_blau_blau From dbb88263456db09108a27bdf2873576378b4c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Mon, 28 Jan 2019 13:02:22 +0000 Subject: [PATCH 19/21] Close branch feature/radio_button From fc76897d1847fb80138e0b2854d07825a236bd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Mon, 28 Jan 2019 13:11:30 +0000 Subject: [PATCH 20/21] Close branch feature/jump_order From f22abaf0e24f5f4dff1d66f4baea73eb8c86766a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 28 Jan 2019 14:28:34 +0100 Subject: [PATCH 21/21] fix restdoc generation and append restdoc artifact to buildjob --- Jenkinsfile | 3 ++- pom.xml | 2 +- scm-plugins/pom.xml | 2 +- scm-webapp/pom.xml | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 693c7efb00..8bb52d6030 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ node('docker') { } stage('Build') { - mvn 'clean install -DskipTests' + mvn 'clean install -Pdoc -DskipTests' } stage('Unit Test') { @@ -53,6 +53,7 @@ node('docker') { stage('Archive') { archiveArtifacts 'scm-webapp/target/scm-webapp.war' archiveArtifacts 'scm-server/target/scm-server-app.*' + archiveArtifacts 'scm-webapp/target/scm-webapp-restdocs.zip' } stage('Docker') { diff --git a/pom.xml b/pom.xml index 5b300fb634..17e8ae2cca 100644 --- a/pom.xml +++ b/pom.xml @@ -777,7 +777,7 @@ 2.0.1 3.1.3.Final 1.19.4 - 2.9.1 + 2.11.1 2.8.6 4.0 diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index db0173d1df..25f85fc170 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -137,7 +137,7 @@ - doc + plugin-doc diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 01f45cb54e..59add29fc4 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -896,6 +896,11 @@ enunciate-lombok ${enunciate.version} + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} +