Skip to content

Commit 1cc54d0

Browse files
author
Duncan Schulze
authored
Merge branch 'master' into add-corretto
2 parents e9dcb4c + 03afa97 commit 1cc54d0

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

.mdlrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rules "~MD036"

README.md

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
[![Cookbook Version](https://img.shields.io/cookbook/v/java.svg)](https://supermarket.chef.io/cookbooks/java)
44
[![Build Status](https://img.shields.io/circleci/project/github/sous-chefs/java/master.svg)](https://circleci.com/gh/sous-chefs/java)
5-
[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
5+
[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers)
6+
[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors)
7+
[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
68

79
This cookbook installs a Java JDK/JRE. It defaults to installing OpenJDK, but it can also install Oracle, IBM JDKs or AdoptOpenJDK.
810

@@ -174,7 +176,7 @@ While public YUM repos for Oracle Java 7 and prior are available, you need to do
174176

175177
### adoptopenjdk
176178

177-
This recipe installs the `AdoptOpenJDK` flavor of Java from https://adoptopenjdk.net/. It also uses the `alternatives` system on the RHEL/Debian families to set the default Java.
179+
This recipe installs the `AdoptOpenJDK` flavor of Java from [https://adoptopenjdk.net/.](https://adoptopenjdk.net/.) It also uses the `alternatives` system on the RHEL/Debian families to set the default Java.
178180

179181
### Amazon Corretto
180182
This recipe installs the `Amazon Corretto` flavor of OpenJDK from https://aws.amazon.com/corretto/. It also uses the `alternatives` system on RHEL/Debian families to set the default Java.
@@ -337,7 +339,7 @@ Only one of the following
337339

338340
### Examples
339341

340-
```
342+
```ruby
341343
java_certificate "Install LDAP server certificate to Java CA keystore for Jenkins" do
342344
cert_alias node['jenkins']['ldap']['url'][/\/\/(.*)/, 1]
343345
ssl_endpoint node['jenkins']['ldap']['url']
@@ -432,23 +434,27 @@ suites:
432434
433435
Log into the IBM DeveloperWorks site to download a copy of the IBM Java SDK you wish to use/test, host it on an internal HTTP server, and calculate the SHA256 checksum to use in the suite.
434436
435-
## License and Author
437+
## Contributors
436438
437-
- Author: Eric Helgeson ([[email protected]](mailto:[email protected]))
438-
- Author: Tim Smith ([[email protected]](mailto:[email protected]))
439+
This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false)
439440
440-
Copyright: 2014-2017, Agile Orbit, LLC
441+
### Backers
441442
442-
```
443-
Licensed under the Apache License, Version 2.0 (the "License");
444-
you may not use this file except in compliance with the License.
445-
You may obtain a copy of the License at
443+
Thank you to all our backers!
446444
447-
http://www.apache.org/licenses/LICENSE-2.0
445+
![https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40)
448446
449-
Unless required by applicable law or agreed to in writing, software
450-
distributed under the License is distributed on an "AS IS" BASIS,
451-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
452-
See the License for the specific language governing permissions and
453-
limitations under the License.
454-
```
447+
### Sponsors
448+
449+
Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
450+
451+
![https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100)
452+
![https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100)
453+
![https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100)
454+
![https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100)
455+
![https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100)
456+
![https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100)
457+
![https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100)
458+
![https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100)
459+
![https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100)
460+
![https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100)

0 commit comments

Comments
 (0)