diff --git a/Jenkinsfile b/Jenkinsfile index 6802e230..35846f99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,23 +7,18 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn clean install' - sh 'mvn jacoco:report' + sh 'mvn clean install -Dmaven.repo.local=/root/.m2/qlack2/repository' + sh 'mvn jacoco:report -Dmaven.repo.local=/root/.m2/qlack2/repository' } - } - stage('Depencencies Check') { - steps { - sh 'mvn org.owasp:dependency-check-maven:aggregate' - } - } + } stage('Sonar Analysis') { steps { - sh 'mvn sonar:sonar -Dsonar.projectName=QLACK2 -Dsonar.host.url=${SONAR_HOST_URL} -Dsonar.login=${SONAR_KEY_QLACK2}' + sh 'mvn sonar:sonar -Dsonar.projectName=QLACK2 -Dsonar.host.url=${SONAR_HOST_URL} -Dsonar.login=${SONAR_KEY_QLACK2} -Dmaven.repo.local=/root/.m2/qlack2/repository' } } stage('Produce bom.xml'){ steps{ - sh 'mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom' + sh 'mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom -Dmaven.repo.local=/root/.m2/qlack2/repository' } } stage('Dependency-Track Analysis'){ @@ -31,7 +26,7 @@ pipeline { sh ''' cat > payload.json <<__HERE__ { - "project": "0cbafbeb-f23f-41c3-ac88-5126f8bfcd06", + "project": "bf9332c3-a693-4324-8c7e-09fbe65f1751", "bom": "$(cat target/bom.xml |base64 -w 0 -)" } __HERE__ @@ -43,7 +38,7 @@ pipeline { } } } - post { + /*post { always { sh 'sh /var/lib/jenkins/scripts/docker-cleanup-test-containers.sh TEST-qlack' sh 'sh /var/lib/jenkins/scripts/kill-karaf-by-grep.sh "../workspace/Qlack2*"' @@ -53,5 +48,5 @@ pipeline { body: '$DEFAULT_CONTENT', to: 'qlack@eurodyn.com' } - } + }*/ } \ No newline at end of file diff --git a/WebDesktop/qlack2-wd-web/package.json b/WebDesktop/qlack2-wd-web/package.json index e29374e3..0be95b75 100644 --- a/WebDesktop/qlack2-wd-web/package.json +++ b/WebDesktop/qlack2-wd-web/package.json @@ -46,7 +46,7 @@ "karma-jasmine": "~0.3.6", "karma-ng-html2js-preprocessor": "~0.2.0", "karma-phantomjs-launcher": "~0.2.1", - "lodash": "~3.10.1", + "lodash": "~4.17.19", "main-bower-files": "~2.9.0", "phantomjs": "~1.9.18", "uglify-save-license": "~0.4.1", diff --git a/pom.xml b/pom.xml index 67058643..c5a12e2b 100644 --- a/pom.xml +++ b/pom.xml @@ -60,12 +60,6 @@ v2.0.0 v2.0.0 - - ${project.build.directory}/dependency-check-report.xml - - ${project.build.directory}/dependency-check-report.html - - 5.12.0 2.1.0-1 @@ -219,7 +213,6 @@ 1.4.6 1.3.04 3.3.1 - 5.3.1 3.7.0.1746 @@ -351,18 +344,6 @@ sonar-maven-plugin ${sonar-maven-plugin.version} - - org.owasp - dependency-check-maven - ${dependency-check-maven.version} - - ALL - - owasp-suppression.xml - - false - - org.jacoco @@ -538,23 +519,6 @@ - - - - org.owasp - dependency-check-maven - ${version.owasp} - - ALL - - - https://raw.githubusercontent.com/eurodyn/Qlack2/master/owasp-suppression.xml - - - - - -