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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
import org.lfdecentralizedtrust.splice.util.{FrontendLoginUtil, AnsFrontendTestUtil, WalletTestUtil}
import monocle.macros.syntax.lens.*

import java.net.URL
import java.net.URI

class AnsAuth0FrontendIntegrationTest
extends FrontendIntegrationTest("alice")
Expand All @@ -29,7 +29,9 @@ class AnsAuth0FrontendIntegrationTest
.replace(
Rs256(
sys.env("OIDC_AUTHORITY_VALIDATOR_AUDIENCE"),
new URL(s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"),
new URI(
s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"
).toURL,
)
)
)(c)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import org.lfdecentralizedtrust.splice.util.{
}
import monocle.macros.syntax.lens.*

import java.net.URL
import java.net.URI

class WalletAuth0FrontendIntegrationTest
extends FrontendIntegrationTest("randomUser")
Expand All @@ -31,7 +31,9 @@ class WalletAuth0FrontendIntegrationTest
.replace(
Rs256(
sys.env("OIDC_AUTHORITY_VALIDATOR_AUDIENCE"),
new URL(s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"),
new URI(
s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"
).toURL,
)
)
)(spliceConfig)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ object MemoryCheck {
}

// Delegated methods
@deprecated("method deprecated by Java", since = "Java 18")
override def getObjectPendingFinalizationCount: Int = delegate.getObjectPendingFinalizationCount
override def getHeapMemoryUsage: MemoryUsage = delegate.getHeapMemoryUsage
override def getNonHeapMemoryUsage: MemoryUsage = delegate.getNonHeapMemoryUsage
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/canton/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN ln -s bin/canton splice-image-bin

FROM fullstorydev/grpcurl:v1.9.2 AS grpcurl

FROM eclipse-temurin:17-jdk-jammy
FROM eclipse-temurin:21-jdk-noble
COPY --from=build /usr/bin/tini /usr/bin/tini
COPY --from=build /usr/bin/screen /usr/bin/screen
COPY --from=grpcurl /bin/grpcurl /bin/grpcurl
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/splice-app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN mkdir -p /app/splice-node/docs/html/cn-release-bundles
RUN ln -s splice-node/bin/splice-node splice-image-bin

# This Dockerfile is a modified version of Canton's Dockerfile
FROM eclipse-temurin:17-jdk-jammy
FROM eclipse-temurin:21-jdk-noble
COPY --from=build /usr/bin/tini /usr/bin/tini
COPY --from=build /usr/bin/screen /usr/bin/screen
COPY --from=build /app/ /app/
Expand Down
1 change: 1 addition & 0 deletions docs/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Upcoming
- Deployment

- Fix a typo in the `splice-participant` Helm chart that caused the participant container to be named `participant-1` instead of `participant`.
- Java 21 replaces Java 17 in all Docker images and as the base JDK for building Splice apps.

0.4.1
-----
Expand Down
4 changes: 2 additions & 2 deletions nix/overlays.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[(self: super: {
openapi-generator-cli = (super.openapi-generator-cli.override { jre = super.openjdk17; }).overrideAttrs(oldAttrs: rec {
openapi-generator-cli = (super.openapi-generator-cli.override { jre = super.openjdk21; }).overrideAttrs(oldAttrs: rec {
# 7.0.1 causes some issues in the generated package.json which break module resolution.
version = "6.6.0";
jarfilename = "${oldAttrs.pname}-${version}.jar";
Expand All @@ -8,7 +8,7 @@
sha256 = "sha256-lxj/eETolGLHXc2bIKNRNvbbJXv+G4dNseMALpneRgk=";
};
});
jre = super.openjdk17;
jre = super.openjdk21;
lnav = super.callPackage ./lnav.nix {};
canton = super.callPackage ./canton.nix {};
cometbft_driver = super.callPackage ./cometbft-driver.nix {};
Expand Down
2 changes: 1 addition & 1 deletion nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ in pkgs.mkShell {
nodePackages.node2nix
npmPkgs.syncpack
openapi-generator-cli
openjdk17
openjdk21
pigz
popeye
postgresql_14
Expand Down
Loading