Skip to content

Commit 211508c

Browse files
authored
Merge branch 'main' into azul-metadata-api
2 parents 12c069f + 5250970 commit 211508c

4 files changed

Lines changed: 30 additions & 16 deletions

File tree

‎.github/java.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@
99
"message": 3
1010
}
1111
]
12+
},
13+
{
14+
"owner": "javac",
15+
"pattern": [
16+
{
17+
"regexp": "^([^:]+):(\\d+): (warning|error): (.+?)$",
18+
"file": 1,
19+
"line": 2,
20+
"severity": 3,
21+
"message": 4
22+
}
23+
]
1224
}
1325
]
14-
}
26+
}

‎.licenses/npm/undici.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ This action allows you to work with Java and Scala projects.
2525
2626
For more details, see the full release notes on the [releases page](https://github.com/actions/setup-java/releases/tag/v5.0.0)
2727

28-
## V2 vs V1
29-
30-
- V2 supports custom distributions and provides support for Azul Zulu OpenJDK, Eclipse Temurin and AdoptOpenJDK out of the box. V1 supports only Azul Zulu OpenJDK.
31-
- V2 requires you to specify distribution along with the version. V1 defaults to Azul Zulu OpenJDK, only version input is required. Follow [the migration guide](docs/switching-to-v2.md) to switch from V1 to V2.
32-
33-
For information about the latest releases, recent updates, and newly supported distributions, please refer to the `setup-java` [Releases](https://github.com/actions/setup-java/releases).
34-
3528
## Usage
3629

3730
- `java-version`: The Java version that is going to be set up. Takes a whole or [semver](#supported-version-syntax) Java version. If not specified, the action will expect `java-version-file` input to be specified.
@@ -98,8 +91,8 @@ steps:
9891
```
9992
10093
#### Supported version syntax
101-
The `java-version` input supports an exact version or a version range using [SemVer](https://semver.org/) notation:
102-
- major versions: `8`, `11`, `16`, `17`, `21`, `25`
94+
The `java-version` input supports an exact version or a version range using [SemVer](https://semver.org/) notation. The values below are examples, not an exhaustive list:
95+
- major versions, such as: `8`, `11`, `16`, `17`, `21`, `25`
10396
- more specific versions: `8.0.282+8`, `8.0.232`, `11.0`, `11.0.4`, `17.0`
10497
- early access (EA) versions: `15-ea`, `15.0.0-ea`
10598

@@ -292,6 +285,15 @@ In the example above multiple JDKs are installed for the same job. The result af
292285
- [Modifying Maven Toolchains](docs/advanced-usage.md#Modifying-Maven-Toolchains)
293286
- [Java Version File](docs/advanced-usage.md#Java-version-file)
294287

288+
## V2 vs V1
289+
290+
Examples in this README use `actions/setup-java@v5`, but the main migration note from V1 still applies to all later major versions (`v2`, `v3`, `v4`, and `v5`):
291+
292+
- Starting with V2, the action supports custom distributions. V1 supports only Azul Zulu OpenJDK.
293+
- Starting with V2, you must specify distribution along with the version. V1 defaults to Azul Zulu OpenJDK, so only version input is required. Follow [the migration guide](docs/switching-to-v2.md) to switch from V1 to V2.
294+
295+
For information about the latest releases, recent updates, and newly supported distributions, please refer to the `setup-java` [Releases](https://github.com/actions/setup-java/releases).
296+
295297
## Recommended permissions
296298

297299
When using the `setup-java` action in your GitHub Actions workflow, it is recommended to set the following permissions to ensure proper functionality:

‎docs/contributors.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ We have prepared a short guide so that the process of making your contribution i
66

77
## How can I contribute...
88

9-
* [Contribute Documentation:green_book:](#contribute-documentation)
9+
* [:green_book: Contribute Documentation](#contribute-documentation)
1010

11-
* [Contribute Code :computer:](#contribute-code)
11+
* [:computer: Contribute Code](#contribute-code)
1212

13-
* [Provide Support on Issues:pencil:](#provide-support-on-issues)
13+
* [:pencil: Provide Support on Issues](#provide-support-on-issues)
1414

15-
* [Review Pull Requests:mag:](#review-pull-requests)
15+
* [:mag: Review Pull Requests](#review-pull-requests)
1616

1717
## Contribute documentation
1818

@@ -111,4 +111,4 @@ Another great way to contribute is is to review pull request. Please, be extra k
111111
- Make sure you're familiar with the code or documentation is updated, unless it's a minor change (spellchecking, minor formatting, etc.)
112112
- Review changes using the GitHub functionality. You can ask a clarifying question, point out an error or suggest an alternative.
113113
> Note: You may ask for minor changes - "nitpicks", but consider whether they are real blockers to merging or not
114-
- Submit your review, which may include comments, an approval, or a changes request
114+
- Submit your review, which may include comments, an approval, or a changes request

0 commit comments

Comments
 (0)