Merge branch '2.17'

FasterXML · Dec 24, 2023 · 72c1132 · 72c1132
2 parents 515d0ac + e3f7e0d
commit 72c1132
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java b/src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java
@@ -122,7 +122,7 @@ public enum Include
          *<ul>
          *  <li>null</li>
          *  <li>"absent" value of a referential type (like Java 8 `Optional`, or
-         *     {link java.util.concurrent.atomic.AtomicReference}); that is, something
+         *     {@link java.util.concurrent.atomic.AtomicReference}); that is, something
          *     that would not deference to a non-null value.
          * </ul>
          * This option is mostly used to work with "Optional"s (Java 8, Guava).