Skip to content

Revert "[issue-19030] add dependency-check-maven plugin to detect CPE… #19103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdcmeehan merged 1 commit into from
Feb 23, 2023
Merged

Revert "[issue-19030] add dependency-check-maven plugin to detect CPE… #19103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/test-native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
env:
MAVEN_OPTS: "-Xmx1024M -XX:+ExitOnOutOfMemoryError"
MAVEN_INSTALL_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError"
MAVEN_FAST_INSTALL: "-B -V --quiet -T C1 -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
MAVEN_FAST_INSTALL: "-B -V --quiet -T C1 -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true"
MAVEN_TEST: "-B -Dair.check.skip-all -Dmaven.javadoc.skip=true -DLogTestDurationListener.enabled=true --fail-at-end"

jobs:
Expand Down Expand Up @@ -98,10 +98,7 @@ jobs:

- name: Maven Install
run: |
printenv | sort
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
./mvnw install ${MAVEN_FAST_INSTALL} -pl '!presto-docs,!presto-server,!presto-server-rpm,!presto-test-coverage'

- name: Run e2e tests
Expand Down
12 changes: 5 additions & 7 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ pipeline {
}
}
}
post {
always {
archiveArtifacts artifacts: '**/target/dependency-check-report.html',
allowEmptyArchive: true
}
}
}

stage('Docker Build') {
Expand All @@ -97,13 +91,17 @@ pipeline {
steps {
echo 'build docker image'
sh 'apk update && apk add aws-cli bash git'
sh 'git config --global --add safe.directory ${WORKSPACE}'
withCredentials([[
$class: 'AmazonWebServicesCredentialsBinding',
credentialsId: "${AWS_CREDENTIAL_ID}",
accessKeyVariable: 'AWS_ACCESS_KEY_ID',
secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
sh '''#!/bin/bash -ex
for dir in /home/jenkins/agent/workspace/*/; do
echo "${dir}"
git config --global --add safe.directory "${dir:0:-1}"
done

cd docker/
aws s3 cp ${AWS_S3_PREFIX}/${PRESTO_BUILD_VERSION}/${PRESTO_PKG} . --no-progress
aws s3 cp ${AWS_S3_PREFIX}/${PRESTO_BUILD_VERSION}/${PRESTO_CLI_JAR} . --no-progress
Expand Down
10 changes: 5 additions & 5 deletions jenkins/agent-maven.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ spec:
image: maven:3.8.6-openjdk-8-slim
env:
- name: MAVEN_OPTS
value: "-Xmx8000m -Xms8000m"
value: "-Xmx6000m -Xms6000m"
resources:
requests:
memory: "10Gi"
cpu: "2000m"
memory: "8Gi"
cpu: "4000m"
limits:
memory: "10Gi"
cpu: "2000m"
memory: "8Gi"
cpu: "4000m"
tty: true
command:
- cat
4 changes: 0 additions & 4 deletions owasp-dependency-check-suppressions.xml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,31 +2396,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>8.0.2</version>
<configuration>
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
<failBuildOnCVSS>11</failBuildOnCVSS>
<nodeAnalyzerEnabled>false</nodeAnalyzerEnabled>
<nodeAuditSkipDevDependencies>true</nodeAuditSkipDevDependencies>
<ossindexAnalyzerEnabled>false</ossindexAnalyzerEnabled>
<skipProvidedScope>true</skipProvidedScope>
<skipSystemScope>true</skipSystemScope>
<yarnAuditAnalyzerEnabled>false</yarnAuditAnalyzerEnabled>
<suppressionFiles>
<suppressionFile>owasp-dependency-check-suppressions.xml</suppressionFile>
</suppressionFiles>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down