diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..54362a4 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @jenkinsci/extended-read-permission-plugin-developers diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..88446ac --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: maven + directory: "/" + schedule: + interval: monthly + target-branch: master + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly 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/Jenkinsfile b/Jenkinsfile index 5cac60c..2600501 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,6 @@ -#!/usr/bin/env groovy - -/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ -buildPlugin(configurations: [ - [ platform: "linux", jdk: "8", jenkins: null ], - [ platform: "linux", jdk: "11", jenkins: "2.222.3", javaLevel: 8 ] -]) +buildPlugin( + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests + configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], + ]) diff --git a/pom.xml b/pom.xml index f02cdec..ea78895 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,8 @@ org.jenkins-ci.plugins plugin - 3.48 + 4.63 + org.jvnet.hudson.plugins @@ -21,8 +22,7 @@ https://github.com/jenkinsci/extended-read-permission-plugin - 2.138.3 - 8 + 2.387.3 @@ -33,11 +33,10 @@ creator (retired) - - scm:git: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 HEAD diff --git a/src/test/java/hudson/plugins/extendedread/SystemReadPermissionEnablerTest.java b/src/test/java/hudson/plugins/extendedread/SystemReadPermissionEnablerTest.java index d2b55d1..dcac54a 100644 --- a/src/test/java/hudson/plugins/extendedread/SystemReadPermissionEnablerTest.java +++ b/src/test/java/hudson/plugins/extendedread/SystemReadPermissionEnablerTest.java @@ -8,9 +8,9 @@ import org.jvnet.hudson.test.JenkinsRule; import static java.util.Objects.requireNonNull; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; public class SystemReadPermissionEnablerTest {