diff --git a/Dockerfile b/Dockerfile index d8b3f3429..02e6cc959 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18.2 AS java8 +FROM alpine:3.18.4 AS java8 WORKDIR app RUN apk update && \ @@ -6,50 +6,44 @@ RUN apk update && \ apk upgrade RUN apk add openjdk8=8.372.07-r0 --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk -RUN apk --no-cache add curl -RUN apk add sudo RUN apk add libstdc++ RUN apk add glib RUN apk add krb5 pcre RUN apk add bash -RUN curl -L "https://sca-downloads.s3.amazonaws.com/cli/latest/ScaResolver-musl64.tar.gz" -o "ScaResolver.tar.gz" && tar -vxzf ScaResolver.tar.gz && sudo mv ScaResolver Configuration.yml /app && rm ScaResolver.tar.gz +RUN wget "https://sca-downloads.s3.amazonaws.com/cli/latest/ScaResolver-musl64.tar.gz" -O "ScaResolver.tar.gz" && tar -xvzf ScaResolver.tar.gz && mv ScaResolver Configuration.yml /app && rm ScaResolver.tar.gz COPY build/libs/*.jar cx-flow.jar ENTRYPOINT ["java", "-Xms512m", "-Xmx2048m", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=web", "-jar", "cx-flow.jar"] EXPOSE 8080 -FROM alpine:3.18.2 AS java11 +FROM alpine:3.18.4 AS java11 WORKDIR app RUN apk update && \ apk upgrade RUN apk add openjdk11=11.0.20_p8-r2 --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk -RUN apk --no-cache add curl -RUN apk add sudo RUN apk add libstdc++ RUN apk add glib RUN apk add krb5 pcre RUN apk add bash -RUN curl -L "https://sca-downloads.s3.amazonaws.com/cli/latest/ScaResolver-musl64.tar.gz" -o "ScaResolver.tar.gz" && tar -vxzf ScaResolver.tar.gz && sudo mv ScaResolver Configuration.yml /app && rm ScaResolver.tar.gz +RUN wget "https://sca-downloads.s3.amazonaws.com/cli/latest/ScaResolver-musl64.tar.gz" -O "ScaResolver.tar.gz" && tar -xvzf ScaResolver.tar.gz && mv ScaResolver Configuration.yml /app && rm ScaResolver.tar.gz COPY build/libs/java11/*.jar cx-flow.jar ENTRYPOINT ["java", "-Xms512m", "-Xmx2048m","-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=web", "-jar", "cx-flow.jar"] EXPOSE 8080 -FROM alpine:3.18.2 AS cxgo8 +FROM alpine:3.18.4 AS cxgo8 WORKDIR app RUN apk update && \ apk upgrade RUN apk add openjdk8=8.302.08-r2 --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk -RUN apk --no-cache add curl -RUN apk add sudo RUN apk add libstdc++ RUN apk add glib RUN apk add krb5 pcre RUN apk add bash -RUN curl -L "https://sca-downloads.s3.amazonaws.com/cli/latest/ScaResolver-musl64.tar.gz" -o "ScaResolver.tar.gz" && tar -vxzf ScaResolver.tar.gz && sudo mv ScaResolver Configuration.yml /app && rm ScaResolver.tar.gz +RUN wget "https://sca-downloads.s3.amazonaws.com/cli/latest/ScaResolver-musl64.tar.gz" -O "ScaResolver.tar.gz" && tar -xvzf ScaResolver.tar.gz && mv ScaResolver Configuration.yml /app && rm ScaResolver.tar.gz COPY build/libs/cxgo/*.jar cx-flow.jar ENTRYPOINT ["java", "-Xms512m", "-Xmx2048m", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=cxgo", "-jar", "cx-flow.jar"] EXPOSE 8080 diff --git a/build-11.gradle b/build-11.gradle index d947e14e5..10432ff9b 100644 --- a/build-11.gradle +++ b/build-11.gradle @@ -4,7 +4,7 @@ buildscript { ext { - CxSBSDK = "0.5.63" + CxSBSDK = "0.5.64" ConfigProviderVersion = "1.0.9" //cxVersion = "8.90.5" springBootVersion = '2.7.14' diff --git a/build.gradle b/build.gradle index 6b317931d..338f5447f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { -CxSBSDK = "0.5.63" +CxSBSDK = "0.5.64" ConfigProviderVersion = "1.0.10" //cxVersion = "8.90.5" springBootVersion = '2.7.14' diff --git a/src/test/java/com/checkmarx/flow/cucumber/integration/sca_scanner/policy_management/ScaPolicyManagementSteps.java b/src/test/java/com/checkmarx/flow/cucumber/integration/sca_scanner/policy_management/ScaPolicyManagementSteps.java index f2f8af95e..b3442a063 100644 --- a/src/test/java/com/checkmarx/flow/cucumber/integration/sca_scanner/policy_management/ScaPolicyManagementSteps.java +++ b/src/test/java/com/checkmarx/flow/cucumber/integration/sca_scanner/policy_management/ScaPolicyManagementSteps.java @@ -80,19 +80,15 @@ public void assignPolicyToProject() throws IOException { .breakBuild(true) .build(); - RuleCondition ruleCondition = RuleCondition.builder() + Conditions ruleCondition = Conditions.builder() .operator("Equal") .parameterValue(Collections.singletonList("High")) .parameter("VulnerabilitySeverity") .build(); - ConditionGroups conditionGroups = ConditionGroups.builder() - .conditions(Collections.singletonList(ruleCondition)) - .build(); - PolicyRule policyRule = PolicyRule.builder() .name("No High Severity Rule") - .conditionGroups(Collections.singletonList(conditionGroups)) + .conditions(Collections.singletonList(ruleCondition)) .build(); Policy policy = Policy.builder()