From def8f0b1674ba3435eab1b1315edb7ba35c84f12 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Fri, 9 Apr 2021 11:48:43 -0400 Subject: [PATCH 01/20] touch .whitesource --- .whitesource | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.whitesource b/.whitesource index ca1fde54..a9734ea3 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", @@ -16,4 +16,4 @@ "remediateSettings": { "extends": ["github>whitesource/merge-confidence:beta"] } -} \ No newline at end of file +} From 21191d0ffebdafc7bfad37b515fd7e723c40b798 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Fri, 9 Apr 2021 16:42:39 -0400 Subject: [PATCH 02/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index a9734ea3..d6982a76 100644 --- a/.whitesource +++ b/.whitesource @@ -1,5 +1,5 @@ { - "scanSettings": { + "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", "projectToken": "", From f08f46aad1364e167ec3e9aa798c3192f1229176 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Fri, 9 Apr 2021 16:47:00 -0400 Subject: [PATCH 03/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index d6982a76..c4f053ed 100644 --- a/.whitesource +++ b/.whitesource @@ -1,5 +1,5 @@ { - "scanSettings": { + "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", "projectToken": "", From c16669320ff5c67950f49fbf214ae80c67a63bf1 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Fri, 9 Apr 2021 16:51:04 -0400 Subject: [PATCH 04/20] touch pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fecc82b6..2b727662 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ - + mysql mysql-connector-java 5.1.24 From 74a4c5043cd9a35bd3a0421bc55405b31964ddc8 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Mon, 12 Apr 2021 09:41:54 -0400 Subject: [PATCH 05/20] Update POM.xml to use mariadb-java-client instead of mysql. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 2b727662..37a751a6 100644 --- a/pom.xml +++ b/pom.xml @@ -101,11 +101,18 @@ + + + org.mariadb.jdbc + mariadb-java-client + 2.7.2 + From 1e38b12dfd3ab27565eec82f88ac13df77fc38b4 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 13 Apr 2021 14:51:52 -0400 Subject: [PATCH 06/20] Switched back to mysql. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 37a751a6..9f858372 100644 --- a/pom.xml +++ b/pom.xml @@ -101,19 +101,19 @@ - + org.owasp.encoder From cafc4d493389d6339107b285fb7bc0cf5a1a8647 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 13:27:28 -0400 Subject: [PATCH 07/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index c4f053ed..ad794fc7 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From 5e1f4d193272ba1dff79430144c81e04533d2151 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 13:34:30 -0400 Subject: [PATCH 08/20] touch .whitesource, fix typo in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f858372..95b4f390 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ -- + mysql mysql-connector-java From 90c074b74092462f2a95dd571b48e11b619e63cc Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 15:17:18 -0400 Subject: [PATCH 09/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index ad794fc7..cf7733dd 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From bf602f7717d1fdcf688b0d3fcd08e1f31015468f Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 15:20:30 -0400 Subject: [PATCH 10/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index cf7733dd..ad794fc7 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From 40e3ef7a7e802f16ac3d5ef156073070e5b328f5 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 15:25:22 -0400 Subject: [PATCH 11/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index ad794fc7..cf7733dd 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From 53102a07d904db2b02d08dafb08ba20422f3c6b8 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 15:44:54 -0400 Subject: [PATCH 12/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index cf7733dd..ad794fc7 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From 541491fa94259d03f06692044fe0bbf16a9b0665 Mon Sep 17 00:00:00 2001 From: "Gary M. Segal" Date: Tue, 27 Apr 2021 20:25:52 -0400 Subject: [PATCH 13/20] touch .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index ad794fc7..cf7733dd 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From ae160dc8f200af4cdf31f75383d50cc0ff09cb83 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Mon, 25 Apr 2022 22:29:41 -0400 Subject: [PATCH 14/20] Update .whitesource --- .whitesource | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index cf7733dd..832766d5 100644 --- a/.whitesource +++ b/.whitesource @@ -4,7 +4,8 @@ "configExternalURL": "", "projectToken": "", "baseBranches": [], - "enableLicenseViolations": true + "enableLicenseViolations": true, + "enableSAST" : "true" }, "checkRunSettings": { "vulnerableCheckRunConclusionLevel": "failure", From 2f8c3546469435a8572a450a0e6ad10c4fe187f7 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Tue, 26 Apr 2022 20:02:58 -0400 Subject: [PATCH 15/20] Update .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index 832766d5..1ec9ab2d 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From 1abfa80215db5597e96deb35b4df085c735fa858 Mon Sep 17 00:00:00 2001 From: GarySegal Date: Thu, 12 May 2022 15:57:47 -0400 Subject: [PATCH 16/20] Enabe runPreStep --- .whitesource | 2 +- whitesource.config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index 1ec9ab2d..8e89500a 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", diff --git a/whitesource.config b/whitesource.config index 5313cb1a..fdcb33f7 100644 --- a/whitesource.config +++ b/whitesource.config @@ -1 +1,2 @@ excludes=**/MobileShepherd/** +maven.runPreStep=true From d508f4904280c540887007f04547431ae29ac561 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Fri, 3 Jun 2022 17:57:10 -0400 Subject: [PATCH 17/20] Update .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index 8e89500a..1ec9ab2d 100644 --- a/.whitesource +++ b/.whitesource @@ -1,4 +1,4 @@ -{ +{ "scanSettings": { "configMode": "LOCAL", "configExternalURL": "", From 6b955346e11ebd687674d4f6c0a960343766b2e0 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Wed, 18 Jan 2023 16:55:36 -0500 Subject: [PATCH 18/20] Update .whitesource --- .whitesource | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.whitesource b/.whitesource index 1ec9ab2d..55622384 100644 --- a/.whitesource +++ b/.whitesource @@ -4,9 +4,12 @@ "configExternalURL": "", "projectToken": "", "baseBranches": [], - "enableLicenseViolations": true, - "enableSAST" : "true" + "enableLicenseViolations": true }, + "scanSettingsSAST" : { + "enableScan": true, + "scanPullRequests": true + } "checkRunSettings": { "vulnerableCheckRunConclusionLevel": "failure", "displayMode": "diff" From 7ffe9138a09d9804d373f8e7b85cfdcf29007860 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Wed, 18 Jan 2023 16:56:57 -0500 Subject: [PATCH 19/20] Update .whitesource --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index 55622384..160a957f 100644 --- a/.whitesource +++ b/.whitesource @@ -9,7 +9,7 @@ "scanSettingsSAST" : { "enableScan": true, "scanPullRequests": true - } + }, "checkRunSettings": { "vulnerableCheckRunConclusionLevel": "failure", "displayMode": "diff" From 73c55353a5ad00390cfdd2d79c694894c767dd97 Mon Sep 17 00:00:00 2001 From: garymsegal-ws <81635613+garymsegal-ws@users.noreply.github.com> Date: Thu, 19 Jan 2023 14:34:00 -0500 Subject: [PATCH 20/20] Update .whitesource --- .whitesource | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.whitesource b/.whitesource index 160a957f..28181b5b 100644 --- a/.whitesource +++ b/.whitesource @@ -1,23 +1,3 @@ { - "scanSettings": { - "configMode": "LOCAL", - "configExternalURL": "", - "projectToken": "", - "baseBranches": [], - "enableLicenseViolations": true - }, - "scanSettingsSAST" : { - "enableScan": true, - "scanPullRequests": true - }, - "checkRunSettings": { - "vulnerableCheckRunConclusionLevel": "failure", - "displayMode": "diff" - }, - "issueSettings": { - "minSeverityLevel": "MEDIUM" - }, - "remediateSettings": { - "extends": ["github>whitesource/merge-confidence:beta"] - } + "settingsInheritedFrom": "gms-ws-sandbox/whitesource-config@main" }