diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 85d5b41..3ab95aa 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -16,22 +16,29 @@ "group": "test" }, { - "label": "sonarqube build", + "label": "sonarqube build (Windows)", "group": "build", "type": "shell", - "command": "mvn", - "args":[ - "clean", - "verify", - "sonar:sonar", - "-D'sonar.projectKey=mattrixwv_javaclasses_AYGcayKpopaC7KAbzMEM'", - "-D'sonar.host.url=http://192.168.1.4:9000'", - "-D'sonar.login=sqp_2af28d9d9fec79b24bc7db35323d9e2f193b7972'" - ], + "command": "./sonarBuild.ps1", "presentation": { "echo": true, "reveal": "always", - "focus": false, + "focus": true, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "problemMatcher": [] + }, + { + "label": "sonarqube build (Linux)", + "group": "build", + "type": "shell", + "command": "./sonarBuild.sh", + "presentation": { + "echo": true, + "reveal": "always", + "focus": true, "panel": "shared", "showReuseMessage": true, "clear": false diff --git a/pom.xml b/pom.xml index 3ceeb0e..9ac49bd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,22 +6,29 @@ mattrixwv myClasses - 1.0.0 + 1.0.1 myClasses www.mattrixwv.com + UTF-8 18 18 + 18 + + + 18 + target/dependency-check-report.json + target/dependency-check-report.html org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.9.0 test @@ -97,7 +104,7 @@ file://${session.executionRootDirectory}/version-rules.xml - + org.sonarsource.scanner.maven sonar-maven-plugin @@ -123,6 +130,25 @@ + + org.owasp + dependency-check-maven + 7.1.1 + + + verify + + check + + + + + + json + html + + + diff --git a/sonarBuild.ps1 b/sonarBuild.ps1 new file mode 100644 index 0000000..f2b0341 --- /dev/null +++ b/sonarBuild.ps1 @@ -0,0 +1 @@ +mvn clean verify sonar:sonar -D'sonar.projectKey=JavaClasses' -D'sonar.host.url=https://sonarqube.mattrixwv.com' -D'sonar.login=sqp_3bd68b2363ccad7d2f9ba76cc6e9871044c26c93' \ No newline at end of file