From 60b6e42fccc2dc2181c4ff8e7c095b9759ff52c0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 16:20:21 +0100 Subject: [PATCH 01/22] skip unit tests in integration test stage --- Jenkinsfile | 2 +- pom.xml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 010a583f6e..bd8cfd25ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ node('docker') { } stage('Integration Test') { - mvn 'verify -Pit -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true' + mvn 'verify -Pit -DskipUnitTests -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true' } stage('SonarQube') { diff --git a/pom.xml b/pom.xml index a472742c11..f8952bbd6a 100644 --- a/pom.xml +++ b/pom.xml @@ -480,6 +480,13 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 + + + ${skipUnitTests} + @@ -881,7 +888,9 @@ ./scm-ui/target/frontend/buildfrontend-node/node-v${nodejs.version}-linux-x64/bin/node - + + ${skipTests} From 6e1102dbd5e0d2357155c1aaf320c9af7d42c98a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 09:54:09 +0100 Subject: [PATCH 02/22] added more options to control which frontend scripts are executed durring build --- scm-ui/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml index 3525b79563..d4023998f6 100644 --- a/scm-ui/pom.xml +++ b/scm-ui/pom.xml @@ -18,8 +18,9 @@ build - false false + ${skipTests} + false typescript ui-extensions/src,ui-components/src,ui-webapp/src **/*.test.js,src/tests/** @@ -88,6 +89,7 @@ run + ${skipFrontendBuild} @@ -99,7 +101,7 @@ - ${skipTests} + ${skipFrontendTests} From bf15f7af7aca334f9bb3ce6e3a457c31e28c74d0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 09:54:42 +0100 Subject: [PATCH 03/22] skipt frontend build and scm-it in unit-test stage --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bd8cfd25ee..8364f77832 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ node('docker') { } stage('Unit Test') { - mvn 'test -Pcoverage -Dmaven.test.failure.ignore=true' + mvn 'test -DskipFrontendBuild -DskipTypecheck -Pcoverage -pl !scm-it -Dmaven.test.failure.ignore=true' } stage('Integration Test') { From 94d9c574a240c8380b954312c750ee7e39e0cd42 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 10:14:59 +0100 Subject: [PATCH 04/22] execute unit tests and integration tests in parallel --- Jenkinsfile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8364f77832..d90856d619 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,13 +32,18 @@ node('docker') { mvn 'clean install -DskipTests' } - stage('Unit Test') { - mvn 'test -DskipFrontendBuild -DskipTypecheck -Pcoverage -pl !scm-it -Dmaven.test.failure.ignore=true' - } - - stage('Integration Test') { - mvn 'verify -Pit -DskipUnitTests -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true' - } + parallel( + unitTest: { + stage('Unit Test') { + mvn 'test -DskipFrontendBuild -DskipTypecheck -Pcoverage -pl !scm-it -Dmaven.test.failure.ignore=true' + } + }, + integrationTest: { + stage('Integration Test') { + mvn 'verify -Pit -DskipUnitTests -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true' + } + } + ) stage('SonarQube') { From c262d5daf4e85c56780e2c11e7eff57191f9fc00 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 12:12:57 +0100 Subject: [PATCH 05/22] disable application logs durring ci build --- Jenkinsfile | 2 + scm-webapp/src/main/resources/logback.ci.xml | 39 ++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 scm-webapp/src/main/resources/logback.ci.xml diff --git a/Jenkinsfile b/Jenkinsfile index d90856d619..6c78155a85 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -109,6 +109,8 @@ String mainBranch Maven setupMavenBuild() { Maven mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.6_10") + // disable logging durring the build + mvn.additionalArgs += ' -Dlogback.configurationFile=scm-webapp/src/main/resources/logback.ci.xml' if (isMainBranch()) { // Release starts javadoc, which takes very long, so do only for certain branches diff --git a/scm-webapp/src/main/resources/logback.ci.xml b/scm-webapp/src/main/resources/logback.ci.xml new file mode 100644 index 0000000000..428d3e1350 --- /dev/null +++ b/scm-webapp/src/main/resources/logback.ci.xml @@ -0,0 +1,39 @@ + + + + + + + + From 6e59a654a687c7b70ab2358f77d15f4fbc1106cd Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 12:20:37 +0100 Subject: [PATCH 06/22] reduce massive webpack output --- scm-ui/ui-scripts/src/createPluginConfig.js | 1 + scm-ui/ui-scripts/src/webpack.config.js | 1 + 2 files changed, 2 insertions(+) diff --git a/scm-ui/ui-scripts/src/createPluginConfig.js b/scm-ui/ui-scripts/src/createPluginConfig.js index 3e210fa022..6057ccc997 100644 --- a/scm-ui/ui-scripts/src/createPluginConfig.js +++ b/scm-ui/ui-scripts/src/createPluginConfig.js @@ -19,6 +19,7 @@ module.exports = function(mode) { [name]: [path.resolve(__dirname, "webpack-public-path.js"), packageJSON.main || "src/main/js/index.js"] }, mode, + stats: "minimal", devtool: "source-map", target: "web", node: { diff --git a/scm-ui/ui-scripts/src/webpack.config.js b/scm-ui/ui-scripts/src/webpack.config.js index cf63c1da3c..e6cc362a67 100644 --- a/scm-ui/ui-scripts/src/webpack.config.js +++ b/scm-ui/ui-scripts/src/webpack.config.js @@ -25,6 +25,7 @@ console.log(`build ${mode} bundles`); module.exports = [ { mode, + stats: "minimal", context: root, entry: { webapp: [path.resolve(__dirname, "webpack-public-path.js"), "./ui-webapp/src/index.tsx"] From b8998b1dfff08f704a85a37af7a30ac843e7397e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 12:49:30 +0100 Subject: [PATCH 07/22] reove duplicated jaxb implementation --- pom.xml | 6 ------ scm-core/pom.xml | 5 ----- 2 files changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index f8952bbd6a..f936b8890d 100644 --- a/pom.xml +++ b/pom.xml @@ -399,12 +399,6 @@ ${jaxb.version} - - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - - org.glassfish.jaxb jaxb-runtime diff --git a/scm-core/pom.xml b/scm-core/pom.xml index ec3b884fd6..3c7d67c2d8 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -152,11 +152,6 @@ jaxb-api - - com.sun.xml.bind - jaxb-impl - - org.glassfish.jaxb jaxb-runtime From 52fb900cf3677e842f66adbc95769ec6acd25a5a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 Mar 2020 12:56:38 +0100 Subject: [PATCH 08/22] reduce logging of scm-it test instance --- Jenkinsfile | 4 +++- scm-it/pom.xml | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6c78155a85..6257958546 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,9 @@ String mainBranch Maven setupMavenBuild() { Maven mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.6_10") // disable logging durring the build - mvn.additionalArgs += ' -Dlogback.configurationFile=scm-webapp/src/main/resources/logback.ci.xml' + def logConf = "scm-webapp/src/main/resources/logback.ci.xml" + mvn.additionalArgs += " -Dlogback.configurationFile=${logConf}" + mvn.additionalArgs += " -Dscm-it.logbackConfiguration=${logConf}" if (isMainBranch()) { // Release starts javadoc, which takes very long, so do only for certain branches diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 9064a39fc1..8cc56d332f 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -204,6 +204,10 @@ sonia.scm.classloading.lifecycle simple + + logback.configurationFile + ${scm-it.logbackConfiguration} + /scm @@ -237,10 +241,10 @@ DEVELOPMENT target/scm-it + ${project.basedir}/../scm-webapp/src/main/resources/logback.default.xml - From b3fe97309624f729d4bfc3155a330aff71288e29 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 16 Mar 2020 22:15:39 +0000 Subject: [PATCH 09/22] fix: upgrade com.fasterxml.jackson.core:jackson-core from 2.10.0 to 2.10.2 Snyk has created this PR to upgrade com.fasterxml.jackson.core:jackson-core from 2.10.0 to 2.10.2. See this package in NPM: https://www.npmjs.com/package/com.fasterxml.jackson.core:jackson-core See this project in Snyk: https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?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 d3301168cb..6104fd2f1f 100644 --- a/pom.xml +++ b/pom.xml @@ -838,7 +838,7 @@ 2.1.1 4.4.2.Final 1.19.4 - 2.10.0 + 2.10.2 4.2.2 2.3.0 6.1.0.Final From 2114923932cd7e086094fd6d8613e444f470f2c1 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 16 Mar 2020 22:15:45 +0000 Subject: [PATCH 10/22] fix: upgrade org.mapstruct:mapstruct-jdk8 from 1.2.0.Final to 1.3.1.Final Snyk has created this PR to upgrade org.mapstruct:mapstruct-jdk8 from 1.2.0.Final to 1.3.1.Final. See this package in NPM: https://www.npmjs.com/package/org.mapstruct:mapstruct-jdk8 See this project in Snyk: https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?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 d3301168cb..18459d371d 100644 --- a/pom.xml +++ b/pom.xml @@ -871,7 +871,7 @@ UTF-8 SCM-BSD - 1.2.0.Final + 1.3.1.Final From 882f2f074411e2a0052217011d3f206905ebe917 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 19 Mar 2020 22:15:57 +0000 Subject: [PATCH 11/22] fix: upgrade org.apache.shiro:shiro-core from 1.4.1 to 1.5.1 Snyk has created this PR to upgrade org.apache.shiro:shiro-core from 1.4.1 to 1.5.1. See this package in NPM: https://www.npmjs.com/package/org.apache.shiro:shiro-core See this project in Snyk: https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?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 9143814968..77773a2f54 100644 --- a/pom.xml +++ b/pom.xml @@ -852,7 +852,7 @@ 1.2.0 - 1.4.1 + 1.5.1 5.6.1.202002131546-r-scm1 From 4d88765ea57c96c53af543b6e4dbf64905adaee2 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 19 Mar 2020 22:16:07 +0000 Subject: [PATCH 12/22] fix: upgrade org.hibernate.validator:hibernate-validator from 6.1.0.Final to 6.1.2.Final Snyk has created this PR to upgrade org.hibernate.validator:hibernate-validator from 6.1.0.Final to 6.1.2.Final. See this package in NPM: https://www.npmjs.com/package/org.hibernate.validator:hibernate-validator See this project in Snyk: https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?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 9143814968..4d0ec84f9f 100644 --- a/pom.xml +++ b/pom.xml @@ -841,7 +841,7 @@ 2.10.2 4.2.2 2.3.0 - 6.1.0.Final + 6.1.2.Final 1.6.2 From 00f99eb603586edb3bd28bdf2ad7a788c2c3e778 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 19 Mar 2020 22:16:11 +0000 Subject: [PATCH 13/22] fix: upgrade de.otto.edison:edison-hal from 2.0.1 to 2.1.0 Snyk has created this PR to upgrade de.otto.edison:edison-hal from 2.0.1 to 2.1.0. See this package in NPM: https://www.npmjs.com/package/de.otto.edison:edison-hal See this project in Snyk: https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?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 9143814968..43900ce51e 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ de.otto.edison edison-hal - 2.0.1 + 2.1.0 From 0e7a88d0d66bfd871b12d192c737aad864871b7e Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 20 Mar 2020 01:00:09 +0000 Subject: [PATCH 14/22] fix: upgrade org.assertj:assertj-core from 3.10.0 to 3.15.0 Snyk has created this PR to upgrade org.assertj:assertj-core from 3.10.0 to 3.15.0. See this package in NPM: https://www.npmjs.com/package/org.assertj:assertj-core 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 9143814968..816f8e034f 100644 --- a/pom.xml +++ b/pom.xml @@ -358,7 +358,7 @@ org.assertj assertj-core - 3.10.0 + 3.15.0 test From f5cfd0ca6874423908fe3c17c5abb07285890403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 20 Mar 2020 11:44:28 +0100 Subject: [PATCH 15/22] Adapt unit test to new mockito api --- .../sonia/scm/api/v2/resources/GitConfigResourceTest.java | 2 +- .../api/v2/resources/ChangesetCollectionToDtoMapperTest.java | 4 ++-- .../api/v2/resources/DiffResultToDiffResultDtoMapperTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java index a561914b42..b0cada14b1 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java @@ -224,7 +224,7 @@ public class GitConfigResourceTest { assertThat(configurationStoreCaptor.getValue()) .isInstanceOfSatisfying(GitRepositoryConfig.class, x -> { }) .extracting("defaultBranch") - .containsExactly("new"); + .isEqualTo("new"); } private MockHttpResponse get() throws URISyntaxException { diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java index 7653fbe122..8748be3a7e 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java @@ -53,8 +53,8 @@ public class ChangesetCollectionToDtoMapperTest { assertThat(collectionDto.getEmbedded().getItemsBy("branch")) .hasSize(1) .first().matches(b -> b.getLinks().getLinkBy("self").isPresent()) - .extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).first().isEqualTo("/v2/repositories/space/name/branches/someBranch"); + .extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).isEqualTo("/v2/repositories/space/name/branches/someBranch"); assertThat(collectionDto.getEmbedded().getItemsBy("branch")) - .first().extracting("name").first().isEqualTo("someBranch"); + .first().extracting("name").isEqualTo("someBranch"); } } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java index da78d3b652..f19e66fbae 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java @@ -55,7 +55,7 @@ class DiffResultToDiffResultDtoMapperTest { .isPresent() .get() .extracting("href") - .contains("/scm/api/v2/repositories/space/X/diff/123/parsed"); + .isEqualTo("/scm/api/v2/repositories/space/X/diff/123/parsed"); } @Test @@ -67,7 +67,7 @@ class DiffResultToDiffResultDtoMapperTest { .isPresent() .get() .extracting("href") - .contains("/scm/api/v2/repositories/space/X/incoming/feature%2Fsome/master/diff/parsed"); + .isEqualTo("/scm/api/v2/repositories/space/X/incoming/feature%2Fsome/master/diff/parsed"); } private DiffResult createResult() { From 563b6c2a32cbb88a2a69b2b8df105453ac727d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 20 Mar 2020 12:00:38 +0100 Subject: [PATCH 16/22] Update jaxb version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93ee2aa395..fac74102bd 100644 --- a/pom.xml +++ b/pom.xml @@ -841,7 +841,7 @@ 1.19.4 2.10.2 4.2.2 - 2.3.0 + 2.3.1 6.1.2.Final From 42e193ca0b15394469bce6bdf3f21b8c02f2e073 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 20 Mar 2020 15:13:37 +0100 Subject: [PATCH 17/22] fix processing of plugin.xml durring intellij build --- .../java/sonia/scm/annotation/ScmAnnotationProcessor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java b/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java index ec3e2cb10b..7ff46057a3 100644 --- a/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java +++ b/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java @@ -208,10 +208,12 @@ public final class ScmAnnotationProcessor extends AbstractProcessor { return doc; } + @SuppressWarnings("java:S2755") // we need to process https dtd, to avoid breaking intellij compilation on plugins private DocumentBuilder createDocumentBuilder() throws ParserConfigurationException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "https"); factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); + factory.setAttribute(XMLConstants.FEATURE_SECURE_PROCESSING, true); return factory.newDocumentBuilder(); } @@ -338,9 +340,10 @@ public final class ScmAnnotationProcessor extends AbstractProcessor { } } + @SuppressWarnings("java:S2755") // we need to process https dtd, to avoid breaking intellij compilation on plugins private Transformer createTransformer() throws TransformerConfigurationException { TransformerFactory factory = TransformerFactory.newInstance(); - factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "https"); factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); Transformer transformer = factory.newTransformer(); From b9cb0cf56121f7b7afca5656acc39e821413ab9a Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 20 Mar 2020 21:16:10 +0000 Subject: [PATCH 18/22] fix: upgrade org.eclipse.jetty:jetty-jmx from 9.4.26.v20200117 to 9.4.27.v20200227 Snyk has created this PR to upgrade org.eclipse.jetty:jetty-jmx from 9.4.26.v20200117 to 9.4.27.v20200227. See this package in NPM: https://www.npmjs.com/package/org.eclipse.jetty:jetty-jmx See this project in Snyk: https://app.snyk.io/org/scm-manager/project/9ae37cfe-98a5-4b6b-bbf7-ffa5cde55e58?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b9d2d8e69..195eb8c431 100644 --- a/pom.xml +++ b/pom.xml @@ -848,7 +848,7 @@ 1.6.2 - 9.4.26.v20200117 + 9.4.27.v20200227 9.4.22.v20191022 From 727a77e6250c8f6ce33e2658e0facf265f42c078 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 21 Mar 2020 01:00:12 +0000 Subject: [PATCH 19/22] fix: upgrade org.junit-pioneer:junit-pioneer from 0.3.0 to 0.5.4 Snyk has created this PR to upgrade org.junit-pioneer:junit-pioneer from 0.3.0 to 0.5.4. See this package in NPM: https://www.npmjs.com/package/org.junit-pioneer:junit-pioneer 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 6b9d2d8e69..c55ae9a3f9 100644 --- a/pom.xml +++ b/pom.xml @@ -323,7 +323,7 @@ org.junit-pioneer junit-pioneer - 0.3.0 + 0.5.4 test From 86005e6a48c8c30a8cc80fd210ceb1d082612d78 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 21 Mar 2020 01:35:21 +0000 Subject: [PATCH 20/22] fix: upgrade io.jsonwebtoken:jjwt-api from 0.10.5 to 0.11.0 Snyk has created this PR to upgrade io.jsonwebtoken:jjwt-api from 0.10.5 to 0.11.0. See this package in NPM: https://www.npmjs.com/package/io.jsonwebtoken:jjwt-api See this project in Snyk: https://app.snyk.io/org/scm-manager/project/e67572ee-5940-4f2b-93b0-dced62d7ed85?utm_source=github&utm_medium=upgrade-pr --- scm-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index d987b2fcf3..8dd7873238 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -632,7 +632,7 @@ DEVELOPMENT target/scm-it default - 0.10.5 + 0.11.0 2.53.1 1.0 0.9.6-scm1 From 6dacf6495ad817e5f90684a948e58527054a3dd4 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 22 Mar 2020 01:37:25 +0000 Subject: [PATCH 21/22] fix: upgrade org.hibernate.validator:hibernate-validator from 6.1.0.Final to 6.1.2.Final Snyk has created this PR to upgrade org.hibernate.validator:hibernate-validator from 6.1.0.Final to 6.1.2.Final. See this package in NPM: https://www.npmjs.com/package/org.hibernate.validator:hibernate-validator See this project in Snyk: https://app.snyk.io/org/scm-manager/project/e67572ee-5940-4f2b-93b0-dced62d7ed85?utm_source=github&utm_medium=upgrade-pr --- scm-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 8dd7873238..b95f84ef40 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -161,7 +161,7 @@ org.hibernate.validator hibernate-validator - 6.1.0.Final + 6.1.2.Final From fc05e37e90c3ae804f4a18f43a691acbe69de2ef Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 22 Mar 2020 01:37:30 +0000 Subject: [PATCH 22/22] fix: upgrade commons-codec:commons-codec from 1.13 to 1.14 Snyk has created this PR to upgrade commons-codec:commons-codec from 1.13 to 1.14. See this package in NPM: https://www.npmjs.com/package/commons-codec:commons-codec See this project in Snyk: https://app.snyk.io/org/scm-manager/project/e67572ee-5940-4f2b-93b0-dced62d7ed85?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 8376b6cc3d..4fe6c4f475 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,7 @@ commons-codec commons-codec - 1.13 + 1.14