Skip to content

Commit b5df262

Browse files
MnO2tdcmeehan
MnO2
authored and
tdcmeehan
committed
Revert "[issue-19030] add dependency-check-maven plugin to detect CPEs and CVEs"
This reverts commit 6ea5f16.
1 parent 74b0085 commit b5df262

5 files changed

Lines changed: 11 additions & 45 deletions

File tree

‎.github/workflows/test-native.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
env:
1818
MAVEN_OPTS: "-Xmx1024M -XX:+ExitOnOutOfMemoryError"
1919
MAVEN_INSTALL_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError"
20-
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"
20+
MAVEN_FAST_INSTALL: "-B -V --quiet -T C1 -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true"
2121
MAVEN_TEST: "-B -Dair.check.skip-all -Dmaven.javadoc.skip=true -DLogTestDurationListener.enabled=true --fail-at-end"
2222

2323
jobs:
@@ -98,10 +98,7 @@ jobs:
9898

9999
- name: Maven Install
100100
run: |
101-
printenv | sort
102101
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
103-
export LANG=C.UTF-8
104-
export LC_ALL=C.UTF-8
105102
./mvnw install ${MAVEN_FAST_INSTALL} -pl '!presto-docs,!presto-server,!presto-server-rpm,!presto-test-coverage'
106103
107104
- name: Run e2e tests

‎Jenkinsfile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ pipeline {
7676
}
7777
}
7878
}
79-
post {
80-
always {
81-
archiveArtifacts artifacts: '**/target/dependency-check-report.html',
82-
allowEmptyArchive: true
83-
}
84-
}
8579
}
8680

8781
stage('Docker Build') {
@@ -97,13 +91,17 @@ pipeline {
9791
steps {
9892
echo 'build docker image'
9993
sh 'apk update && apk add aws-cli bash git'
100-
sh 'git config --global --add safe.directory ${WORKSPACE}'
10194
withCredentials([[
10295
$class: 'AmazonWebServicesCredentialsBinding',
10396
credentialsId: "${AWS_CREDENTIAL_ID}",
10497
accessKeyVariable: 'AWS_ACCESS_KEY_ID',
10598
secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
10699
sh '''#!/bin/bash -ex
100+
for dir in /home/jenkins/agent/workspace/*/; do
101+
echo "${dir}"
102+
git config --global --add safe.directory "${dir:0:-1}"
103+
done
104+
107105
cd docker/
108106
aws s3 cp ${AWS_S3_PREFIX}/${PRESTO_BUILD_VERSION}/${PRESTO_PKG} . --no-progress
109107
aws s3 cp ${AWS_S3_PREFIX}/${PRESTO_BUILD_VERSION}/${PRESTO_CLI_JAR} . --no-progress

‎jenkins/agent-maven.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ spec:
1313
image: maven:3.8.6-openjdk-8-slim
1414
env:
1515
- name: MAVEN_OPTS
16-
value: "-Xmx8000m -Xms8000m"
16+
value: "-Xmx6000m -Xms6000m"
1717
resources:
1818
requests:
19-
memory: "10Gi"
20-
cpu: "2000m"
19+
memory: "8Gi"
20+
cpu: "4000m"
2121
limits:
22-
memory: "10Gi"
23-
cpu: "2000m"
22+
memory: "8Gi"
23+
cpu: "4000m"
2424
tty: true
2525
command:
2626
- cat

‎owasp-dependency-check-suppressions.xml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,31 +2396,6 @@
23962396
</execution>
23972397
</executions>
23982398
</plugin>
2399-
<plugin>
2400-
<groupId>org.owasp</groupId>
2401-
<artifactId>dependency-check-maven</artifactId>
2402-
<version>8.0.2</version>
2403-
<configuration>
2404-
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
2405-
<failBuildOnCVSS>11</failBuildOnCVSS>
2406-
<nodeAnalyzerEnabled>false</nodeAnalyzerEnabled>
2407-
<nodeAuditSkipDevDependencies>true</nodeAuditSkipDevDependencies>
2408-
<ossindexAnalyzerEnabled>false</ossindexAnalyzerEnabled>
2409-
<skipProvidedScope>true</skipProvidedScope>
2410-
<skipSystemScope>true</skipSystemScope>
2411-
<yarnAuditAnalyzerEnabled>false</yarnAuditAnalyzerEnabled>
2412-
<suppressionFiles>
2413-
<suppressionFile>owasp-dependency-check-suppressions.xml</suppressionFile>
2414-
</suppressionFiles>
2415-
</configuration>
2416-
<executions>
2417-
<execution>
2418-
<goals>
2419-
<goal>check</goal>
2420-
</goals>
2421-
</execution>
2422-
</executions>
2423-
</plugin>
24242399
</plugins>
24252400
</build>
24262401

0 commit comments

Comments
 (0)