diff --git a/CHANGELOG.md b/CHANGELOG.md index c3f417e570..42479c8a5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Extension point to add links to the repository cards from plug ins ([#1041](https://github.com/scm-manager/scm-manager/pull/1041)) ### Fixed +- Build on windows ([#1048](https://github.com/scm-manager/scm-manager/issues/1048), [#1049](https://github.com/scm-manager/scm-manager/issues/1049), [#1056](https://github.com/scm-manager/scm-manager/pull/1056)) - Show specific notification for plugin actions on plugin administration ([#1057](https://github.com/scm-manager/scm-manager/pull/1057)) ## 2.0.0-rc5 - 2020-03-12 diff --git a/docs/Home.md b/docs/Home.md index bd3008f3dd..02bb5f4e8d 100644 --- a/docs/Home.md +++ b/docs/Home.md @@ -118,7 +118,7 @@ for more information. - [i18n for Plugins](v2/i18n%20for%20Plugins.md "wikilink") - [Extension Points](v2/Extension-Points.md "wikilink") - [API changes](v2/API%20changes.md "wikilink") -- [ui-components/ui-types](v2/UI:%20Additions%20or%20Changes%20to%20ui-components%20or%20ui-types.md "wikilink") +- [ui-components/ui-types](v2/UI%20Additions%20or%20Changes%20to%20ui-components%20or%20ui-types.md "wikilink") - [Vulnerabilities](v2/vulnerabilities.md "wikilink") - [Common pitfall](v2/Common%20pitfall.md "wikilink") - [Release process](v2/Release%20process.md "wikilink") diff --git a/docs/screenshots/logo_transparent.png b/docs/screenshots/logo_transparent.png new file mode 100644 index 0000000000..0f238a38ba Binary files /dev/null and b/docs/screenshots/logo_transparent.png differ diff --git a/docs/v2/UI: Additions or Changes to ui-components or ui-types.md b/docs/v2/UI Additions or Changes to ui-components or ui-types.md similarity index 100% rename from docs/v2/UI: Additions or Changes to ui-components or ui-types.md rename to docs/v2/UI Additions or Changes to ui-components or ui-types.md diff --git a/pom.xml b/pom.xml index d3301168cb..ae2abd7a70 100644 --- a/pom.xml +++ b/pom.xml @@ -828,7 +828,7 @@ 2.28.2 1.3 - 5.2.0 + 5.6.0 1.7.30 diff --git a/scm-it/pom.xml b/scm-it/pom.xml index efcc59d212..e2038e2816 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -84,7 +84,7 @@ org.glassfish javax.json - 1.0.4 + 1.1.4 runtime diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolRequestMockFactory.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolRequestMockFactory.java index d1f5124b3a..e319b07608 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolRequestMockFactory.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolRequestMockFactory.java @@ -3,12 +3,12 @@ package sonia.scm.web; import com.google.common.collect.Lists; import javax.servlet.http.HttpServletRequest; - import java.util.Collections; import java.util.List; import java.util.Locale; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class WireProtocolRequestMockFactory { @@ -88,7 +88,6 @@ public class WireProtocolRequestMockFactory { private HttpServletRequest base(String method, String queryStringValue) { HttpServletRequest request = mock(HttpServletRequest.class); - when(request.getRequestURI()).thenReturn(repositoryPath); when(request.getMethod()).thenReturn(method); queryString(request, queryStringValue); diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolTest.java index 9237127c88..40af1acfeb 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolTest.java @@ -47,7 +47,10 @@ import java.util.Collections; import java.util.List; import static org.hamcrest.Matchers.contains; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; /** @@ -98,7 +101,6 @@ public class WireProtocolTest { @Test public void testGetCommandsOfWithHgArgsPost() throws IOException { - when(request.getMethod()).thenReturn("POST"); when(request.getQueryString()).thenReturn("cmd=batch"); when(request.getIntHeader("X-HgArgs-Post")).thenReturn(29); when(request.getHeaderNames()).thenReturn(Collections.enumeration(Lists.newArrayList("X-HgArgs-Post"))); diff --git a/scm-server/pom.xml b/scm-server/pom.xml index 4abaa49dc1..984b7d2ceb 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -196,7 +196,7 @@ BSD 3-Clause www.scm-manager.org ${project.description} - Sebastian Sdorra <s.sdorra@gmail.com> + Sebastian Sdorra <s.sdorra@gmail.com> noarch linux @@ -306,7 +306,7 @@ - 1.1.0 + 1.2.2 1.1.0 ${project.build.directory}/appassembler/commons-daemon/scm-server diff --git a/scm-ui/ui-scripts/src/lerna.js b/scm-ui/ui-scripts/src/lerna.js index b5404fbd62..6479b112fb 100644 --- a/scm-ui/ui-scripts/src/lerna.js +++ b/scm-ui/ui-scripts/src/lerna.js @@ -1,7 +1,10 @@ const { spawnSync } = require("child_process"); +const os = require("os"); + +const yarnCmd = os.platform() === "win32" ? "yarn.cmd" : "yarn"; const yarn = args => { - const result = spawnSync("yarn", args, { stdio: "inherit" }); + const result = spawnSync(yarnCmd, args, { stdio: "inherit" }); if (result.error) { console.log("could not start yarn command:", result.error); process.exit(2); diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 86740eccd9..e007a210ae 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.11.2", - "bulma": "^0.7.5", + "bulma": "^0.8.0", "bulma-popover": "^1.0.0", "bulma-tooltip": "^3.0.0", "react-diff-view": "^2.4.1"