From 5062823ac2627f5e9af01b8affe010fb1d63574c Mon Sep 17 00:00:00 2001 From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 08:09:12 +0000 Subject: [PATCH 1/5] fix: pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 029a6c2..93365b6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent 2.7.12 - + @@ -51,7 +51,7 @@ 8 - 2.14.2 + 2.15.0 6.0.19 6.55.0 From d9f3d0efc0548f2b6ec5b99d4ea01f8f7a05bf61 Mon Sep 17 00:00:00 2001 From: Bill Hamilton Date: Mon, 19 Aug 2024 09:42:44 -0700 Subject: [PATCH 2/5] Update trunk.yaml disabled trunk -> semgrep --- .trunk/trunk.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 1243a67..6a77083 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -7,6 +7,8 @@ plugins: ref: v0.0.5 uri: https://github.com/trunk-io/plugins lint: + disabled: + - semgrep enabled: - semgrep@0.118.0 - shellcheck@0.8.0 From 09a2793a3bda0a8914217b627ab2e313fbe1a05a Mon Sep 17 00:00:00 2001 From: Bill Hamilton Date: Mon, 19 Aug 2024 09:44:10 -0700 Subject: [PATCH 3/5] Update trunk.yaml --- .trunk/trunk.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 6a77083..ee8944d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -10,7 +10,6 @@ lint: disabled: - semgrep enabled: - - semgrep@0.118.0 - shellcheck@0.8.0 - shfmt@3.5.0 - yamllint@1.28.0 From 0cda6458b4fd79334b0ce1324518bdf82176d7e4 Mon Sep 17 00:00:00 2001 From: Bill Hamilton Date: Tue, 20 Aug 2024 12:19:15 -0700 Subject: [PATCH 4/5] modified pom.xml, upgraded sprint --- .gitignore | 2 ++ pom.xml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 23b56ad..4eb1aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -83,4 +83,6 @@ buildNumber.properties # Ignore all local history of files .history +### mac +.DS_Store # End of https://www.gitignore.io/api/java,maven,visualstudiocode diff --git a/pom.xml b/pom.xml index 93365b6..b55d28d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.12 + 3.2.3 @@ -52,7 +52,7 @@ 8 2.15.0 - 6.0.19 + 6.0.23 6.55.0 @@ -92,11 +92,13 @@ ${jackson.version} + com.squareup.okhttp3 From 419a3f5cf2c883ee31a27c24b3b6f0c1b3fcd8ae Mon Sep 17 00:00:00 2001 From: Bill Hamilton Date: Thu, 22 Aug 2024 13:07:29 -0700 Subject: [PATCH 5/5] Update pom.xml removed dependency org.slf4j --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index b55d28d..396b857 100644 --- a/pom.xml +++ b/pom.xml @@ -92,14 +92,6 @@ ${jackson.version} - - com.squareup.okhttp3 okhttp