Skip to content

Commit 0ce8130

Browse files
authored
[skip ci] Fix yaml & markdown (#688)
1 parent eebad30 commit 0ce8130

15 files changed

+34
-81
lines changed

.github/workflows/md-links.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/test-kitchen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: "Test"
88

99
jobs:
1010
lint-unit:
11-
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3
11+
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.1
1212
permissions:
1313
actions: write
1414
checks: write

.markdownlint-cli2.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
config:
2+
ul-indent: false # MD007
3+
line-length: false # MD013
4+
no-duplicate-heading/no-duplicate-header: false # MD024

.vscode/extensions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"recommendations": [
3-
"chef-software.chef",
4-
"rebornix.ruby",
5-
"editorconfig.editorconfig"
3+
"chef-software.chef",
4+
"rebornix.ruby",
5+
"editorconfig.editorconfig"
66
]
77
}

CHANGELOG.md

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ This file is used to list changes made in each version of the Java cookbook.
44

55
## Unreleased
66

7-
## 11.1.5 - *2023-02-20*
8-
97
Standardise files with files in sous-chefs/repo-management
108

9+
## 11.1.5 - *2023-02-20*
10+
1111
Standardise files with files in sous-chefs/repo-management
1212

1313
## 11.1.4 - *2023-02-15*
1414

15+
Standardise files with files in sous-chefs/repo-management
16+
1517
## 11.1.3 - *2023-02-14*
1618

1719
Standardise files with files in sous-chefs/repo-management
@@ -184,41 +186,24 @@ Standardise files with files in sous-chefs/repo-management
184186
## 7.0.0 (2020-03-05)
185187

186188
- Refactored and sped up unit tests.
187-
188-
## Added
189-
190189
- Added `adoptopenjdk_install` resource & documentation
191190
- Added AdoptOpenJDK 13 testing
192-
193-
## Deprecated
194-
195191
- Removed the adoptopenjdk recipe, please use the `adoptopenjdk_install` resource instead.
196192
- Increased the minimum Chef requirement to Chef 15 to use the archive resource.
197193
- Removed AdoptOpenJDK 10 testing
198194

199195
## 6.0.0 (2020-03-02)
200196

201-
## Deprecated
202-
203197
- The resource alias `java_ark` has been deprecated in favour of `java_oracle_install`
204198

205199
## 5.0.0 (2020-02-21)
206200

207-
### Added
208-
209-
### Changed
210-
211201
- Fixed java_certificate regex where it checks if cert exists in cacert file.
212202
- Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk)
213203
- Switch homebrew tap to homebrew/cask-versions
214204
- Make builds parallel
215205
- Updates package name and link changes for adoptopenjdk
216206
- Migrated testing to github actions
217-
218-
### Deprecated
219-
220-
### Removed
221-
222207
- Removes openjdk-6
223208
- Removes openjdk-7 for Ubuntu 16.04
224209
- Removes openjdk-11 for Ubuntu
@@ -589,19 +574,13 @@ Refactor the cookbook to better support wrapper cookbooks and other cookbook aut
589574

590575
## v1.17.4
591576

592-
### Bug
593-
594577
- **[#111](https://github.com/socrata-cookbooks/java/pull/111)** - Fix alternatives for centos
595578

596-
### Improvement
597-
598579
- **[COOK-4165](https://tickets.opscode.com/browse/COOK-4165)** - Replace curl with remote_file with cookie header
599580
- **[#110](https://github.com/socrata-cookbooks/java/pull/110)** - Update openjdk to use the alternatives resource
600581

601582
## v1.17.2
602583

603-
### Bug
604-
605584
- **[COOK-4136](https://tickets.opscode.com/browse/COOK-4136)** - Add md5 parameter to java_ark resource
606585

607586
## v1.17.0
@@ -617,28 +596,20 @@ Refactor the cookbook to better support wrapper cookbooks and other cookbook aut
617596

618597
## v1.16.4
619598

620-
### Bug
621-
622599
- **[#103](https://github.com/socrata/java/pull/103)** - set alternatives when using ibm_tar recipe
623600
- **[#104](https://github.com/socrata/java/pull/104)** - Specify windows attributes in attribute files
624601

625602
## v1.16.2
626603

627-
### Improvement
628-
629604
- **[COOK-3488](https://tickets.opscode.com/browse/COOK-3488)** - set alternatives for ibm jdk
630605
- **[COOK-3764](https://tickets.opscode.com/browse/COOK-3764)** - IBM Java installer needs 'rpm' package on Ubuntu
631606

632-
### Bug
633-
634607
- **[COOK-3857](https://tickets.opscode.com/browse/COOK-3857)** - do not unescape the java windows url before parsing it
635608
- **[#95](https://github.com/socrata/java/pull/95)** - fixes update-alternatives for openjdk installs
636609
- **[#100](https://github.com/socrata/java/pull/100)** - Use escaped quotes for Windows INSTALLDIR
637610

638611
## v1.16.0
639612

640-
### Improvement
641-
642613
- **[COOK-3823](https://tickets.opscode.com/browse/COOK-3823)** - Upgrade to JDK 7u45-b18
643614

644615
## v1.15.4
@@ -651,8 +622,6 @@ Refactor the cookbook to better support wrapper cookbooks and other cookbook aut
651622

652623
## v1.15.0
653624

654-
### Bug
655-
656625
- Fixing version number. Accidently released at 0.15.x instead of 1.15.x
657626

658627
## v0.15.2
@@ -663,37 +632,27 @@ Refactor the cookbook to better support wrapper cookbooks and other cookbook aut
663632

664633
## v1.14.0
665634

666-
### Bug
667-
668635
- **[COOK-3704](https://tickets.opscode.com/browse/COOK-3704)** - Fix alternatives when the package is already installed
669636
- **[COOK-3668](https://tickets.opscode.com/browse/COOK-3668)** - Fix a condition that would result in an error executing action `run` on resource 'bash[update-java-alternatives]'
670637
- **[COOK-3569](https://tickets.opscode.com/browse/COOK-3569)** - Fix bad checksum length
671638
- **[COOK-3541](https://tickets.opscode.com/browse/COOK-3541)** - Fix an issue where Java cookbook installs both JDK 6 and JDK 7 when JDK 7 is specified
672639
- **[COOK-3518](https://tickets.opscode.com/browse/COOK-3518)** - Allow Windoes recipe to download from signed S3 url
673640
- **[COOK-2996](https://tickets.opscode.com/browse/COOK-2996)** - Fix a failure on Centos 6.4 and Oracle JDK 7
674641

675-
### Improvement
676-
677642
- **[COOK-2793](https://tickets.opscode.com/browse/COOK-2793)** - Improve Windows support
678643

679644
## v1.13.0
680645

681-
### Bug
682-
683646
- **[COOK-3295](https://tickets.opscode.com/browse/COOK-3295)** - Add default `platform_family` option in Java helper
684647
- **[COOK-3277](https://tickets.opscode.com/browse/COOK-3277)** - Fix support for Fedora
685648

686-
### Improvement
687-
688649
- **[COOK-3278](https://tickets.opscode.com/browse/COOK-3278)** - Upgrade to Oracle Java 7u25
689650
- **[COOK-3029](https://tickets.opscode.com/browse/COOK-3029)** - Add Oracle RPM support
690651
- **[COOK-2931](https://tickets.opscode.com/browse/COOK-2931)** - Add support for the platform `xenserver`
691652
- **[COOK-2154](https://tickets.opscode.com/browse/COOK-2154)** - Add SmartOS support
692653

693654
## v1.12.0
694655

695-
### Improvement
696-
697656
- [COOK-2154]: Add SmartOS support to java::openjdk recipe
698657
- [COOK-3278]: upgrade to Oracle Java 7u25
699658
- [COOK-2931]: Adding support for the platform 'xenserver' (for installations of java in DOM0)

documentation/resources/adoptopenjdk_install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[back to resource list](https://github.com/sous-chefs/java#resources)
2-
31
# adoptopenjdk_install
42

3+
[back to resource list](https://github.com/sous-chefs/java#resources)
4+
55
Introduced: v7.0.0
66

77
## Actions

documentation/resources/adoptopenjdk_linux_install.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[back to resource list](https://github.com/sous-chefs/java#resources)
21

32
# adoptopenjdk_linux_install
43

4+
[back to resource list](https://github.com/sous-chefs/java#resources)
5+
56
Introduced: v8.1.0
67

78
## Actions

documentation/resources/adoptopenjdk_macos_install.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[back to resource list](https://github.com/sous-chefs/java#resources)
21

32
# adoptopenjdk_macos_install
43

4+
[back to resource list](https://github.com/sous-chefs/java#resources)
5+
56
Introduced: v8.1.0
67

78
## Actions

documentation/resources/alternatives.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[back to resource list](https://github.com/sous-chefs/java#resources)
21

32
# java_alternatives
43

4+
[back to resource list](https://github.com/sous-chefs/java#resources)
5+
56
The `java_alternatives` resource uses `update-alternatives` command to set and unset command alternatives for various Java tools such as java, javac, etc.
67

78
## Actions

documentation/resources/certificate.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[back to resource list](https://github.com/sous-chefs/java#resources)
21

32
# java_certificate
43

4+
[back to resource list](https://github.com/sous-chefs/java#resources)
5+
56
Java certificate simplifies adding certificates to a java keystore.
67
It can also populate the keystore with a certificate retrieved from a given SSL end-point.
78

@@ -14,8 +15,8 @@ It can also populate the keystore with a certificate retrieved from a given SSL
1415

1516
| Name | Type | Default | Description |
1617
| ----------------- | ------ | --------------------------- | --------------------------------------------------------------------------------------- |
17-
| `java_home` | | node['java']['java_home'] | The java home directory |
18-
| `java_version` | | node['java']['jdk_version'] | The java version |
18+
| `java_home` | | `node['java']['java_home']` | The java home directory |
19+
| `java_version` | | `node['java']['jdk_version']` | The java version |
1920
| `keystore_path` | String | | Path to the keystore |
2021
| `keystore_passwd` | String | `changeit` | Password to the keystore |
2122
| `cert_alias` | String | | The alias of the certificate in the keystore. This defaults to the name of the resource |

0 commit comments

Comments
 (0)