Skip to content

Commit 8c66f79

Browse files
committed
Merge branch '2.19'
2 parents c24a88d + 045f387 commit 8c66f79

File tree

4 files changed

+47
-6
lines changed

4 files changed

+47
-6
lines changed

.github/workflows/dep_build_v2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
env:
1919
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222
- name: Set up JDK
23-
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
23+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
2424
with:
2525
distribution: 'temurin'
2626
java-version: ${{ matrix.java_version }}

.github/workflows/dep_build_v3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
env:
1919
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222
with:
2323
ref: master
2424
- name: Set up JDK
25-
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
25+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
2626
with:
2727
distribution: 'temurin'
2828
java-version: ${{ matrix.java_version }}

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
env:
3131
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
3232
steps:
33-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
33+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3434
- name: Set up JDK
35-
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
35+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
3636
with:
3737
distribution: 'temurin'
3838
java-version: ${{ matrix.java_version }}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package jr.failing;
2+
3+
import com.fasterxml.jackson.jr.ob.JSON;
4+
5+
import junit.framework.TestCase;
6+
7+
public class RecordDeser167Test extends TestCase
8+
{
9+
record FoundDependency(String id, String g, String a, String v, String timestamp) {}
10+
11+
// [jackson-jr#167]
12+
public void testRecordDeserOrder167() throws Exception
13+
{
14+
final String input = """
15+
{
16+
"id": "org.apache.maven:maven-core:3.9.8",
17+
"g": "org.apache.maven",
18+
"a": "maven-core",
19+
"v": "3.9.8",
20+
"p": "jar",
21+
"timestamp": 1718267050000,
22+
"ec": [
23+
"-cyclonedx.json",
24+
"-sources.jar",
25+
"-cyclonedx.xml",
26+
".pom",
27+
"-javadoc.jar",
28+
".jar"
29+
],
30+
"tags": [
31+
"core",
32+
"maven",
33+
"classes"
34+
]
35+
}
36+
""";
37+
final var expected = new FoundDependency("org.apache.maven:maven-core:3.9.8", "org.apache.maven", "maven-core", "3.9.8", "1718267050000");
38+
final var actual = JSON.std.beanFrom(FoundDependency.class, input);
39+
assertEquals(expected, actual);
40+
}
41+
}

0 commit comments

Comments
 (0)