From 5b2a01bb73119696edbd7d36fcf567152f9a071a Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Sat, 11 Dec 2021 17:13:38 +0800 Subject: [PATCH 01/27] Update build-agent.yaml --- build-agent.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-agent.yaml b/build-agent.yaml index c9efebe3..0c2b7ae8 100644 --- a/build-agent.yaml +++ b/build-agent.yaml @@ -23,6 +23,14 @@ spec: name: docker-sock - mountPath: /tmp/trivycache/ name: trivycache + - name: jenkins-docker-cfg + projected: + sources: + - secret: + name: regcred + items: + - key: .dockerconfigjson + path: config.json - name: trufflehog image: rmkanda/trufflehog command: @@ -43,3 +51,11 @@ spec: - name: trivycache hostPath: path: /tmp/trivycache/ + - name: jenkins-docker-cfg + projected: + sources: + - secret: + name: regcred + items: + - key: .dockerconfigjson + path: config.json From dcd18fd22b8509f7107f19a2b2334a7306b0d94f Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Sat, 11 Dec 2021 17:19:53 +0800 Subject: [PATCH 02/27] Update Jenkinsfile --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2fc1e0d2..7e6dbb82 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,12 @@ pipeline { } } } + stage('Build with Kaniko') { + steps { + git 'https://github.com/jenkinsci/docker-inbound-agent.git' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --insecure --skip-tls-verify --cache=true --destination=docker.io/vinycoolguy/dsodemo' + } + } } } From 4b8d158a3c9f04d43e1cbb6dd43dc22dde522e44 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Sat, 11 Dec 2021 17:26:26 +0800 Subject: [PATCH 03/27] Update build-agent.yaml --- build-agent.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build-agent.yaml b/build-agent.yaml index 0c2b7ae8..d1a4682d 100644 --- a/build-agent.yaml +++ b/build-agent.yaml @@ -23,14 +23,16 @@ spec: name: docker-sock - mountPath: /tmp/trivycache/ name: trivycache - - name: jenkins-docker-cfg - projected: - sources: - - secret: - name: regcred - items: - - key: .dockerconfigjson - path: config.json + - name: kaniko + image: gcr.io/kaniko-project/executor:v1.6.0-debug + imagePullPolicy: Always + command: + - sleep + args: + - 99d + volumeMounts: + - name: jenkins-docker-cfg + mountPath: /kaniko/.docker - name: trufflehog image: rmkanda/trufflehog command: From e9949c216141e7e4e9af91f6cbe801c6e4472e38 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Sat, 11 Dec 2021 17:35:44 +0800 Subject: [PATCH 04/27] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e6dbb82..f62f0754 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,8 +40,9 @@ pipeline { } stage('Build with Kaniko') { steps { - git 'https://github.com/jenkinsci/docker-inbound-agent.git' + container('kaniko') { sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --insecure --skip-tls-verify --cache=true --destination=docker.io/vinycoolguy/dsodemo' + } } } } From a6ba8314e44291d7e76a0785d1a46edac9904d19 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Tue, 14 Dec 2021 16:32:12 +0800 Subject: [PATCH 05/27] Update Jenkinsfile --- Jenkinsfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f62f0754..4e59dfdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { } } } - stage('Test') { + stage('Static Analysis') { parallel { stage('Unit Tests') { steps { @@ -27,7 +27,22 @@ pipeline { } } } - } + stage('SCA') { + steps { + container('maven') { + catchError(buildResult: 'SUCCESS', stageResult:'FAILURE') { + sh 'mvn org.owasp:dependency-check-maven:check' + } + } + } + post { + always { + archiveArtifacts allowEmptyArchive: true,artifacts: 'target/dependency-check-report.html', fingerprint:true, onlyIfSuccessful: true + // dependencyCheckPublisher pattern: 'report.xml' + } + } + } + } } stage('Package') { parallel { From 181ad4ac862bc01744003d8fdb8f7fbda02a2595 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Tue, 14 Dec 2021 17:00:13 +0800 Subject: [PATCH 06/27] Update Jenkinsfile --- Jenkinsfile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4e59dfdf..8df031cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,20 @@ pipeline { } } } - } + stage('OSS License Checker') { + steps { + container('licensefinder') { + sh 'ls -al' + sh '''#!/bin/bash --login + /bin/bash --login + rvm use default + gem install license_finder + license_finder + ''' + } + } + } + } } stage('Package') { parallel { From 6602738c21ea16112c9800a7c0d2b29c72a93744 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Tue, 14 Dec 2021 17:33:11 +0800 Subject: [PATCH 07/27] Update Jenkinsfile From 5fc17be4ecc9ae3d433648e4d881f93ee9919ff0 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Tue, 14 Dec 2021 19:28:04 +0800 Subject: [PATCH 08/27] Update Jenkinsfile --- Jenkinsfile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8df031cd..0ae87d86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,8 +55,21 @@ pipeline { } } } - } - } + stage('Generate SBOM') { + steps { + container('maven') { + sh 'mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom' + } + } + post { + success { + dependencyTrackPublisher projectName:'sample-spring-app', projectVersion: '0.0.1', artifact:'target/bom.xml', autoCreateProjects: true, synchronous: true + archiveArtifacts allowEmptyArchive: true,artifacts: 'target/bom.xml', fingerprint: true,onlyIfSuccessful: true + } + } + } + } + } stage('Package') { parallel { stage('Create Jarfile') { From 150b1c9adb24098f5891bbb4d8a9eb48892afaaf Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Tue, 14 Dec 2021 19:40:08 +0800 Subject: [PATCH 09/27] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0ae87d86..66048d5b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,7 +63,7 @@ pipeline { } post { success { - dependencyTrackPublisher projectName:'sample-spring-app', projectVersion: '0.0.1', artifact:'target/bom.xml', autoCreateProjects: true, synchronous: true + //dependencyTrackPublisher projectName:'sample-spring-app', projectVersion: '0.0.1', artifact:'target/bom.xml', autoCreateProjects: true, synchronous: true archiveArtifacts allowEmptyArchive: true,artifacts: 'target/bom.xml', fingerprint: true,onlyIfSuccessful: true } } From a2d9d6adfc1710b7520935fc2cb074cd0db9dd4e Mon Sep 17 00:00:00 2001 From: Vinayak Date: Wed, 15 Dec 2021 05:28:59 +0000 Subject: [PATCH 10/27] SAST --- Jenkinsfile | 13 +++++++++++++ build-agent.yaml | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 66048d5b..c868660f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,6 +70,19 @@ pipeline { } } } + stage('SAST') { + steps { + container('slscan') { + sh 'scan --type java,depscan --build' + } + } + post { + success { + archiveArtifacts allowEmptyArchive: true, + artifacts: 'reports/*', fingerprint: true, onlyIfSuccessful:true + } + } + } stage('Package') { parallel { stage('Create Jarfile') { diff --git a/build-agent.yaml b/build-agent.yaml index d1a4682d..88014de2 100644 --- a/build-agent.yaml +++ b/build-agent.yaml @@ -23,6 +23,12 @@ spec: name: docker-sock - mountPath: /tmp/trivycache/ name: trivycache + - name: slscan + image: shiftleft/sast-scan + imagePullPolicy: Always + command: + - cat + tty: true - name: kaniko image: gcr.io/kaniko-project/executor:v1.6.0-debug imagePullPolicy: Always From e4c38dc60ecf4388efcdc8c2b9f724ee7eda70ea Mon Sep 17 00:00:00 2001 From: Vinayak Date: Wed, 15 Dec 2021 05:47:53 +0000 Subject: [PATCH 11/27] SCA to Fail --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 9c2e8aad..68e9db3f 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,9 @@ org.owasp dependency-check-maven 6.1.1 + + 8 + From 6577565a12a2a126ac9b170c6f55b67848e6aa5a Mon Sep 17 00:00:00 2001 From: Vinayak Date: Wed, 15 Dec 2021 05:55:40 +0000 Subject: [PATCH 12/27] Update Springboot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68e9db3f..74048cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3 + 2.5.5 com.demo From 5a2fdd736cd26673822a0da2b1b4faabe337fffa Mon Sep 17 00:00:00 2001 From: Vinayak Date: Wed, 15 Dec 2021 06:03:41 +0000 Subject: [PATCH 13/27] Update Springboot version --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 74048cf0..0e3baaa6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-starter-parent 2.5.5 + 2.15.0 com.demo From 0c1308d6d536c6cf9073324cdf05f85d7839dda7 Mon Sep 17 00:00:00 2001 From: Vinayak Date: Wed, 15 Dec 2021 06:06:04 +0000 Subject: [PATCH 14/27] Update Springboot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e3baaa6..80e7677d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,6 @@ org.springframework.boot spring-boot-starter-parent 2.5.5 - 2.15.0 com.demo @@ -17,6 +16,7 @@ 1.8 + 2.15.0 From 70d12eade186b56933d5c96e33ecd479ba511b72 Mon Sep 17 00:00:00 2001 From: Vinayak Date: Wed, 15 Dec 2021 06:18:36 +0000 Subject: [PATCH 15/27] Update license approval list --- doc/dependency_decisions.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index cad03c45..e91d2688 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -40,14 +40,14 @@ - :who: :why: :versions: - - 1.2.3 + - 1.2.6 :when: 2020-05-31 15:28:30.302764000 Z - - :approve - logback-classic - :who: :why: :versions: - - 1.2.3 + - 1.2.6 :when: 2020-05-31 15:29:03.621478000 Z - - :approve - jakarta.xml.bind-api @@ -70,3 +70,9 @@ :versions: - 1.3.5 :when: 2020-05-31 15:29:53.045616000 Z +- - :permit + - New BSD + - :who: + :why: + :versions: [] + :when: 2020-09-29 From d816e6bcbe3b9fa3f72ff15aeeda2aabe6cdaf98 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Wed, 15 Dec 2021 23:44:21 +0800 Subject: [PATCH 16/27] Update Dockerfile --- Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d376e8e..593934e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,10 @@ -FROM maven:3.6-jdk-8 - +FROM maven:3.8.4-openjdk-17 AS build WORKDIR /app +COPY . . +RUN mvn package -DskipTests -COPY . . - -RUN mvn package -DskipTests && \ - mv target/demo-0.0.1-SNAPSHOT.jar /run/demo.jar - +FROM openjdk:18-alpine AS run +WORKDIR /run +COPY --from=build /app/target/demo-0.0.1-SNAPSHOT.jar demo.jar EXPOSE 8080 - -CMD java -jar /run/demo.jar +CMD java -jar /run/demo.jar From 1c1d51d947d1a74b58185cd6c8bae7ab8ebf46ec Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Wed, 15 Dec 2021 23:54:30 +0800 Subject: [PATCH 17/27] Update Dockerfile --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 593934e4..4477a263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.8.4-openjdk-17 AS build +FROM maven:3.8.2-openjdk-17 AS build WORKDIR /app COPY . . RUN mvn package -DskipTests @@ -6,5 +6,9 @@ RUN mvn package -DskipTests FROM openjdk:18-alpine AS run WORKDIR /run COPY --from=build /app/target/demo-0.0.1-SNAPSHOT.jar demo.jar +ARG USER=devops +ENV HOME /home/$USER +RUN adduser -D $USER && chown $USER:$USER /run/demo.jar +USER $USER EXPOSE 8080 CMD java -jar /run/demo.jar From 587823b0df4b65469bbf2c71867af27ef6afe824 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Wed, 15 Dec 2021 23:57:14 +0800 Subject: [PATCH 18/27] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4477a263..7d21fafb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.8.2-openjdk-17 AS build +FROM maven:3.8.4-openjdk-17 AS build WORKDIR /app COPY . . RUN mvn package -DskipTests From 33f01394f621e43f8b7b654c3bf321eb41bcf6be Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 16 Dec 2021 00:04:37 +0800 Subject: [PATCH 19/27] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7d21fafb..e45732cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,9 @@ COPY --from=build /app/target/demo-0.0.1-SNAPSHOT.jar demo.jar ARG USER=devops ENV HOME /home/$USER RUN adduser -D $USER && chown $USER:$USER /run/demo.jar +RUN apk add curl +HEALTHCHECK --interval=30s --timeout=10s --retries=2 --start-period=20s \ + CMD curl -f http://localhost:8080/ || exit 1 USER $USER EXPOSE 8080 CMD java -jar /run/demo.jar From 7fe77e02435fd6e9b45f6b9604ef8ad543a3e433 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 16 Dec 2021 00:07:02 +0800 Subject: [PATCH 20/27] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e45732cd..148a239d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ COPY --from=build /app/target/demo-0.0.1-SNAPSHOT.jar demo.jar ARG USER=devops ENV HOME /home/$USER RUN adduser -D $USER && chown $USER:$USER /run/demo.jar -RUN apk add curl +RUN apk add --no-cache curl HEALTHCHECK --interval=30s --timeout=10s --retries=2 --start-period=20s \ CMD curl -f http://localhost:8080/ || exit 1 USER $USER From 935ab78b23fa0b23828afb00cd052de34bd5acf4 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 16 Dec 2021 00:19:15 +0800 Subject: [PATCH 21/27] Update Jenkinsfile --- Jenkinsfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c868660f..522cfcd4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,6 +101,25 @@ pipeline { } } } + + stage('Image Analysis') { + parallel { + stage('Image Linting') { + steps { + container('docker-tools') { + sh 'dockle docker.io/vinycoolguy/dsodemo' + } + } + } + stage('Image Scan') { + steps { + container('docker-tools') { + sh 'trivy image --exit-code 1 vinycoolguy/dsodemo' + } + } + } + } + } stage('Deploy to Dev') { steps { From 21a638337ed1c8cce71bd074216495092a63f204 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 16 Dec 2021 00:37:51 +0800 Subject: [PATCH 22/27] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 522cfcd4..19a6e56b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,7 +114,7 @@ pipeline { stage('Image Scan') { steps { container('docker-tools') { - sh 'trivy image --exit-code 1 vinycoolguy/dsodemo' + sh 'trivy image vinycoolguy/dsodemo' } } } From f129724914e65bb322965de043378077a51ed993 Mon Sep 17 00:00:00 2001 From: Vinayak Date: Thu, 23 Dec 2021 07:50:27 +0000 Subject: [PATCH 23/27] add k8s manifests to deploy dso-demo app --- deploy/dso-demo-deploy.yaml | 26 ++++++++++++++++++++++++++ deploy/dso-demo-svc.yaml | 19 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 deploy/dso-demo-deploy.yaml create mode 100644 deploy/dso-demo-svc.yaml diff --git a/deploy/dso-demo-deploy.yaml b/deploy/dso-demo-deploy.yaml new file mode 100644 index 00000000..76161e8b --- /dev/null +++ b/deploy/dso-demo-deploy.yaml @@ -0,0 +1,26 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + labels: + app: dso-demo + name: dso-demo +spec: + replicas: 1 + selector: + matchLabels: + app: dso-demo + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: dso-demo + spec: + containers: + - image: vinycoolguy/dsodemo + name: dsodemo + ports: + - containerPort: 8080 + resources: {} +status: {} diff --git a/deploy/dso-demo-svc.yaml b/deploy/dso-demo-svc.yaml new file mode 100644 index 00000000..8931ce9f --- /dev/null +++ b/deploy/dso-demo-svc.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + app: dso-demo + name: dso-demo +spec: + ports: + - name: "8080" + nodePort: 30080 + port: 8080 + protocol: TCP + targetPort: 8080 + selector: + app: dso-demo + type: NodePort +status: + loadBalancer: {} From 4089d8761efcdb724aade021d6a53d83512459f4 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 23 Dec 2021 16:38:11 +0800 Subject: [PATCH 24/27] Update Jenkinsfile --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 19a6e56b..4c4bf8f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,7 @@ pipeline { + environment { + ARGO_SERVER = '104.197.60.253:32100' + } agent { kubernetes { yamlFile 'build-agent.yaml' @@ -122,9 +125,14 @@ pipeline { } stage('Deploy to Dev') { + environment { + AUTH_TOKEN = credentials('argocd-jenkins-deployer-token') + } steps { - // TODO - sh "echo done" + container('docker-tools') { + sh 'docker run -t schoolofdevops/argocd-cli argocd app sync dso-demo --insecure --server $ARGO_SERVER --auth-token $AUTH_TOKEN' + sh 'docker run -t schoolofdevops/argocd-cli argocd app wait dso-demo --health --timeout 300 --insecure --server $ARGO_SERVER --auth-token $AUTH_TOKEN + } } } } From b3c8fd7de42a06fcfa57962a67207b8ab1392ccd Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 23 Dec 2021 16:44:26 +0800 Subject: [PATCH 25/27] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c4bf8f5..b138f7a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,7 +131,7 @@ pipeline { steps { container('docker-tools') { sh 'docker run -t schoolofdevops/argocd-cli argocd app sync dso-demo --insecure --server $ARGO_SERVER --auth-token $AUTH_TOKEN' - sh 'docker run -t schoolofdevops/argocd-cli argocd app wait dso-demo --health --timeout 300 --insecure --server $ARGO_SERVER --auth-token $AUTH_TOKEN + sh 'docker run -t schoolofdevops/argocd-cli argocd app wait dso-demo --health --timeout 300 --insecure --server $ARGO_SERVER --auth-token $AUTH_TOKEN' } } } From 79ea8fe6b2d3d2141516f2dcd6caf230c4a3a043 Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 23 Dec 2021 16:53:56 +0800 Subject: [PATCH 26/27] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80e7677d..4aec8086 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 1.8 - 2.15.0 + 2.17.0 From f7068f5dbcc85822a4ed1c318d4f0c38904afd7e Mon Sep 17 00:00:00 2001 From: vinycoolguy2015 Date: Thu, 23 Dec 2021 17:24:04 +0800 Subject: [PATCH 27/27] Update DemoApplication.java --- src/main/java/com/demo/demo/DemoApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/demo/demo/DemoApplication.java b/src/main/java/com/demo/demo/DemoApplication.java index b4943e0c..95b8bf7f 100644 --- a/src/main/java/com/demo/demo/DemoApplication.java +++ b/src/main/java/com/demo/demo/DemoApplication.java @@ -11,7 +11,7 @@ public class DemoApplication { @GetMapping("/") public String available() { - return "

DevSecOps Demo

"; + return "

DevSecOps Demo Updated

"; } public static void main(String[] args) {