From 07a08f25b626e9e5dfafc6c36f0c78bf52ba359d Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 18 Jan 2024 11:28:07 -0800 Subject: [PATCH] Forward compatibility with Guice 7 --- .github/dependabot.yml | 12 ++++++++++ .github/workflows/jenkins-security-scan.yml | 23 +++++++++++++++++++ .mvn/extensions.xml | 2 +- .travis.yml | 9 -------- Jenkinsfile | 5 +++- pom.xml | 12 +++++----- .../xunit/service/XUnitConversionService.java | 2 +- .../service/XUnitTransformerCallable.java | 2 +- .../xunit/service/XUnitValidationService.java | 2 +- .../plugins/xunit/XUnitPublisherTest.java | 2 +- 10 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/jenkins-security-scan.yml delete mode 100644 .travis.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..dbf05b3d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +--- +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml new file mode 100644 index 00000000..3e5027a8 --- /dev/null +++ b/.github/workflows/jenkins-security-scan.yml @@ -0,0 +1,23 @@ +# Jenkins Security Scan +# For more information, see: https://www.jenkins.io/doc/developer/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' + java-version: 11 diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 9ac2968b..1f363640 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.4 + 1.7 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bf9c78b8..00000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: java - -sudo: false - -jdk: - - openjdk8 - -after_success: -- mvn test jacoco:report coveralls:report -Pcoverage \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 9a3e0b41..5e52cc72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,7 @@ #!/usr/bin/env groovy // see https://github.com/jenkins-infra/pipeline-library -buildPlugin(jdkVersions: [11]) \ No newline at end of file +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], +]) diff --git a/pom.xml b/pom.xml index 8333dda7..45b4acd9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.51 + 4.77 @@ -46,13 +46,13 @@ 3.1.4 -SNAPSHOT 3.0.0 - 2.346.3 + 2.414.3 jenkinsci/${project.artifactId}-plugin 3.15.0 3.0.2 - 2.7.0 + 2.9.1 @@ -73,8 +73,8 @@ io.jenkins.tools.bom - bom-2.346.x - 1763.v092b_8980a_f5e + bom-2.414.x + 2718.v7e8a_d43b_3f0b_ import pom @@ -176,7 +176,7 @@ maven-checkstyle-plugin - 3.1.1 + 3.3.1 ${basedir}/checkstyle.xml ${project.build.sourceDirectory} diff --git a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitConversionService.java b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitConversionService.java index ae607daa..f7501dce 100644 --- a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitConversionService.java +++ b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitConversionService.java @@ -29,7 +29,7 @@ import java.io.Serializable; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.io.FileUtils; import org.jenkinsci.lib.dtkit.model.InputMetric; diff --git a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitTransformerCallable.java b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitTransformerCallable.java index 47c627f4..585b6dd5 100644 --- a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitTransformerCallable.java +++ b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitTransformerCallable.java @@ -26,7 +26,7 @@ import java.io.File; import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.io.FileUtils; import org.jenkinsci.lib.dtkit.util.validator.ValidationError; diff --git a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitValidationService.java b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitValidationService.java index 52f944c2..40d02604 100644 --- a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitValidationService.java +++ b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitValidationService.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.io.Serializable; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jenkinsci.lib.dtkit.model.InputMetric; import org.jenkinsci.lib.dtkit.util.validator.ValidationError; diff --git a/src/test/java/org/jenkinsci/plugins/xunit/XUnitPublisherTest.java b/src/test/java/org/jenkinsci/plugins/xunit/XUnitPublisherTest.java index aed670e8..1e90fb0d 100644 --- a/src/test/java/org/jenkinsci/plugins/xunit/XUnitPublisherTest.java +++ b/src/test/java/org/jenkinsci/plugins/xunit/XUnitPublisherTest.java @@ -24,7 +24,7 @@ package org.jenkinsci.plugins.xunit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.io.IOException; import java.util.HashSet;