diff --git a/.run/start jenkins.run.xml b/.run/start jenkins.run.xml index c0a7214180..e7713400e0 100644 --- a/.run/start jenkins.run.xml +++ b/.run/start jenkins.run.xml @@ -12,7 +12,6 @@ diff --git a/Jenkinsfile b/Jenkinsfile index ad18d43564..5059ad00dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,11 @@ -def configurations = [ - [ platform: "linux", jdk: "11" ], - [ platform: 'linux', jdk: '17', jenkins: '2.342' ] -] -buildPlugin(configurations: configurations, timeout: 180, useContainerAgent: true) +/* + See the documentation for more options: + https://github.com/jenkins-infra/pipeline-library/ +*/ +buildPlugin( + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests + timeout: 180, + configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'linux', jdk: 11 ], +]) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index edc51a104c..cc2a477d69 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -68,14 +68,11 @@ Prerequisites: _Java_, _Maven_ & _IntelliJ IDEA_ - Open the root directory of this project in IntelliJ IDEA. - If you are opening the first time, wait patiently while project dependencies are being downloaded. -- Click `Run` in the menu. Select `Edit Configurations` in the menu item. -- Click `Add New Configuration` (`+`) in the top left of the shown dialog. Select `Maven`. -- Under `Parameters` tab group, `Working directory:` is `/path/to/configuration-as-code-plugin/plugin`. -- Under `Parameters` tab group, `Command line:` is `hpi:run`. - Verify that IntelliJ IDEA is not using bundled maven. - Click `File` -> `Preferences...` -> `Build, Execution, Deployment` -> `Build Tools` -> `Maven`. - `Maven home directory:` has `/path/to/apache-maven-x.y.z` value, not `Bundled (Maven 3)`. -- Open to test the plugin locally. +- Use the `start jenkins` run configuration stored in the `.run` folder of this project, (if you wish to change it then duplicate it and maintain your own local copy) +- Open to test the plugin locally. ### CLI diff --git a/plugin/pom.xml b/plugin/pom.xml index 69ba6d1a79..9e605b04a2 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -29,26 +29,11 @@ https://raw.githubusercontent.com/jenkinsci/configuration-as-code-plugin/master/plugin/src/main/webapp/img/logo-head.svg - - - jetersen - Joseph Petersen - - - timja - Tim Jacomb - - - oleg_nenashev - Oleg Nenashev - - - io.jenkins.tools.bom - bom-2.319.x + bom-2.361.x ${plugin-bom.version} import pom diff --git a/pom.xml b/pom.xml index 2bb9dc2088..ccffff1669 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.46 + 4.53 io.jenkins.configuration-as-code @@ -21,10 +21,10 @@ 999999-SNAPSHOT jenkinsci/configuration-as-code-plugin - 2.319.3 + 2.361.4 configuration-as-code-@{project.version} true - 1643.v1cffef51df73 + 1766.v0b_f2a_f7d0b_1d Configuration as Code Parent