Skip to content

Commit 46e33e4

Browse files
committed
Merge remote-tracking branch 'oracle/master' into hazelcast
# Conflicts: # metadata/index.json # tests/src/index.json
2 parents fb033ff + db165e7 commit 46e33e4

File tree

34 files changed

+4535
-7
lines changed

34 files changed

+4535
-7
lines changed

.github/workflows/test-all-metadata.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
java-version: ${{ matrix.java-version }}
5252
components: 'native-image'
5353
github-token: ${{ secrets.GITHUB_TOKEN }}
54+
native-image-job-reports: 'true'
5455
- name: "🧪 Run '${{ matrix.coordinates }}' tests"
5556
run: |
5657
./gradlew test -Pcoordinates=${{ matrix.coordinates }}

.github/workflows/test-changed-metadata.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
java-version: ${{ matrix.java-version }}
5454
components: 'native-image'
5555
github-token: ${{ secrets.GITHUB_TOKEN }}
56+
native-image-job-reports: 'true'
57+
native-image-pr-reports: 'true'
5658
- name: "🧪 Run '${{ matrix.coordinates }}' tests"
5759
run: |
5860
./gradlew test -Pcoordinates=${{ matrix.coordinates }}

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ In order to ensure that all contributions follow the same standards of quality w
1717
> not be included as it does not compose and can break code in unpredictable ways.
1818
>
1919
> Make sure that you are
20-
>
21-
using [Conditional Configuration](https://www.graalvm.org/22.2/reference-manual/native-image/metadata/#specifying-reflection-metadata-in-json)
20+
> using [Conditional Configuration](https://www.graalvm.org/22.2/reference-manual/native-image/metadata/#specifying-reflection-metadata-in-json)
2221
> in order to precisely define the metadata scope. This is a hard requirement as it prevents unnecessary bloating of
2322
> images.
2423
>

metadata/index.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,11 @@
136136
"module": "com.graphql-java:graphql-java"
137137
},
138138
{
139-
"directory": "com.hazelcast/hazelcast",
140-
"module": "com.hazelcast:hazelcast"
139+
"directory": "net.java.dev.jna/jna",
140+
"module": "net.java.dev.jna:jna"
141+
},
142+
{
143+
"directory": "org.testcontainers/testcontainers",
144+
"module": "org.testcontainers:testcontainers"
141145
}
142146
]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[
2+
"jni-config.json",
3+
"reflect-config.json",
4+
"resource-config.json"
5+
]

0 commit comments

Comments
 (0)