Skip to content

Commit

Permalink
Refresh build toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
timja committed Jan 6, 2023
1 parent 33658dd commit 5101dc1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 30 deletions.
1 change: 0 additions & 1 deletion .run/start jenkins.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<option name="mavenProperties">
<map>
<entry key="java.awt.headless" value="true" />
<entry key="jenkins.version" value="2.302" />
<entry key="port" value="8085" />
</map>
</option>
Expand Down
16 changes: 11 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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 ],
])
7 changes: 2 additions & 5 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://localhost:8080/jenkins/configuration-as-code/> 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 <http://localhost:8085/jenkins/configuration-as-code/> to test the plugin locally.

### CLI

Expand Down
17 changes: 1 addition & 16 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,11 @@
<hpi.pluginLogoUrl>https://raw.githubusercontent.com/jenkinsci/configuration-as-code-plugin/master/plugin/src/main/webapp/img/logo-head.svg</hpi.pluginLogoUrl>
</properties>

<developers>
<developer>
<id>jetersen</id>
<name>Joseph Petersen</name>
</developer>
<developer>
<id>timja</id>
<name>Tim Jacomb</name>
</developer>
<developer>
<id>oleg_nenashev</id>
<name>Oleg Nenashev</name>
</developer>
</developers>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.319.x</artifactId>
<artifactId>bom-2.361.x</artifactId>
<version>${plugin-bom.version}</version>
<scope>import</scope>
<type>pom</type>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.46</version>
<version>4.53</version>
<relativePath />
</parent>
<groupId>io.jenkins.configuration-as-code</groupId>
Expand All @@ -21,10 +21,10 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/configuration-as-code-plugin</gitHubRepo>
<jenkins.version>2.319.3</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
<useBeta>true</useBeta>
<plugin-bom.version>1643.v1cffef51df73</plugin-bom.version>
<plugin-bom.version>1766.v0b_f2a_f7d0b_1d</plugin-bom.version>
</properties>

<name>Configuration as Code Parent</name>
Expand Down

0 comments on commit 5101dc1

Please sign in to comment.