From 98939cb043c87979b6350a74d2f525b483993b15 Mon Sep 17 00:00:00 2001
From: Spicer-Casey <spicer_casey@bah.com>
Date: Fri, 12 Feb 2021 14:03:22 -0500
Subject: [PATCH] updated jenkins, dependency check, helm, and sonar-scanner

---
 jenkins/kubernetes/Dockerfile                     |  10 +++++-----
 jenkins/kubernetes/Makefile                       |   8 ++++----
 jenkins/kubernetes/prebuild/build-dep.sh          |   2 +-
 .../prebuild/jenkins-dependencies-dcar-1.7.sha256 |   1 -
 .../prebuild/jenkins-dependencies-dcar-1.7.sig    | Bin 566 -> 0 bytes
 .../prebuild/jenkins-dependencies-dcar-1.8.sha256 |   1 +
 .../prebuild/jenkins-dependencies-dcar-1.8.sig    | Bin 0 -> 566 bytes
 jenkins/kubernetes/prebuild/pull-from-centos.sh   |   2 +-
 openshift_helm/Dockerfile                         |   2 +-
 openshift_helm/prebuild/build-dep.sh              |   6 +++---
 .../prebuild/helm-dependencies-dcar-1.7.sha256    |   1 -
 .../prebuild/helm-dependencies-dcar-1.7.sig       | Bin 566 -> 0 bytes
 .../prebuild/helm-dependencies-dcar-1.8.sha256    |   1 +
 .../prebuild/helm-dependencies-dcar-1.8.sig       | Bin 0 -> 566 bytes
 owasp-dep-check/Dockerfile                        |   8 ++++----
 owasp-dep-check/Makefile                          |   2 +-
 owasp-dep-check/prebuild/build-dep.sh             |   2 +-
 .../owasp-dep-check-dependencies-dcar-1.7.sha256  |   1 -
 .../owasp-dep-check-dependencies-dcar-1.7.sig     | Bin 566 -> 0 bytes
 .../owasp-dep-check-dependencies-dcar-1.8.sha256  |   1 +
 .../owasp-dep-check-dependencies-dcar-1.8.sig     | Bin 0 -> 566 bytes
 owasp-dep-check/prebuild/pull-from-centos.sh      |   4 ++--
 sonar-scanner/Dockerfile                          |   4 ++--
 sonar-scanner/Makefile                            |   2 +-
 sonar-scanner/prebuild/build-dep.sh               |   2 +-
 sonar-scanner/prebuild/pull-from-ubi.sh           |   2 +-
 .../sonar-scanner-dependencies-dcar-1.7.sha256    |   1 -
 .../sonar-scanner-dependencies-dcar-1.7.sig       | Bin 566 -> 0 bytes
 .../sonar-scanner-dependencies-dcar-1.8.sha256    |   1 +
 .../sonar-scanner-dependencies-dcar-1.8.sig       | Bin 0 -> 566 bytes
 30 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256
 delete mode 100644 jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig
 create mode 100644 jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256
 create mode 100644 jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sig
 delete mode 100644 openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256
 delete mode 100644 openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig
 create mode 100644 openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256
 create mode 100644 openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig
 delete mode 100644 owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256
 delete mode 100644 owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sig
 create mode 100644 owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256
 create mode 100644 owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig
 delete mode 100644 sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256
 delete mode 100644 sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sig
 create mode 100644 sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256
 create mode 100644 sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig

diff --git a/jenkins/kubernetes/Dockerfile b/jenkins/kubernetes/Dockerfile
index e507bc3..b6d107b 100644
--- a/jenkins/kubernetes/Dockerfile
+++ b/jenkins/kubernetes/Dockerfile
@@ -1,14 +1,14 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.3
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: Jenkins Master" \
       maintainer="terrana_steven@bah.com" \
       vendor="Booz Allen Hamilton" \
-      version="2.263.1" \
-      release="2.263.1" \
+      version="2.263.4" \
+      release="2.263.4" \
       summary="A Jenkins Master container" \
       description="The Jenkins Master container image for the Solutions Delivery Platform"
 
@@ -35,12 +35,12 @@ ENV JENKINS_SLAVE_AGENT_PORT ${agent_port}
 ENV REF $REF
 
 # Use tini as subreaper in Docker container to adopt zombie processes
-ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
+ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
 ARG TINI_VERSION=v0.19.0
 
 # jenkins version being bundled in this docker image
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.263.1}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.263.4}
 
 # Jenkins is run with user `jenkins`, uid = 1000
 # If you bind mount a volume from the host or a data container,
diff --git a/jenkins/kubernetes/Makefile b/jenkins/kubernetes/Makefile
index 0a73f60..64337ea 100644
--- a/jenkins/kubernetes/Makefile
+++ b/jenkins/kubernetes/Makefile
@@ -1,8 +1,8 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = jenkins
-VERSION  = dcar-1.7
-JENKINS_VERSION=2.263.1
+VERSION  = dcar-1.8
+JENKINS_VERSION=2.263.4
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)
@@ -29,8 +29,8 @@ push: ## builds and publishes container image
 build-dep: ## build container dependencies
 	$(eval dir := $(shell pwd))
 	docker run -it -v $(dir)/prebuild:/var/jenkins_home/tmp jenkins/jenkins:${JENKINS_VERSION}-lts /var/jenkins_home/tmp/pull-plugins.sh
-	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/pull-from-centos.sh
-	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/build-dep.sh
+	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/pull-from-centos.sh
+	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/build-dep.sh
 
 info:
 	@echo "$(TAG) -> $$(dirname $$(git ls-files --full-name Makefile))"
diff --git a/jenkins/kubernetes/prebuild/build-dep.sh b/jenkins/kubernetes/prebuild/build-dep.sh
index 1d3203c..917c6fd 100755
--- a/jenkins/kubernetes/prebuild/build-dep.sh
+++ b/jenkins/kubernetes/prebuild/build-dep.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
+SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
 
 cd /root/prebuild
 tar czvf jenkins-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies
diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256
deleted file mode 100644
index 57bf3f3..0000000
--- a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b479ecb13287ea193b4c10eb261f1f78d7c64b1e6f7e79ba8f4088fc1a943b13
diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig
deleted file mode 100644
index af32b4e779e0d03c0675c5206fa5e1b37d36c003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$<PM)&L3#5Rs!x
zhnOK*+<SKr0Dy=fODI#xJPF!G^ZA1%)?-R@BtLLoJ8k@_>+0%pZrIe;)E7FvS3s?V
zv0KUkS68VQnbnz9z!0|Z*dhAo0xx~ARkhzXuSsSESdnA6akTu)`=TL|1i%f4agmd}
zexVPs@ev9(?PM%!R-q-XqIAQ|BR5ro^wgBVNh7~WGmsE6&cgd&HL?MM;j!L~(shg{
zW%SQ^_2{QlyK|a*-oV{J{~MLY8u!d*6H{Gdyf0=I;AFRl!N>kK+6wjrww{}Ns}|w|
zE5qphM=;<cW>O^n;@#zbrk>8EdcN<AdgrZ5v%$7@CJd(leuN6R9kaJE(O=8$8E`kX
zi0iI{nMAqn=9`)5*B(n1td)%e2pZxGi~^AeSf3fgbA*BuZdgr#a*Nt#azAA;#^Ud}
z#{kk4i_E7z0(z<^b{rx4#4g$MG4dxE5kGWZg+DGJkg$EjJf<K&V&>@MOHB}Jly=iB
zdT-g-8Fv~mcKpWexvUnE%_?{ivV&BGwpGu4rILnz&A&+^_G04_%i<q%#c?9;xrnGm
z#8IRbJ(@f6p$9p{3qN_{Pi!7I1en@+uS(MN)$Athvnthd-DEd0wsH(Yj3y!Rsj>fW
z&5;38m=dapi1;rOVMnZSFp#HZxMas~$Ov&4+s({TXn+1Jfg)sC8wzi-6>Z_qYmwpY
Em3tQ#(EtDd

diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256
new file mode 100644
index 0000000..1485f88
--- /dev/null
+++ b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256
@@ -0,0 +1 @@
+20d97fb4bc9614321c4e5feb408919f7b768f50031eed7d649a5860971f20d46
diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sig
new file mode 100644
index 0000000000000000000000000000000000000000..c7e622fe917f859886382253a89b5659608c9de2
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$?V_(Ethw5Rs!x
zhnOK*+*yVY0D|JC!4!rG;o#q>y@i+aif3oO?mw}mHZ2C{E0^M$_;=KDE;QqCs+}g`
zm3~UxNG7TZxGiNioR*t7poJ!n3zCT_j#~7$0l%87iF4E6u+y7uHNL-ImiYNIStW-S
z{GOtieef%k?pcV;8j)ci6)n{jJ+s?iT(4^s)9(|4ZpI(GJ5E95#Zm7uq!;s`@)R9<
zExt%cQ4w*JwA};M*R3Ent?hf6hfQ~S?Syq6U@-X6eaG{TMBA@NlkM8NTozk&FVO11
zPy{Y=&T}P@h*|QRwQA^e+%^2InRC|0ACj@dunr)RT6_l|AIyb>5qcX07S4mo>o=OF
zR!fj8WZwg1)^5Rn`|YY8Ak_-Bb1DCviLYGqeHDjLysk!|r1s}|3<m-w=;`YqyT=^g
z*8G_%lwpqP7hSz4FGE3I?Lats-wTE{)@aw&8bQkT${4y=I;2tm5|i}b+JoYJ4EX7o
z&(Va?F<}n}yO?%qCTU}VXV%T>YZV`X;=Wm{3Rd$1Gjj_;8b@!xr&h%(GsyQ=O%Opd
z79k2Jx`S2Qu3y(W>vBZQUj&GA9-~m+mZD5I;3Oh3YS1SWD&bS)NyTBHzZ}k>Cyj4Y
zF?zW}7V*sh%K!1G#sG3s7eo*W><pl-RxZY(rrVVfa~8HzLI)JMr8~>izh$+eJon!8
E*kYCxg8%>k

literal 0
HcmV?d00001

diff --git a/jenkins/kubernetes/prebuild/pull-from-centos.sh b/jenkins/kubernetes/prebuild/pull-from-centos.sh
index 97c352a..2e0db7d 100755
--- a/jenkins/kubernetes/prebuild/pull-from-centos.sh
+++ b/jenkins/kubernetes/prebuild/pull-from-centos.sh
@@ -4,7 +4,7 @@ set -xe
 
 
 TINI_VERSION=v0.19.0
-JENKINS_VERSION=2.263.1
+JENKINS_VERSION=2.263.4
 
 mkdir /root/prebuild/dependencies/tini/
 curl -kfsSL https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-amd64 -o /root/prebuild/dependencies/tini/tini-${TINI_VERSION}
diff --git a/openshift_helm/Dockerfile b/openshift_helm/Dockerfile
index 148c946..64a68ed 100644
--- a/openshift_helm/Dockerfile
+++ b/openshift_helm/Dockerfile
@@ -15,7 +15,7 @@ LABEL name="Solutions Delivery Platform: Helm" \
       summary="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" \
       description="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform"
 
-ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
+ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
 ARG user=sdp
 ARG group=sdp
 ARG uid=1000
diff --git a/openshift_helm/prebuild/build-dep.sh b/openshift_helm/prebuild/build-dep.sh
index 6c75996..acadc37 100755
--- a/openshift_helm/prebuild/build-dep.sh
+++ b/openshift_helm/prebuild/build-dep.sh
@@ -2,10 +2,10 @@
 
 set -xe
 
-SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
+SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
 OC_VERSION=v3.11.0
-HELM_VERSION=v3.4.1
-KUBECTL_VERSION=v1.19.0
+HELM_VERSION=v3.5.2
+KUBECTL_VERSION=v1.20.0
 
 rm -rf /root/prebuild/dependencies
 mkdir -p /root/prebuild/dependencies
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256
deleted file mode 100644
index a613533..0000000
--- a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig
deleted file mode 100644
index 46fb3b813ac0c832407bb314f74069255a5066bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$<5w*Z>L%5Rs!x
zhnOK*+{Gmi|78J$ui8VM@Ey)0ykmBX2z?a{B}kY8F4s9sFqIMov_Eug1T9h!*~c2B
z=6Y?A%K+T^s!fQk_3`jv2(1B$F2pDZm>);6Pr7_O!f&R@_5A0g2eq%@r3=2fn%O8-
zgnKc|P{cTpwFMS7)w(v`{?LnNI0v9gdr~}@0aMu5$BT)`_za8)+55#T3S$!&e+qK)
z(xq@7wC1U?4u}r`CkNOxeePROY*sGCCkV%Ug2*I+rI9;~--fkqNm#603~3k?-f{Nf
zs#Uku6KCj_CY$4rl4W1EP8uoK5RY2uCiRX`o%EFEjQ6@M?O+96iq>=y-}@bDYzTVY
ziIc`K1uS_lE|@apK~bos@2@l~>Fd|a1PGjuY@Xs)Cp9So7h)I+%W`L^><oVDxk=c|
zz|4A);i%sHp7qbpCz<}=MNsn?_(gco2J%fLs)dC8YDvw1+t!-+d9U0#`v7L_&iK~#
zi&tQ+bsXEFt?5*d%&TDRt}XH<I8Or+_@u0gP-{?#oJ>%{JMgU<w@*<cP++!r=ed#|
z_-o|~v6L^4cJk>dW~9DwYp6{N?b6-7#|CF48bc=GIFTI6KI}VeQUEsTc`41kRF>0|
z!MGWxF>W51XX<Hh?Bqs=*iI~G(-$dqHp6;B&w#M)x!5~evzMkEBQ+`}?yby@yt|Oa
Ewo@+_=>Px#

diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256
new file mode 100644
index 0000000..5abbcbc
--- /dev/null
+++ b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256
@@ -0,0 +1 @@
+0740d1eded0d544bc3612117671cf8024aba066ee6fcf9d007491318541c9bed
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig
new file mode 100644
index 0000000000000000000000000000000000000000..5aa0357d712cd5fedff54cb421b1f774045fee17
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$?V|O8^Q95Rs!x
zhnOK*+_ZfU|5AzlZvOtiw}i|d&=54{_1<kmV)QiN_D^9}?S`q`kWcntM7|XKai%^s
z3xz8!BvE-fCxNiVk1)LAgOB5GCHSc?X#DKu1;1pcR}4HSiQCYB>^rtu@SyaT8u+kR
z4b0YsEMlu5rJh$5WA1~-E!mIA5FBm^>D1`k=DQc`M)l?(^mO~t@Y8mp@Jtu6(`B5~
zvT|ewfW%j&xyM(5-=VA4ZO#%MUcg3cMS=^xgqy%W^;$M7-<l6bPiAHb9V9{ET6En>
zX3)^#0>y;`?oE-hX}=MAp;RfIg5$?1J&PB|3krTqU*Q(}JtVkmNO)mEs2*3tWyln6
z#?&&%0^l${s_!Lk(*Ruzot%hoG4PH5%!9+)?<!k9Hk-TY9BxWaek}MYJZz*>#*i34
zKWQmDvoY@1FGa8=ZRVWlk<0C+(gSV`0-4eGfMNHCj~}b+R?YZPGwV<YTp~=Ppzkm7
zuMX+q+pLP4at1Z1U|x%Y`r)Weg9f`ZtmqtF>-zT0<Uw834?K?14<G*<kyXmoetn4$
z)gyJ{XNBh6=$$fL_KP)OlOFwm$9}`3%VZ3=Ra$ydFwz2>Qg!e&k@lrM{Rc_b!kDC(
z6Rkm<WP#|iTG~|z3mPFiF~QHd#amE>bPBK(j_+bLmwwM53LHEqv~`~Jwpxkub{KCh
E<<wOgiU0rr

literal 0
HcmV?d00001

diff --git a/owasp-dep-check/Dockerfile b/owasp-dep-check/Dockerfile
index 250766f..743a9a5 100644
--- a/owasp-dep-check/Dockerfile
+++ b/owasp-dep-check/Dockerfile
@@ -7,8 +7,8 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 LABEL name="Solutions Delivery Platform: Jenkins Agent" \
       maintainer="terrana_steven@bah.com" \
       vendor="Booz Allen Hamilton" \
-      version="6.0.3" \
-      release="6.0.3" \
+      version="6.1.0" \
+      release="6.1.0" \
       summary="OWASP Dependency Check  container" \
       description="The OWASP Dependency Check container image for the Solutions Delivery Platform"
 
@@ -20,8 +20,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby " && \
     yum -y update-minimal --setopt=tsflags=nodocs --security  && \
     yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
 
-ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.7
-ENV OWASP_DEP_CHK_VERSION 6.0.3
+ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.8
+ENV OWASP_DEP_CHK_VERSION 6.1.0
 ENV HOME /root
 ENV JAVA_HOME /usr/lib/jvm/java
 
diff --git a/owasp-dep-check/Makefile b/owasp-dep-check/Makefile
index 6395bc4..06b9714 100644
--- a/owasp-dep-check/Makefile
+++ b/owasp-dep-check/Makefile
@@ -1,7 +1,7 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = owasp-dep-check
-VERSION  = 6.0.3
+VERSION  = 6.1.0
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)
diff --git a/owasp-dep-check/prebuild/build-dep.sh b/owasp-dep-check/prebuild/build-dep.sh
index dfe3648..65b7a60 100755
--- a/owasp-dep-check/prebuild/build-dep.sh
+++ b/owasp-dep-check/prebuild/build-dep.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.7
+SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8
 
 cd /root/prebuild
 tar czvf owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz dependencies
diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256
deleted file mode 100644
index 428dcd3..0000000
--- a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256
+++ /dev/null
@@ -1 +0,0 @@
-5149b91bbb24ea18da7e692e15aa1cd0c61262072125830d263ccc1be43f54ad
diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sig b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sig
deleted file mode 100644
index b7ff62822ea32e5f52e5236605a0e0c112579d3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$<5hvj7SS5Rs!x
zhnOK*+zl-c|7Jcll>EyhmTh0g1TLFukvSdVIwifeL^H9eif?lU739TZzL1gd*2)AY
zQ(nJ#HxF*krogSK32?gGR27(x??<@ppzkTAB)Y9+Ba9|dfm!%9e^qA*OE9&Qva_nG
z6HqQDF3jI&f2xd63);1&kRTs?LFpo+%TRen0i#@?cZ8M+nKXf1o4iLhMEdpltvrb`
z|8p{L+Ey7&I(NkOdtg{2iFw@Lf9qXH>*+cZfQO<|BPJd@Dnb1#Qu`ThjbDYX*uWcs
z)r70Ks`a=BEI3(Q{Uo^Lxpt%MPR5JB2e;`m#rmR?%GaC~d0y<q0A=^iHa(RgeupYz
zlk)ZDN>9ZXGNM2hU-W|MG1BEvVR>47h8LAq-i3m-ZcZ<UzKh}C-;yvu%K!6)8vpD9
z=c5wpVJwPn#^OwMp6aUhnqfl7k$_=vC|^cgxcp-rpyBy*G~VikFNEW!EOv<B654?i
zhB-SMvI>*laZ{z5Up0n}WCIh48DEQ_DWS=?3LF&iD<Qo=+82Pep|X|@Lq@s5{xh_Y
zbpWj~3i1bNhoSMQS~YcKLT_8j4N!v=!^>08Y1SVFZQE(NT4lEYZQzoK`>h7WG_jAh
zwGKTLz`CS`Go#e4otZtXUl}%U;YNM@|EC+VPh6^!Sht)(^1p5$?Kl{T6^nyhrz{<C
Eyo*N>!~g&Q

diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256
new file mode 100644
index 0000000..c32d28f
--- /dev/null
+++ b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256
@@ -0,0 +1 @@
+faf9679a50be32d2534cd931473730e064c3e4d7ce1cdc4635e1a9a7de806f04
diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig
new file mode 100644
index 0000000000000000000000000000000000000000..6f2847a4bc56a949d72729677d08532769e783ed
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$?W2h5!l)5Rs!x
zhnOK*+&udb0Fn-~>986EJ7Nj}7+Bjz5QsA4-&$y~VbJ;M{EzWBDOtapywlB5ndd?1
z6I^(N$H)bY)8zN>Ii<L!Fhd+`|C5_$E(5LfzPupBkje2|x)M1H?Nos_+i750jYIE8
zHzVNwOd#-n8v)UP8X0fH`bHPfWrcJFaht)Nlb<||trb=&XR9xD(K7`YC!O*#1wK6N
zrB`Y62q-g&5ium$0L}gOai<`vk{g9g`#rnaQ&f5jPrlDb`$un|e`si`cWm~fY$GXI
z0IY<?E6IX!aSYlA@I+-zD~b5PKI+oLWB9LsvB;b9IIrzSQHAOCAPMw+%JFtxj{%Wh
z=Rl>Qr7Re3RVlQGh@|tYMf$Z3C7cML+0U7HG8nAO^>2pi<0;mQ9iMWKcNxt$+j*Ok
z$ADRh{u1d)vzdua^Tv{g`ioPaN&$FT<5_8ZP6Kzmuv0>#l|v-Nynzx*n{uXo=t%DW
zGpj;$Mj;$_@^)kCZ|d9%nmrNqyq1uC4j__xO=keky%_`}QD|A`uTGtB(=ZvR(v(@d
z<ytp(Qk!Q!oe+=s=$ujhyQr4^Rcbp@nvXDXC9n5XYI+BY!Q%uN<a+7wbqlHvi5tus
zNWZM^t7<y<;^D)^_+HT%KQhL;i^!(FjXIxxg()6T04tAjIRe>m*%+op2NoVtO45HW
EY|iNs<NyEw

literal 0
HcmV?d00001

diff --git a/owasp-dep-check/prebuild/pull-from-centos.sh b/owasp-dep-check/prebuild/pull-from-centos.sh
index 590460f..0525407 100755
--- a/owasp-dep-check/prebuild/pull-from-centos.sh
+++ b/owasp-dep-check/prebuild/pull-from-centos.sh
@@ -2,8 +2,8 @@
 
 set -xe
 
-OWASP_DEP_CHK_VERSION=6.0.3
-SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.7
+OWASP_DEP_CHK_VERSION=6.1.0
+SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8
 
 rm -rf /root/prebuild/dependencies
 
diff --git a/sonar-scanner/Dockerfile b/sonar-scanner/Dockerfile
index 1075110..1ea5cdd 100644
--- a/sonar-scanner/Dockerfile
+++ b/sonar-scanner/Dockerfile
@@ -29,8 +29,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk curl grep sed which" && \
     yum --disableplugin=subscription-manager -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
 
 ### define necessary variables like PATH to application
-ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
-ARG SONAR_SCANNER_VERSION=4.5.0.2216
+ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
+ARG SONAR_SCANNER_VERSION=4.6.0.2311
 ENV SONAR_SCANNER_FILE=sonar-scanner-${SONAR_SCANNER_VERSION}-linux
 ENV TARBALL=sonar-scanner-dependencies-${SDP_BUILD_DEPENDENCY_VERSION}
 ENV user=sonarscanner
diff --git a/sonar-scanner/Makefile b/sonar-scanner/Makefile
index c0afe7c..1cbbe5b 100644
--- a/sonar-scanner/Makefile
+++ b/sonar-scanner/Makefile
@@ -1,7 +1,7 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = sonar-scanner
-VERSION  = 4.5.0.2216
+VERSION  = 4.6.0.2311
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)
diff --git a/sonar-scanner/prebuild/build-dep.sh b/sonar-scanner/prebuild/build-dep.sh
index 017a27b..b14fbc1 100755
--- a/sonar-scanner/prebuild/build-dep.sh
+++ b/sonar-scanner/prebuild/build-dep.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
+SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
 
 cd /root/prebuild
 tar czvf sonar-scanner-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies
diff --git a/sonar-scanner/prebuild/pull-from-ubi.sh b/sonar-scanner/prebuild/pull-from-ubi.sh
index 4337d39..f61feff 100755
--- a/sonar-scanner/prebuild/pull-from-ubi.sh
+++ b/sonar-scanner/prebuild/pull-from-ubi.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-SONAR_SCANNER_VERSION=4.5.0.2216
+SONAR_SCANNER_VERSION=4.6.0.2311
 
 rm -rf /root/prebuild/dependencies
 mkdir -p /root/prebuild/dependencies/sonar-scanner
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256
deleted file mode 100644
index 6bf508b..0000000
--- a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256
+++ /dev/null
@@ -1 +0,0 @@
-2fa1b63dae3b0e229bd64a13f791c42152af9c5d65e2c1772e142f6588592065
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sig
deleted file mode 100644
index 1d280785d542c28d386fa7514adf375e414ec26e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$<5q0ssmL5Rs!x
zhnOK*+&an+{w<@CHN`)kA6np(SRAGzP|U^wF(HD$3TZO)CZZWjKM(MGh2PP#Bv{>^
zrrM(6n8P#{7GyyB)g6}=Ay^u*{oJqY^c=5(N1?4N^hg@{?j>H;x5Z#Wg4<x(oL*wr
zly>Pa10Q=w`O4=@(xISz((H3ic!KWibmQnmB}HMIeEi=A6G0N&ScdIP)PEALLFd@=
zEo_@`eAEH3eoWr!4IFP*Xm(u3;?*o}5EJ!#g?%#S7B4T?t-iSXqQ7-bI^V`&u?79R
ze7FLIRCW<074T84g%6z>wp}89%z}2TK#9(7*yj}~?(Vn`8Cv#j8HGnNwEW=2s>i>#
zf1OmHXP1giSA!t}mLhIVO+-{}%hGo*0(xfID}SD!rPfc&Khmz|Rw+rE_Oqv6`|)H`
z2Zy<Jr`W^W=;xv8?#PGCkotIOrA7OBOXZNm+XUY5CosN5-4#Rbn71n=*S&}-9p9Bv
zpPYDv*V0rg<!#UGxhTMG3=CWax{8(uSt0UWn{>y4w=<F+)vvQR`g|q)i2wU7ZSAvF
z<D?HRYSbk5Ofv;(Ho<gEQhG8x8rmQ)|11Xh`Y@H~*X3CrHj60#f?SfK|FSKcN0k3T
zl-v2UA3P_tTUhyo^+JY{!waPX%J|Sg<5l8>JVnBr<-$8%+64X*>Q(vXQ)ooqi?p5>
E$!4D(-T(jq

diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256
new file mode 100644
index 0000000..9fc0caf
--- /dev/null
+++ b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256
@@ -0,0 +1 @@
+feb322a7243edcfb422df49c9cd71df46146d1a3c03986bbccf1ba0f6863d943
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig
new file mode 100644
index 0000000000000000000000000000000000000000..88d5098babf100c1807f38e201537a6d33220ba2
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$?V}`v3|F5Rs!x
zhnOK*+#F92{137XRWr(g06f(HUk-B-JI|3vzrm@BOGRD-J`yC3Sb*atw56Gg#wh_P
zR+Xhs&4FAP?B8NEXhC$;lzSr<?(!r?4<bT-J;GK-V%{6F<rf3un^&^4rBM-hA)y^e
z{Jq6dl&2{>XLa1$$);zKbX*2gH!7|`B#N;lAKQEO@D~J!5y0d6PL4~n7u6OY5U>(<
zWg80SBh^(0mx{<uP@s+N^m)l33|=47G0L+tB#VQEqr#4d&HwPPW0;9dn>zA(vl6fV
z!1oy(*LX+aXHr$U(<3lNRb?ONjMJU+8=J}j&XxLm=TlnZ6r*b~)UHX1y-G8+&f-+!
z_PCuTqFG1S4X1<<!;dnk4Kr>f)w$PiUdv2AQn5c)M*~x0G&ZTv4-S(p2O>4tvd`rC
zTm`9LOw=hB=_<BQ1|eteUzshoT=f~yoG`^_TkEMq8OR0_^on2W-X%(6VEA8zz`Gsp
zfKL5n$5F+!4AxNpwGc0ydAxHXAO<<E;@M-y(-sbp9&>6C$k<&%YgE8TUjB?gap-NE
z!C*<U)IOCRs~UVSM{kS@E){ih?ZrfqxwkzQ+Rw|Wy<E9aQ1~nLz*(E~_oAGlyqby@
zD)AB5Z)%7GUUuc&-j@?=Dw@$&-G{)&;!Kv7jYxbyAc+EP50=OVZP}LIwRR4#3qT$2
E6{`sfVgLXD

literal 0
HcmV?d00001