Skip to content

Commit e6759d5

Browse files
authored
Merge pull request #165 from jonesbusy/feature/jenkins-file-archetype
Remove build on JDK11, update doc and change license to MIT
2 parents 16d95ed + b40a11d commit e6759d5

File tree

7 files changed

+37
-215
lines changed

7 files changed

+37
-215
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* text eol=lf
2+
*.png binary

.github/workflows/updatecli.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: updatecli
22

33
on:
44
workflow_dispatch:
5-
schedule:
6-
- cron: '0 3 * * *'
75

86
jobs:
97
updatecli:

Jenkinsfile

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/*
2-
* See the documentation for more options:
3-
* https://github.com/jenkins-infra/pipeline-library/
4-
*/
5-
buildPlugin(useContainerAgent: true, configurations: [
6-
[ platform: 'windows', jdk: 11],
7-
[ platform: 'linux', jdk: 17],
8-
[ platform: 'linux', jdk: 21],
2+
See the documentation for more options:
3+
https://github.com/jenkins-infra/pipeline-library/
4+
*/
5+
buildPlugin(
6+
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
7+
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
8+
configurations: [
9+
[platform: 'linux', jdk: 21],
10+
[platform: 'windows', jdk: 17],
911
])

LICENSE

-202
This file was deleted.

LICENSE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License
2+
3+
Copyright 2023
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# Jenkins Ansible Plugin
1+
# Ansible Plugin
2+
3+
![Build](https://ci.jenkins.io/job/Plugins/job/ansible-plugin/job/main/badge/icon)
4+
![Contributors](https://img.shields.io/github/contributors/jenkinsci/ansible-plugin.svg?color=blue)
5+
[![GitHub release](https://img.shields.io/github/release/jenkinsci/ansible-plugin.svg?label=changelog)](https://github.com/jenkinsci/ansible-plugin/releases/latest)
6+
[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/ansible.svg?color=blue)](https://plugins.jenkins.io/ansible)
7+
[![GitHub license](https://img.shields.io/github/license/jenkinsci/ansible-plugin)](https://github.com/jenkinsci/ansible-plugin/blob/main/LICENSE.md)
28

39
This plugin allows to execute [Ansible](http://www.ansible.com/) tasks as a job build step.
410

@@ -556,3 +562,11 @@ node {
556562
}
557563
}
558564
```
565+
566+
## Contributing
567+
568+
Refer to our [contribution guidelines](https://github.com/jenkinsci/.github/blob/master/CONTRIBUTING.md)
569+
570+
## LICENSE
571+
572+
Licensed under MIT, see [LICENSE](LICENSE.md)

pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
<description>Ansible support in Jenkins</description>
1616
<licenses>
1717
<license>
18-
<name>Apache License, Version 2.0</name>
19-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
20-
<distribution>repo</distribution>
18+
<name>MIT License</name>
19+
<url>https://opensource.org/license/mit/</url>
2120
</license>
2221
</licenses>
2322
<scm>

0 commit comments

Comments
 (0)