From 85502116158b0cefc5a09040d183e361e3e9f711 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 18 Jun 2020 10:35:55 +0200 Subject: [PATCH 01/17] fix tooltip multiline view --- scm-ui/ui-components/src/Tooltip.tsx | 2 +- .../src/__snapshots__/storyshots.test.ts.snap | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scm-ui/ui-components/src/Tooltip.tsx b/scm-ui/ui-components/src/Tooltip.tsx index 79f5c9f855..b358c6382f 100644 --- a/scm-ui/ui-components/src/Tooltip.tsx +++ b/scm-ui/ui-components/src/Tooltip.tsx @@ -38,7 +38,7 @@ class Tooltip extends React.Component { render() { const { className, message, location, children } = this.props; - const multiline = message.length > 60 ? "has-tooltip-multiline" : ""; + const multiline = message.length > 60 ? "is-multiline" : ""; return ( {children} 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 4ab1158583..79430a7441 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -17281,7 +17281,7 @@ exports[`Storyshots Diff File Controls 1`] = ` className="control" > Date: Thu, 18 Jun 2020 10:42:16 +0200 Subject: [PATCH 02/17] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5034293255..e9b2d9a843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed active state of sub navigation items, which are using activeWhenMatch ([#1199](https://github.com/scm-manager/scm-manager/pull/1199)) - Handles repositories in custom directories correctly in migration from 1.x ([#1201](https://github.com/scm-manager/scm-manager/pull/1201)) - Usage of short git commit ids in changeset urls ([#1200](https://github.com/scm-manager/scm-manager/pull/1200)) +- Fixes linebreaks in multiline tooltip ([#1207](https://github.com/scm-manager/scm-manager/pull/1207)) ## [2.0.0] - 2020-06-04 ### Added From 86d773f8667adef76d8b528e38db798ca270f94b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 19 Jun 2020 10:38:42 +0200 Subject: [PATCH 03/17] wait until recommended java installation is available for deb packages --- CHANGELOG.md | 4 ++++ scm-packaging/deb/src/main/deb/control/postinst | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82abb84b2e..e4d87a3800 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 +### Fixed +- Wait until recommended java installation is available for deb packages + ## [2.1.0] - 2020-06-18 ### Added - Option to configure jvm parameter of docker container with env JAVA_OPTS or with arguments ([#1175](https://github.com/scm-manager/scm-manager/pull/1175)) diff --git a/scm-packaging/deb/src/main/deb/control/postinst b/scm-packaging/deb/src/main/deb/control/postinst index 474eae5df9..849aaba2f9 100644 --- a/scm-packaging/deb/src/main/deb/control/postinst +++ b/scm-packaging/deb/src/main/deb/control/postinst @@ -36,4 +36,8 @@ systemctl daemon-reload # enable and start the service sudo systemctl enable scm-server -sudo systemctl start scm-server + +# we start scm-manager after 5 seconds +# this is required, because if we install scm-manager with recommend java +# java is not fully setup if we ran our posint script +echo "sleep 5; sudo systemctl start scm-server" | at now From 022246c1f298e098401f0f1c3891bc90ae9f1acb Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 19 Jun 2020 11:01:30 +0200 Subject: [PATCH 04/17] added pr link to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4d87a3800..b9f1feb427 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Fixed -- Wait until recommended java installation is available for deb packages +- Wait until recommended java installation is available for deb packages ([#1209](https://github.com/scm-manager/scm-manager/pull/1209)) ## [2.1.0] - 2020-06-18 ### Added From d2346278f1926424143caacb2873887e7481029e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 19 Jun 2020 11:43:04 +0200 Subject: [PATCH 05/17] added some tooltip stories to test multiline --- scm-ui/ui-components/src/Tooltip.stories.tsx | 44 ++++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/scm-ui/ui-components/src/Tooltip.stories.tsx b/scm-ui/ui-components/src/Tooltip.stories.tsx index f6f4cbad5b..13cfb93228 100644 --- a/scm-ui/ui-components/src/Tooltip.stories.tsx +++ b/scm-ui/ui-components/src/Tooltip.stories.tsx @@ -32,24 +32,38 @@ import Button from "./buttons/Button"; const Wrapper = styled.div` margin: 2rem; - max-width: 400px; + width: 100%; `; const Spacing = styled.div` padding: 2em 6em; + width: 50%; + margin: 0 auto; `; const positions = ["right", "top", "left", "bottom"]; const message = "Heart of Gold"; +const mutltiline = `Characters: + +- Arthur Dent +- Ford Prefect +- Zaphod Beeblebrox +- Marvin the Paranoid Android +- Trillian +- Slartibartfast`; + +const shortMultiline = `* a +* b +* c`; + const RoutingDecorator = (story: () => ReactNode) => {story()}; storiesOf("Tooltip", module) .addDecorator(RoutingDecorator) - .addDecorator(storyFn => {storyFn()}) .add("Default", () => ( -
+ {positions.map(position => ( @@ -57,5 +71,27 @@ storiesOf("Tooltip", module) ))} -
+ + )) + .add("Multiline", () => ( + + {positions.map(position => ( + + + + right - - -
+ + +
+
+ - - + top - -
-
+ + +
+
+ - - + left - -
-
+ + +
+
+ - - + bottom - -
+ + + + + +`; + +exports[`Storyshots Tooltip Multiline 1`] = ` +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+`; + +exports[`Storyshots Tooltip Short Multiline 1`] = ` +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + +
`; From 5dda141064c6d777c703cf67103a14d91c8eabad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 22 Jun 2020 13:56:57 +0200 Subject: [PATCH 10/17] Unregister svn hook when handler is closed --- .../scm/repository/SvnRepositoryHandler.java | 14 ++++++++++-- .../repository/SvnRepositoryHandlerTest.java | 22 ++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java index ed502338cc..e1ea9dde09 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository; //~--- non-JDK imports -------------------------------------------------------- @@ -76,6 +76,7 @@ public class SvnRepositoryHandler private static final Logger logger = LoggerFactory.getLogger(SvnRepositoryHandler.class); + private SvnRepositoryHook hook; @Inject public SvnRepositoryHandler(ConfigurationStoreFactory storeFactory, @@ -94,7 +95,8 @@ public class SvnRepositoryHandler // register hook if (eventFacade != null) { - FSHooks.registerHook(new SvnRepositoryHook(eventFacade, this)); + hook = new SvnRepositoryHook(eventFacade, this); + FSHooks.registerHook(hook); } else if (logger.isWarnEnabled()) { @@ -212,4 +214,12 @@ public class SvnRepositoryHandler String getRepositoryId(File directory) { return new SvnConfigHelper().getRepositoryId(directory); } + + @Override + public void close() throws IOException { + if (hook != null) { + FSHooks.unregisterHook(hook); + } + super.close(); + } } diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java index 9282fd2487..bd12979dc2 100644 --- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java +++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository; @@ -59,6 +59,8 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase { private HookEventFacade facade = new HookEventFacade(repositoryManagerProvider, hookContextFactory); + private SvnRepositoryHandler handler; + @Override protected void postSetUp() throws IOException, RepositoryPathNotFoundException { initMocks(this); @@ -82,7 +84,7 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase { protected RepositoryHandler createRepositoryHandler(ConfigurationStoreFactory factory, RepositoryLocationResolver locationResolver, File directory) { - SvnRepositoryHandler handler = new SvnRepositoryHandler(factory, null, locationResolver, null); + SvnRepositoryHandler handler = new SvnRepositoryHandler(factory, facade, locationResolver, null); handler.init(contextProvider); @@ -95,16 +97,20 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase { } @Test - public void getDirectory() { + public void getDirectory() throws IOException { when(factory.withType(any())).thenCallRealMethod(); SvnRepositoryHandler repositoryHandler = new SvnRepositoryHandler(factory, facade, locationResolver, null); - SvnConfig svnConfig = new SvnConfig(); - repositoryHandler.setConfig(svnConfig); + try { + SvnConfig svnConfig = new SvnConfig(); + repositoryHandler.setConfig(svnConfig); - initRepository(); - File path = repositoryHandler.getDirectory(repository.getId()); - assertEquals(repoPath.toString()+File.separator+ RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath()); + initRepository(); + File path = repositoryHandler.getDirectory(repository.getId()); + assertEquals(repoPath.toString() + File.separator + RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath()); + } finally { + repositoryHandler.close(); + } } } From 39743f2db827a6c785fbd5957564e81b879b4fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 23 Jun 2020 08:18:09 +0200 Subject: [PATCH 11/17] Remove flow config from IDE setup documentation --- docs/en/development/intellij-idea-configuration.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/en/development/intellij-idea-configuration.md b/docs/en/development/intellij-idea-configuration.md index f1bdbe155f..f740281518 100644 --- a/docs/en/development/intellij-idea-configuration.md +++ b/docs/en/development/intellij-idea-configuration.md @@ -33,10 +33,6 @@ title: Intellij IDEA Configuration * Languages & Frameworks / Node.js and NPM * Package Manager: yarn -* Languages & Frameworks / Javascript - * JavaScript language version: Flow - * Flow package or executable: .../node_modules/flow-bin - * Languages & Frameworks / Javascript / Code Quality Tools / ESLint * Enable * ESLint package: .../node_modules/eslint From e4ca2c249048afe6a7fe53bc850122e56467d8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 23 Jun 2020 10:53:37 +0200 Subject: [PATCH 12/17] Prepare support version --- 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-packaging/deb/pom.xml | 6 ++--- scm-packaging/docker/pom.xml | 4 ++-- scm-packaging/helm/pom.xml | 4 ++-- scm-packaging/pom.xml | 4 ++-- scm-packaging/release-yaml/pom.xml | 4 ++-- scm-packaging/rpm/pom.xml | 6 ++--- scm-packaging/unix/pom.xml | 4 ++-- scm-packaging/windows/pom.xml | 4 ++-- scm-plugins/pom.xml | 10 ++++----- scm-plugins/scm-git-plugin/package.json | 2 +- scm-plugins/scm-git-plugin/pom.xml | 2 +- scm-plugins/scm-hg-plugin/package.json | 2 +- scm-plugins/scm-hg-plugin/pom.xml | 2 +- scm-plugins/scm-legacy-plugin/package.json | 2 +- scm-plugins/scm-legacy-plugin/pom.xml | 4 ++-- scm-plugins/scm-svn-plugin/package.json | 2 +- 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 +++++++++++----------- 28 files changed, 77 insertions(+), 77 deletions(-) diff --git a/lerna.json b/lerna.json index 66f41fc5a6..155e673391 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.1.0" + "version": "2.1.1-SNAPSHOT" } diff --git a/pom.xml b/pom.xml index f552e51645..5af64857a0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.1.0 + 2.1.1-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 258b13e2b1..a927076b46 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-annotation-processor - 2.1.0 + 2.1.1-SNAPSHOT scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index ca232baca2..53a006e8bb 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT scm-annotations - 2.1.0 + 2.1.1-SNAPSHOT scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index a682633322..e112eb1632 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,11 +31,11 @@ scm sonia.scm - 2.1.0 + 2.1.1-SNAPSHOT scm-core - 2.1.0 + 2.1.1-SNAPSHOT scm-core @@ -54,7 +54,7 @@ sonia.scm scm-annotations - 2.1.0 + 2.1.1-SNAPSHOT @@ -221,7 +221,7 @@ sonia.scm scm-annotation-processor - 2.1.0 + 2.1.1-SNAPSHOT provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index f7991ee6cd..3d672e6f06 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT scm-dao-xml - 2.1.0 + 2.1.1-SNAPSHOT scm-dao-xml @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.1.0 + 2.1.1-SNAPSHOT @@ -58,7 +58,7 @@ sonia.scm scm-test - 2.1.0 + 2.1.1-SNAPSHOT test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index a5190f23a1..48f25034e0 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-it war - 2.1.0 + 2.1.1-SNAPSHOT scm-it sonia.scm scm-core - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-test - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm.plugins scm-git-plugin - 2.1.0 + 2.1.1-SNAPSHOT test sonia.scm.plugins scm-git-plugin - 2.1.0 + 2.1.1-SNAPSHOT tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.1.0 + 2.1.1-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.1.0 + 2.1.1-SNAPSHOT tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.1.0 + 2.1.1-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index 71774630e8..aa089e3dc8 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT deb deb - 2.1.0 + 2.1.1-SNAPSHOT Packaging for Debian/Ubuntu deb @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-packaging/docker/pom.xml b/scm-packaging/docker/pom.xml index 24669e25f3..5230b5d388 100644 --- a/scm-packaging/docker/pom.xml +++ b/scm-packaging/docker/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT docker pom - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-packaging/helm/pom.xml b/scm-packaging/helm/pom.xml index 65a6cdce6e..5ae7f74ad5 100644 --- a/scm-packaging/helm/pom.xml +++ b/scm-packaging/helm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT helm helm - 2.1.0 + 2.1.1-SNAPSHOT 3.2.1 diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml index 8fad18ad3b..b8af1b1d13 100644 --- a/scm-packaging/pom.xml +++ b/scm-packaging/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm.packaging scm-packaging pom - 2.1.0 + 2.1.1-SNAPSHOT packages.scm-manager.org diff --git a/scm-packaging/release-yaml/pom.xml b/scm-packaging/release-yaml/pom.xml index 38c01b1f95..c001339651 100644 --- a/scm-packaging/release-yaml/pom.xml +++ b/scm-packaging/release-yaml/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT release-yaml pom - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index 45a3aa23d2..eb76dac60b 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT rpm rpm - 2.1.0 + 2.1.1-SNAPSHOT Packaging for RedHat/Centos/Fedora rpm @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-packaging/unix/pom.xml b/scm-packaging/unix/pom.xml index 050c43502e..092c2fe5a1 100644 --- a/scm-packaging/unix/pom.xml +++ b/scm-packaging/unix/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT unix pom - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-packaging/windows/pom.xml b/scm-packaging/windows/pom.xml index 6d86fa8806..35f888fe66 100644 --- a/scm-packaging/windows/pom.xml +++ b/scm-packaging/windows/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.0 + 2.1.1-SNAPSHOT windows pom - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 8f72b4a6ca..89ed38df27 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm.plugins scm-plugins pom - 2.1.0 + 2.1.1-SNAPSHOT scm-plugins @@ -59,7 +59,7 @@ sonia.scm scm-core - 2.1.0 + 2.1.1-SNAPSHOT provided @@ -68,7 +68,7 @@ sonia.scm scm-annotation-processor - 2.1.0 + 2.1.1-SNAPSHOT provided @@ -98,7 +98,7 @@ sonia.scm scm-test - 2.1.0 + 2.1.1-SNAPSHOT test diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 540c3fb207..a8d7cd31a3 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.1.0", + "version": "2.1.1-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 455da7876f..f42ef29958 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 + 2.1.1-SNAPSHOT scm-git-plugin diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 82aa1b2945..872641239c 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.1.0", + "version": "2.1.1-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index fff2d81327..c8bbc28887 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 + 2.1.1-SNAPSHOT scm-hg-plugin diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 3f0dcc4e85..37bc918064 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.1.0", + "version": "2.1.1-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index d5d8a1c57c..de34acaad1 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 + 2.1.1-SNAPSHOT scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.1.0 + 2.1.1-SNAPSHOT smp diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index ea2cacc2d8..39e9ba3b9e 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.1.0", + "version": "2.1.1-SNAPSHOT", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 7c7a892362..7015d52365 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 + 2.1.1-SNAPSHOT scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index b5c46711e2..81647971d9 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-server - 2.1.0 + 2.1.1-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index ff580b7131..e10da77136 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-test - 2.1.0 + 2.1.1-SNAPSHOT scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index 4181b44fa0..5489faea18 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-ui war - 2.1.0 + 2.1.1-SNAPSHOT scm-ui diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index cbd53ad40d..000cef4bfe 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-webapp war - 2.1.0 + 2.1.1-SNAPSHOT scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.1.0 + 2.1.1-SNAPSHOT provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.1.0 + 2.1.1-SNAPSHOT sonia.scm scm-dao-xml - 2.1.0 + 2.1.1-SNAPSHOT @@ -332,7 +332,7 @@ sonia.scm scm-test - 2.1.0 + 2.1.1-SNAPSHOT test @@ -394,7 +394,7 @@ sonia.scm.plugins scm-git-plugin - 2.1.0 + 2.1.1-SNAPSHOT tests test @@ -402,14 +402,14 @@ sonia.scm.plugins scm-git-plugin - 2.1.0 + 2.1.1-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.1.0 + 2.1.1-SNAPSHOT tests test @@ -417,14 +417,14 @@ sonia.scm.plugins scm-hg-plugin - 2.1.0 + 2.1.1-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.1.0 + 2.1.1-SNAPSHOT tests test @@ -432,7 +432,7 @@ sonia.scm.plugins scm-svn-plugin - 2.1.0 + 2.1.1-SNAPSHOT test @@ -718,7 +718,7 @@ sonia.scm scm-ui - 2.1.0 + 2.1.1-SNAPSHOT war From 086a4711610ae59edb174476a8ba9fbbe114b9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 23 Jun 2020 11:40:08 +0200 Subject: [PATCH 13/17] Fix migration of non-bare git repositories During the migration of git repositories from v1 to v2, we have to create an "scmm" config section with the repository id of the current repository. If this does not happen, further write requests to this repository will fail, because the hooks cannot determine the id. However, the migration failed to write this configuration for non-bare repositories. Therefore this fix checks beforehand, whether a '.git' folder exists in the date directory. If this is the case, we assume that this is a non-bare repository and write the config file inside this folder. --- CHANGELOG.md | 4 + .../repository/update/GitV2UpdateStep.java | 18 +++- .../update/GitV2UpdateStepTest.java | 92 +++++++++++++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/update/GitV2UpdateStepTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 82abb84b2e..e170cab88e 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 +### Fixed +- Migration of non-bare repositories ([#1213](https://github.com/scm-manager/scm-manager/pull/1213)) + ## [2.1.0] - 2020-06-18 ### Added - Option to configure jvm parameter of docker container with env JAVA_OPTS or with arguments ([#1175](https://github.com/scm-manager/scm-manager/pull/1175)) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/update/GitV2UpdateStep.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/update/GitV2UpdateStep.java index 0bbb479ed6..d805fae53c 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/update/GitV2UpdateStep.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/update/GitV2UpdateStep.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository.update; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; @@ -38,6 +38,7 @@ import sonia.scm.version.Version; import javax.inject.Inject; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import static sonia.scm.version.Version.parse; @@ -60,7 +61,8 @@ public class GitV2UpdateStep implements UpdateStep { (repositoryId, path) -> { Repository repository = repositoryMetadataAccess.read(path); if (isGitDirectory(repository)) { - try (org.eclipse.jgit.lib.Repository gitRepository = build(path.resolve("data").toFile())) { + final Path effectiveGitPath = determineEffectiveGitFolder(path); + try (org.eclipse.jgit.lib.Repository gitRepository = build(effectiveGitPath.toFile())) { new GitConfigHelper().createScmmConfig(repository, gitRepository); } catch (IOException e) { throw new UpdateException("could not update repository with id " + repositoryId + " in path " + path, e); @@ -70,6 +72,18 @@ public class GitV2UpdateStep implements UpdateStep { ); } + public Path determineEffectiveGitFolder(Path path) { + Path bareGitFolder = path.resolve("data"); + Path nonBareGitFolder = bareGitFolder.resolve(".git"); + final Path effectiveGitPath; + if (Files.exists(nonBareGitFolder)) { + effectiveGitPath = nonBareGitFolder; + } else { + effectiveGitPath = bareGitFolder; + } + return effectiveGitPath; + } + private org.eclipse.jgit.lib.Repository build(File directory) throws IOException { return new FileRepositoryBuilder() .setGitDir(directory) diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/update/GitV2UpdateStepTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/update/GitV2UpdateStepTest.java new file mode 100644 index 0000000000..c207a4bf54 --- /dev/null +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/update/GitV2UpdateStepTest.java @@ -0,0 +1,92 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package sonia.scm.repository.update; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import sonia.scm.repository.Repository; +import sonia.scm.repository.RepositoryLocationResolver; +import sonia.scm.update.UpdateStepRepositoryMetadataAccess; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.function.BiConsumer; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class GitV2UpdateStepTest { + + @Mock + RepositoryLocationResolver locationResolver; + @Mock + RepositoryLocationResolver.RepositoryLocationResolverInstance locationResolverInstance; + @Mock + UpdateStepRepositoryMetadataAccess repositoryMetadataAccess; + + @InjectMocks + GitV2UpdateStep updateStep; + + @BeforeEach + void createDataDirectory(@TempDir Path temp) throws IOException { + Files.createDirectories(temp.resolve("data")); + } + + @BeforeEach + void initRepositoryFolder(@TempDir Path temp) { + when(locationResolver.forClass(Path.class)).thenReturn(locationResolverInstance); + when(repositoryMetadataAccess.read(temp)).thenReturn(new Repository("123", "git", "space", "X")); + doAnswer(invocation -> { + invocation.getArgument(0, BiConsumer.class).accept("123", temp); + return null; + }).when(locationResolverInstance).forAllLocations(any()); + } + + @Test + void shouldWriteConfigFileForBareRepositories(@TempDir Path temp) { + updateStep.doUpdate(); + + assertThat(temp.resolve("data").resolve("config")).exists(); + } + + @Test + void shouldWriteConfigFileForNonBareRepositories(@TempDir Path temp) throws IOException { + Files.createDirectories(temp.resolve("data").resolve(".git")); + + updateStep.doUpdate(); + + assertThat(temp.resolve("data").resolve("config")).doesNotExist(); + assertThat(temp.resolve("data").resolve(".git").resolve("config")).exists(); + } +} From 137f4e1eaecc9d5bf13f5c5b976b36747602acdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 23 Jun 2020 17:28:58 +0200 Subject: [PATCH 14/17] Adjust changelog for release 2.1.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe68dcdcdd..86aa6412f5 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.1.1] - 2020-06-23 ### Fixed - Wait until recommended java installation is available for deb packages ([#1209](https://github.com/scm-manager/scm-manager/pull/1209)) - Do not force java home of recommended java dependency for rpm and deb packages ([#1195](https://github.com/scm-manager/scm-manager/issues/1195) and [#1208](https://github.com/scm-manager/scm-manager/pull/1208)) From e5c7b4eda4358b5143d95a522eed7044e81dff42 Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Tue, 23 Jun 2020 15:34:23 +0000 Subject: [PATCH 15/17] release version 2.1.1 --- 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-packaging/deb/pom.xml | 6 ++--- scm-packaging/docker/pom.xml | 4 ++-- scm-packaging/helm/pom.xml | 4 ++-- scm-packaging/pom.xml | 4 ++-- scm-packaging/release-yaml/pom.xml | 4 ++-- scm-packaging/rpm/pom.xml | 6 ++--- scm-packaging/unix/pom.xml | 4 ++-- scm-packaging/windows/pom.xml | 4 ++-- 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/pom.xml | 4 ++-- scm-ui/ui-components/package.json | 2 +- scm-ui/ui-plugins/package.json | 4 ++-- scm-ui/ui-webapp/package.json | 4 ++-- scm-webapp/pom.xml | 26 +++++++++++----------- 31 files changed, 86 insertions(+), 86 deletions(-) diff --git a/lerna.json b/lerna.json index 66f41fc5a6..ffa2cdc5ad 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.1.0" + "version": "2.1.1" } diff --git a/pom.xml b/pom.xml index db981176f6..355f8d0b7f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.2.0-SNAPSHOT + 2.1.1 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 d2c4b4656e..8b2d3e97b9 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-annotation-processor - 2.2.0-SNAPSHOT + 2.1.1 scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index ff9e074223..d25e67bfaf 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 scm-annotations - 2.2.0-SNAPSHOT + 2.1.1 scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index ff62629f03..7e7d0e9bed 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,11 +31,11 @@ scm sonia.scm - 2.2.0-SNAPSHOT + 2.1.1 scm-core - 2.2.0-SNAPSHOT + 2.1.1 scm-core @@ -54,7 +54,7 @@ sonia.scm scm-annotations - 2.2.0-SNAPSHOT + 2.1.1 @@ -221,7 +221,7 @@ sonia.scm scm-annotation-processor - 2.2.0-SNAPSHOT + 2.1.1 provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index 2dddf39386..fd582451aa 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 scm-dao-xml - 2.2.0-SNAPSHOT + 2.1.1 scm-dao-xml @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.2.0-SNAPSHOT + 2.1.1 @@ -58,7 +58,7 @@ sonia.scm scm-test - 2.2.0-SNAPSHOT + 2.1.1 test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 5206830d97..e9b0c25641 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-it war - 2.2.0-SNAPSHOT + 2.1.1 scm-it sonia.scm scm-core - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-test - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm.plugins scm-git-plugin - 2.2.0-SNAPSHOT + 2.1.1 test sonia.scm.plugins scm-git-plugin - 2.2.0-SNAPSHOT + 2.1.1 tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.2.0-SNAPSHOT + 2.1.1 test sonia.scm.plugins scm-hg-plugin - 2.2.0-SNAPSHOT + 2.1.1 tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.2.0-SNAPSHOT + 2.1.1 test sonia.scm.plugins scm-svn-plugin - 2.2.0-SNAPSHOT + 2.1.1 tests test diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index 7a3d0c9b47..a9655700dd 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 deb deb - 2.2.0-SNAPSHOT + 2.1.1 Packaging for Debian/Ubuntu deb @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-packaging/docker/pom.xml b/scm-packaging/docker/pom.xml index 1b3d10143b..6dd41435c7 100644 --- a/scm-packaging/docker/pom.xml +++ b/scm-packaging/docker/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 docker pom - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-packaging/helm/pom.xml b/scm-packaging/helm/pom.xml index 3b2dff90f4..d2a8a6124f 100644 --- a/scm-packaging/helm/pom.xml +++ b/scm-packaging/helm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 helm helm - 2.2.0-SNAPSHOT + 2.1.1 3.2.1 diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml index ff519e91a5..5799edfe50 100644 --- a/scm-packaging/pom.xml +++ b/scm-packaging/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm.packaging scm-packaging pom - 2.2.0-SNAPSHOT + 2.1.1 packages.scm-manager.org diff --git a/scm-packaging/release-yaml/pom.xml b/scm-packaging/release-yaml/pom.xml index 694ca48fff..11fe6097bd 100644 --- a/scm-packaging/release-yaml/pom.xml +++ b/scm-packaging/release-yaml/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 release-yaml pom - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index fa5743c9c5..e0c24c77ea 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 rpm rpm - 2.2.0-SNAPSHOT + 2.1.1 Packaging for RedHat/Centos/Fedora rpm @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-packaging/unix/pom.xml b/scm-packaging/unix/pom.xml index e4f72df8ef..b49dce50dc 100644 --- a/scm-packaging/unix/pom.xml +++ b/scm-packaging/unix/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 unix pom - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-packaging/windows/pom.xml b/scm-packaging/windows/pom.xml index cdc1bcdf4d..2a8d446fbf 100644 --- a/scm-packaging/windows/pom.xml +++ b/scm-packaging/windows/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.2.0-SNAPSHOT + 2.1.1 windows pom - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index d4696c5ce8..1c4f6e3e8a 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm.plugins scm-plugins pom - 2.2.0-SNAPSHOT + 2.1.1 scm-plugins @@ -59,7 +59,7 @@ sonia.scm scm-core - 2.2.0-SNAPSHOT + 2.1.1 provided @@ -68,7 +68,7 @@ sonia.scm scm-annotation-processor - 2.2.0-SNAPSHOT + 2.1.1 provided @@ -98,7 +98,7 @@ sonia.scm scm-test - 2.2.0-SNAPSHOT + 2.1.1 test diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 540c3fb207..f406d25659 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.1.0", + "version": "2.1.1", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -20,6 +20,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.1.0" + "@scm-manager/ui-plugins": "^2.1.1" } } diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 6e4db9e3f3..53bf44f810 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.2.0-SNAPSHOT + 2.1.1 scm-git-plugin diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 82aa1b2945..8cd1e03641 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.1.0", + "version": "2.1.1", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.1.0" + "@scm-manager/ui-plugins": "^2.1.1" } } diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index dbf85955d8..8fe52cf4fd 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.2.0-SNAPSHOT + 2.1.1 scm-hg-plugin diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 3f0dcc4e85..1b9335e950 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.1.0", + "version": "2.1.1", "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.1.0" + "@scm-manager/ui-plugins": "^2.1.1" } } diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index 8069f82678..ab3aa2b78c 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.2.0-SNAPSHOT + 2.1.1 scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.2.0-SNAPSHOT + 2.1.1 smp diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index ea2cacc2d8..43854a0082 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.1.0", + "version": "2.1.1", "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { @@ -19,6 +19,6 @@ }, "prettier": "@scm-manager/prettier-config", "dependencies": { - "@scm-manager/ui-plugins": "^2.1.0" + "@scm-manager/ui-plugins": "^2.1.1" } } diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 154af84d44..4812066cb3 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.2.0-SNAPSHOT + 2.1.1 scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index 5b4a881ad8..de92dc7beb 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-server - 2.2.0-SNAPSHOT + 2.1.1 scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 78b213f594..60908482f2 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-test - 2.2.0-SNAPSHOT + 2.1.1 scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.2.0-SNAPSHOT + 2.1.1 diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index 86da9d94d7..0c81467d5c 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-ui war - 2.2.0-SNAPSHOT + 2.1.1 scm-ui diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 87871564f7..7bbd35e789 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.1.0", + "version": "2.1.1", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index 296e4570ea..6ca49827fd 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,12 +1,12 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.1.0", + "version": "2.1.1", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "^2.1.0", + "@scm-manager/ui-components": "^2.1.1", "@scm-manager/ui-extensions": "^2.1.0", "classnames": "^2.2.6", "query-string": "^5.0.1", diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 1655fa19aa..c9aa79a570 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,9 +1,9 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.1.0", + "version": "2.1.1", "private": true, "dependencies": { - "@scm-manager/ui-components": "^2.1.0", + "@scm-manager/ui-components": "^2.1.1", "@scm-manager/ui-extensions": "^2.1.0", "classnames": "^2.2.5", "history": "^4.10.1", diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 50ff2a3121..4fd7806f92 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-webapp war - 2.2.0-SNAPSHOT + 2.1.1 scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.2.0-SNAPSHOT + 2.1.1 provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.2.0-SNAPSHOT + 2.1.1 sonia.scm scm-dao-xml - 2.2.0-SNAPSHOT + 2.1.1 @@ -332,7 +332,7 @@ sonia.scm scm-test - 2.2.0-SNAPSHOT + 2.1.1 test @@ -394,7 +394,7 @@ sonia.scm.plugins scm-git-plugin - 2.2.0-SNAPSHOT + 2.1.1 tests test @@ -402,14 +402,14 @@ sonia.scm.plugins scm-git-plugin - 2.2.0-SNAPSHOT + 2.1.1 test sonia.scm.plugins scm-hg-plugin - 2.2.0-SNAPSHOT + 2.1.1 tests test @@ -417,14 +417,14 @@ sonia.scm.plugins scm-hg-plugin - 2.2.0-SNAPSHOT + 2.1.1 test sonia.scm.plugins scm-svn-plugin - 2.2.0-SNAPSHOT + 2.1.1 tests test @@ -432,7 +432,7 @@ sonia.scm.plugins scm-svn-plugin - 2.2.0-SNAPSHOT + 2.1.1 test @@ -718,7 +718,7 @@ sonia.scm scm-ui - 2.2.0-SNAPSHOT + 2.1.1 war From c5f2502e6f109b257063d9954bd6548a1284c6eb Mon Sep 17 00:00:00 2001 From: CES Marvin Date: Tue, 23 Jun 2020 16:22:47 +0000 Subject: [PATCH 16/17] 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-packaging/deb/pom.xml | 6 +++--- scm-packaging/docker/pom.xml | 4 ++-- scm-packaging/helm/pom.xml | 4 ++-- scm-packaging/pom.xml | 4 ++-- scm-packaging/release-yaml/pom.xml | 4 ++-- scm-packaging/rpm/pom.xml | 6 +++--- scm-packaging/unix/pom.xml | 4 ++-- scm-packaging/windows/pom.xml | 4 ++-- 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 +++++++++++++------------- 23 files changed, 72 insertions(+), 72 deletions(-) diff --git a/pom.xml b/pom.xml index 355f8d0b7f..db981176f6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ sonia.scm scm pom - 2.1.1 + 2.2.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 8b2d3e97b9..d2c4b4656e 100644 --- a/scm-annotation-processor/pom.xml +++ b/scm-annotation-processor/pom.xml @@ -31,12 +31,12 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-annotation-processor - 2.1.1 + 2.2.0-SNAPSHOT scm-annotation-processor @@ -46,7 +46,7 @@ sonia.scm scm-annotations - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml index d25e67bfaf..ff9e074223 100644 --- a/scm-annotations/pom.xml +++ b/scm-annotations/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT scm-annotations - 2.1.1 + 2.2.0-SNAPSHOT scm-annotations diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 7e7d0e9bed..ff62629f03 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -31,11 +31,11 @@ scm sonia.scm - 2.1.1 + 2.2.0-SNAPSHOT scm-core - 2.1.1 + 2.2.0-SNAPSHOT scm-core @@ -54,7 +54,7 @@ sonia.scm scm-annotations - 2.1.1 + 2.2.0-SNAPSHOT @@ -221,7 +221,7 @@ sonia.scm scm-annotation-processor - 2.1.1 + 2.2.0-SNAPSHOT provided diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index fd582451aa..2dddf39386 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -31,11 +31,11 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT scm-dao-xml - 2.1.1 + 2.2.0-SNAPSHOT scm-dao-xml @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.1.1 + 2.2.0-SNAPSHOT @@ -58,7 +58,7 @@ sonia.scm scm-test - 2.1.1 + 2.2.0-SNAPSHOT test diff --git a/scm-it/pom.xml b/scm-it/pom.xml index e9b0c25641..5206830d97 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -31,40 +31,40 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-it war - 2.1.1 + 2.2.0-SNAPSHOT scm-it sonia.scm scm-core - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-test - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm.plugins scm-git-plugin - 2.1.1 + 2.2.0-SNAPSHOT test sonia.scm.plugins scm-git-plugin - 2.1.1 + 2.2.0-SNAPSHOT tests test @@ -72,14 +72,14 @@ sonia.scm.plugins scm-hg-plugin - 2.1.1 + 2.2.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.1.1 + 2.2.0-SNAPSHOT tests test @@ -87,14 +87,14 @@ sonia.scm.plugins scm-svn-plugin - 2.1.1 + 2.2.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.1.1 + 2.2.0-SNAPSHOT tests test diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index a9655700dd..7a3d0c9b47 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT deb deb - 2.1.1 + 2.2.0-SNAPSHOT Packaging for Debian/Ubuntu deb @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-packaging/docker/pom.xml b/scm-packaging/docker/pom.xml index 6dd41435c7..1b3d10143b 100644 --- a/scm-packaging/docker/pom.xml +++ b/scm-packaging/docker/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT docker pom - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-packaging/helm/pom.xml b/scm-packaging/helm/pom.xml index d2a8a6124f..3b2dff90f4 100644 --- a/scm-packaging/helm/pom.xml +++ b/scm-packaging/helm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT helm helm - 2.1.1 + 2.2.0-SNAPSHOT 3.2.1 diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml index 5799edfe50..ff519e91a5 100644 --- a/scm-packaging/pom.xml +++ b/scm-packaging/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm.packaging scm-packaging pom - 2.1.1 + 2.2.0-SNAPSHOT packages.scm-manager.org diff --git a/scm-packaging/release-yaml/pom.xml b/scm-packaging/release-yaml/pom.xml index 11fe6097bd..694ca48fff 100644 --- a/scm-packaging/release-yaml/pom.xml +++ b/scm-packaging/release-yaml/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT release-yaml pom - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index e0c24c77ea..fa5743c9c5 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT rpm rpm - 2.1.1 + 2.2.0-SNAPSHOT Packaging for RedHat/Centos/Fedora rpm @@ -46,7 +46,7 @@ sonia.scm scm-server - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-packaging/unix/pom.xml b/scm-packaging/unix/pom.xml index b49dce50dc..e4f72df8ef 100644 --- a/scm-packaging/unix/pom.xml +++ b/scm-packaging/unix/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT unix pom - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-packaging/windows/pom.xml b/scm-packaging/windows/pom.xml index 2a8d446fbf..cdc1bcdf4d 100644 --- a/scm-packaging/windows/pom.xml +++ b/scm-packaging/windows/pom.xml @@ -32,12 +32,12 @@ sonia.scm.packaging scm-packaging - 2.1.1 + 2.2.0-SNAPSHOT windows pom - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 1c4f6e3e8a..d4696c5ce8 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -31,13 +31,13 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm.plugins scm-plugins pom - 2.1.1 + 2.2.0-SNAPSHOT scm-plugins @@ -59,7 +59,7 @@ sonia.scm scm-core - 2.1.1 + 2.2.0-SNAPSHOT provided @@ -68,7 +68,7 @@ sonia.scm scm-annotation-processor - 2.1.1 + 2.2.0-SNAPSHOT provided @@ -98,7 +98,7 @@ sonia.scm scm-test - 2.1.1 + 2.2.0-SNAPSHOT test diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 53bf44f810..6e4db9e3f3 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.1 + 2.2.0-SNAPSHOT scm-git-plugin diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 8fe52cf4fd..dbf85955d8 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.1 + 2.2.0-SNAPSHOT scm-hg-plugin diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml index ab3aa2b78c..8069f82678 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.1 + 2.2.0-SNAPSHOT scm-legacy-plugin Support migrated repository urls and v1 passwords - 2.1.1 + 2.2.0-SNAPSHOT smp diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 4812066cb3..154af84d44 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.1 + 2.2.0-SNAPSHOT scm-svn-plugin diff --git a/scm-server/pom.xml b/scm-server/pom.xml index de92dc7beb..5b4a881ad8 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-server - 2.1.1 + 2.2.0-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 60908482f2..78b213f594 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -31,12 +31,12 @@ scm sonia.scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-test - 2.1.1 + 2.2.0-SNAPSHOT scm-test @@ -50,7 +50,7 @@ sonia.scm scm-core - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index 0c81467d5c..86da9d94d7 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-ui war - 2.1.1 + 2.2.0-SNAPSHOT scm-ui diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 4fd7806f92..50ff2a3121 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -32,13 +32,13 @@ sonia.scm scm - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-webapp war - 2.1.1 + 2.2.0-SNAPSHOT scm-webapp @@ -48,7 +48,7 @@ sonia.scm scm-annotation-processor - 2.1.1 + 2.2.0-SNAPSHOT provided @@ -73,13 +73,13 @@ sonia.scm scm-core - 2.1.1 + 2.2.0-SNAPSHOT sonia.scm scm-dao-xml - 2.1.1 + 2.2.0-SNAPSHOT @@ -332,7 +332,7 @@ sonia.scm scm-test - 2.1.1 + 2.2.0-SNAPSHOT test @@ -394,7 +394,7 @@ sonia.scm.plugins scm-git-plugin - 2.1.1 + 2.2.0-SNAPSHOT tests test @@ -402,14 +402,14 @@ sonia.scm.plugins scm-git-plugin - 2.1.1 + 2.2.0-SNAPSHOT test sonia.scm.plugins scm-hg-plugin - 2.1.1 + 2.2.0-SNAPSHOT tests test @@ -417,14 +417,14 @@ sonia.scm.plugins scm-hg-plugin - 2.1.1 + 2.2.0-SNAPSHOT test sonia.scm.plugins scm-svn-plugin - 2.1.1 + 2.2.0-SNAPSHOT tests test @@ -432,7 +432,7 @@ sonia.scm.plugins scm-svn-plugin - 2.1.1 + 2.2.0-SNAPSHOT test @@ -718,7 +718,7 @@ sonia.scm scm-ui - 2.1.1 + 2.2.0-SNAPSHOT war From a64fad96226b73473c3772bb029ea4ddec61a4dc Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 24 Jun 2020 07:07:20 +0200 Subject: [PATCH 17/17] update winsw to v2.9.0 --- scm-packaging/windows/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-packaging/windows/pom.xml b/scm-packaging/windows/pom.xml index cdc1bcdf4d..3041009d2e 100644 --- a/scm-packaging/windows/pom.xml +++ b/scm-packaging/windows/pom.xml @@ -71,11 +71,11 @@ wget - https://github.com/winsw/winsw/releases/download/v2.8.0/WinSW.NETCore31.x64.exe + https://github.com/winsw/winsw/releases/download/v2.9.0/WinSW.NETCore31.x64.exe false scm-server.exe ${project.build.directory}/windows - ebb2bb0ab0746ff5a20f65c76855a71c53aa806eb55ebd08fd18ded51ea23b58 + 59d29a41652cfc9a564c9c05d77976391833a6fb686bce941ad89f8f8dff120b