Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<maven.compiler.release>17</maven.compiler.release>

<!-- Pinned Rift engine release the natives + version preflight track (no leading 'v'). -->
<rift.engine.version>0.18.0</rift.engine.version>
<rift.engine.version>0.18.1</rift.engine.version>

<!-- rift-java-bom's resolve-through-bom invoker IT is self-validation, not a prerequisite for
the BOM artifact. It runs at integration-test (before install) and needs network to resolve
Expand Down
6 changes: 3 additions & 3 deletions rift-java-conformance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ holding `manifest.json` and `corpus/`):
```bash
# Download + extract the corpus for the pinned engine version, then:
./mvnw -pl rift-java-conformance -am test \
-Drift.corpus.root=/path/to/sdk-conformance-v0.18.0
-Drift.corpus.root=/path/to/sdk-conformance-v0.18.1
```

Resolution order for the corpus: `-Drift.corpus.root` → `RIFT_CORPUS_ROOT` → `target/corpus`. When
Expand All @@ -68,14 +68,14 @@ cached on first use):

```bash
RIFT_IT=1 ./mvnw -pl rift-java-conformance -am verify \
-Drift.corpus.root=/path/to/sdk-conformance-v0.18.0
-Drift.corpus.root=/path/to/sdk-conformance-v0.18.1
```

Over the embedded transport (JDK 21 or 22+, with a `librift_ffi` for your platform):

```bash
RIFT_IT=1 CONFORMANCE_TRANSPORT=EMBEDDED ./mvnw -pl rift-java-conformance -am verify \
-Drift.corpus.root=/path/to/sdk-conformance-v0.18.0 \
-Drift.corpus.root=/path/to/sdk-conformance-v0.18.1 \
-Drift.ffi.lib=/path/to/librift_ffi-<platform>.<ext>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ class RiftContainerTest {
@Test
void defaultImageUsesPinnedEngineVersion() {
// AC4: single-sourced from the <rift.engine.version> property via resource filtering.
assertEquals("0.18.0", RiftContainer.ENGINE_VERSION, "engine version resolved from filtered resource");
assertEquals("0.18.1", RiftContainer.ENGINE_VERSION, "engine version resolved from filtered resource");
try (RiftContainer container = new RiftContainer()) {
assertEquals("zainalpour/rift-proxy:v0.18.0", container.configuredImageName());
assertEquals("zainalpour/rift-proxy:v0.18.1", container.configuredImageName());
}
}

Expand Down Expand Up @@ -145,7 +145,7 @@ void rejectsUpstreamTrustOnAnImageOlderThan018() {
@Test
void acceptsUpstreamTrustOnA018ImageOrAnUnversionedTag() {
// A tag that is not a version (latest, a digest, a custom build) cannot be checked, so it is let through.
for (String image : new String[] {"zainalpour/rift-proxy:v0.18.0", "zainalpour/rift-proxy:0.19.1",
for (String image : new String[] {"zainalpour/rift-proxy:v0.18.1", "zainalpour/rift-proxy:0.19.1",
"zainalpour/rift-proxy:latest", "acme/rift:nightly"}) {
try (RiftContainer container = new RiftContainer(DockerImageName.parse(image))) {
container.withUpstreamTrust(new UpstreamTrust.SkipVerify());
Expand Down
Loading