diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..f5f4993 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @jenkinsci/mathworks-polyspace-plugin-developers diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c9f5a69 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates + +version: 2 +updates: + - package-ecosystem: maven + directory: / + schedule: + interval: monthly + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..62eafb8 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,2 @@ +_extends: .github +tag-template: ${artifactId}-$NEXT_MINOR_VERSION diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml new file mode 100644 index 0000000..1afbaec --- /dev/null +++ b/.github/workflows/jenkins-security-scan.yml @@ -0,0 +1,22 @@ +# More information about the Jenkins security scan can be found at the developer docs: https://www.jenkins.io/redirect/jenkins-security-scan/ + +name: Jenkins Security Scan +on: + push: + branches: + - "master" + pull_request: + types: [ opened, synchronize, reopened ] + workflow_dispatch: + +permissions: + security-events: write + contents: read + actions: read + +jobs: + security-scan: + uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2 + with: + java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate. + java-version: 11 # What version of Java to set up for the build. diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 0000000..322d9c4 --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,16 @@ +# Automates creation of Release Drafts using Release Drafter +# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc + +on: + push: + branches: + - master + +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + # Drafts your next Release notes as Pull Requests are merged into the default branch + - uses: release-drafter/release-drafter@v6 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 713f25b..0834364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,15 @@ -.vscode -work target -release.properties -pom.xml.releaseBackup + +# mvn hpi:run +work + +# IntelliJ IDEA project files +*.iml +*.iws +*.ipr +.idea + +# Eclipse project files +.settings +.classpath +.project diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..75c0dee --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.7 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..2a0299c --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals diff --git a/Jenkinsfile b/Jenkinsfile index 3eb491f..4c33383 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,11 @@ -buildPlugin() - +/* + See the documentation for more options: + https://github.com/jenkins-infra/pipeline-library/ +*/ +buildPlugin( + forkCount: '1C', // run this number of tests in parallel for faster feedback. If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests + configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'linux', jdk: 17], + ]) diff --git a/pom.xml b/pom.xml index 74518b7..cfe6a07 100644 --- a/pom.xml +++ b/pom.xml @@ -3,17 +3,15 @@ org.jenkins-ci.plugins plugin - 4.73 + 4.78 + - - 2.387.3 + 2.426.3 true - + + High mathworks-polyspace @@ -22,7 +20,6 @@ MathWorks Polyspace Plugin https://github.com/jenkinsci/mathworks-polyspace-plugin hpi - Jenkins plugin for Polyspace @@ -41,10 +38,10 @@ - scm:git:ssh://github.com:jenkinsci/${project.artifactId}-plugin.git - scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}-plugin.git + scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git + scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git https://github.com/jenkinsci/${project.artifactId}-plugin.git - mathworks-polyspace-1.0.8 + ${scmTag} @@ -76,26 +73,35 @@ + + + + io.jenkins.tools.bom + bom-2.414.x + 2857.v01a_0144eb_20b_ + import + pom + + + + - org.apache.commons - commons-lang3 - 3.13.0 + io.jenkins.plugins + commons-lang3-api org.jenkins-ci.plugins credentials - 1271.v54b_1c2c6388a_ org.jenkins-ci.plugins mailer - 463.vedf8358e006b_ diff --git a/src/main/java/com/mathworks/polyspace/jenkins/utils/PolyspaceHelpersUtils.java b/src/main/java/com/mathworks/polyspace/jenkins/utils/PolyspaceHelpersUtils.java index b1ad7dc..513317a 100644 --- a/src/main/java/com/mathworks/polyspace/jenkins/utils/PolyspaceHelpersUtils.java +++ b/src/main/java/com/mathworks/polyspace/jenkins/utils/PolyspaceHelpersUtils.java @@ -220,7 +220,7 @@ public static long getCountFindings(final Path report) throws IOException { * * @param report - Path to the report * @param max - Thereshold for status - * @return - Job status string: SUCCESS if num findings < {@code max}, UNSTABLE otherwise + * @return - Job status string: SUCCESS if num findings smaller than {@code max}, UNSTABLE otherwise * @throws IOException */ public static String getReportStatus(final Path report, final long max) throws IOException