Skip to content

Bump lodash from 3.10.1 to 4.17.19 in /WebDesktop/qlack2-wd-web #116

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

Open
dependabot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump lodash from 3.10.1 to 4.17.19 in /WebDesktop/qlack2-wd-web #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bf8af6
Bump lodash from 3.10.1 to 4.17.19 in /WebDesktop/qlack2-wd-web
dependabot[bot] Jul 15, 2020
8ccf3b5
Update mounted maven directory
ed-devops-d2 Apr 3, 2021
74b7e2e
Dependency Track Upgrade
Jan 27, 2022
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
21 changes: 8 additions & 13 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,26 @@ 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'){
steps{
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__
Expand All @@ -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*"'
Expand All @@ -53,5 +48,5 @@ pipeline {
body: '$DEFAULT_CONTENT',
to: '[email protected]'
}
}
}*/
}
2 changes: 1 addition & 1 deletion WebDesktop/qlack2-wd-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
36 changes: 0 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,6 @@
<blueprint.jpa>v2.0.0</blueprint.jpa>
<blueprint.tx>v2.0.0</blueprint.tx>

<!-- Sonar output -->
<sonar.dependencyCheck.reportPath>${project.build.directory}/dependency-check-report.xml
</sonar.dependencyCheck.reportPath>
<sonar.dependencyCheck.htmlReportPath>${project.build.directory}/dependency-check-report.html
</sonar.dependencyCheck.htmlReportPath>

<!-- Dependencies -->
<activemq.version>5.12.0</activemq.version>
<angular.translate.version>2.1.0-1</angular.translate.version>
Expand Down Expand Up @@ -219,7 +213,6 @@
<wro4j.version>1.4.6</wro4j.version>
<xml-apis-ext.version>1.3.04</xml-apis-ext.version>
<zxing.version>3.3.1</zxing.version>
<dependency-check-maven.version>5.3.1</dependency-check-maven.version>
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
</properties>

Expand Down Expand Up @@ -351,18 +344,6 @@
<artifactId>sonar-maven-plugin</artifactId>
<version>${sonar-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>${dependency-check-maven.version}</version>
<configuration>
<format>ALL</format>
<suppressionFiles>
<suppressionFile>owasp-suppression.xml</suppressionFile>
</suppressionFiles>
<failOnError>false</failOnError>
</configuration>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -538,23 +519,6 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>${version.owasp}</version>
<configuration>
<format>ALL</format>
<suppressionFiles>
<suppressionFile>
https://raw.githubusercontent.com/eurodyn/Qlack2/master/owasp-suppression.xml
</suppressionFile>
</suppressionFiles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

Expand Down