Skip to content

Commit 3227aaf

Browse files
authored
Merge branch 'main' into dependabot/github_actions/main/graalvm/setup-graalvm-1.6.6
2 parents fd188a9 + 06da4e3 commit 3227aaf

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
run: ./gradlew --no-build-cache clean compileJava compileTestJava
4646

4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4
48+
uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4

‎.github/workflows/sha-pinning-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1414

15-
- uses: zgosalvez/github-actions-ensure-sha-pinned-actions@60e3a74c7b74a319e8e53e46bc455205f7173e1a # v5.0.8
15+
- uses: zgosalvez/github-actions-ensure-sha-pinned-actions@62574f011e0d1967d555a862bd28a7abba8684fe # v5.0.9

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,15 @@ private static void configureResolvedVersionsWithVersionMapping(Project project)
8484

8585
## Coming from palantir-java-format
8686

87-
- **Identical output.** 2.98.0.1 is the code of palantir-java-format 2.98.0, renamed and rebuilt in
88-
the open. The fourth number counts builds of an upstream version.
87+
- **Same output, except for bug fixes.** 2.98.0.x is the code of palantir-java-format 2.98.0, renamed
88+
and rebuilt in the open. Its output is the same except where it fixes a bug, and
89+
[Migrate](https://openjavaformat.dev/migrate/) lists those fixes. The fourth number counts builds of
90+
an upstream version.
8991
- **Identical Java packages.** `com.palantir.javaformat.*` stays for the whole 2.x line, so your code
9092
and the SPI keep working.
9193
- **One-line migration.** Change the coordinates below. Nothing else.
9294

93-
Changes to the formatter's output wait for 3.0.
95+
Other changes to the formatter's output wait for 3.0.
9496

9597
| | palantir-java-format | open-java-format |
9698
|---|---|---|

0 commit comments

Comments
 (0)