Skip to content

ENT-14768 - Forward-merge OS 4.13 to 4.14 #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chriscochrane wants to merge 8 commits into
base: release/os/4.14
Choose a base branch
from
Open

ENT-14768 - Forward-merge OS 4.13 to 4.14 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cea0e68
NOTICK: Update platform version to 4.13 (#151)
shamsasari Sep 18, 2025
ba39a46
ENT-14674 - Resolve integration test failures (#159)
chriscochrane Nov 26, 2025
9ad916a
ENT-14389: upgrade crash version; sync quasar with Corda (#161)
chriscochrane Dec 2, 2025
30d5f33
ENT-14752 - Security dependency update
chriscochrane Dec 17, 2025
b4ea59d
Merge pull request #165 from corda/cc/dev/os/4.13/ent-14752/security_…
adelel1 Dec 18, 2025
28b34f9
Merge branch 'release/os/4.13' into chrisc/os/4.13-mergeto-4.14-20251218
chriscochrane Dec 18, 2025
a9f7a51
Fwd-merge 4.13 to 4.14
chriscochrane Dec 18, 2025
4f1d470
ENT-14768 - sync versions with Corda OS
chriscochrane Dec 19, 2025
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
20 changes: 10 additions & 10 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@ versionSuffix=-SNAPSHOT

# The version of Corda that the shell depends on
# When creating a release build, this should be changed to point to a specific Corda version (e.g 4.9)
cordaReleaseVersion=4.12-RC01
cordaReleaseVersion=4.14-SNAPSHOT
cordaReleaseGroup=net.corda
cordaPlatformVersion=141
cordaPlatformVersion=160
kotlinVersion=1.9.23
crashVersion=1.7.6
crashVersion=1.7.7
sshdCoreVersion=2.13.0_r3
quasar_version=0.9.0_r3
bouncycastleVersion=1.73
quasar_version=0.9.2_r3
bouncycastleVersion=2.73.9
jansiVersion=1.18
rxjavaVersion=1.3.8
jacksonVersion=2.17.0
picocliVersion=3.9.6
typesafeConfigVersion=1.3.4
guavaVersion=33.1.0-jre
commonsLang3Version=3.12.0
artemisVersion=2.32.0
commonsLang3Version=3.19.0
artemisVersion=2.44.0
caffeineVersion=3.1.8
log4jVersion=2.23.1
log4jVersion=2.25.1
slf4jVersion=2.0.12
junitVersion=4.12
junitVintageVersion=5.5.0-RC1
junitPlatformVersion=1.5.0-RC1
junitJupiterVersion=5.5.0-RC1
assertJVersion=3.12.2
jschVersion=0.1.55
gradlePluginsVersion=5.1.0
gradlePluginsVersion=5.1.1
mockitoVersion=5.5.0
mockitoKotlinVersion=5.1.0
mockitoKotlinVersion=5.2.1
internalPublishVersion=1.+
4 changes: 2 additions & 2 deletions shell/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ dependencies {
implementation "$cordaReleaseGroup:corda-jackson:$cordaReleaseVersion"

// Bouncy castle support needed for X509 certificate manipulation
testImplementation "org.bouncycastle:bcprov-jdk18on:${bouncycastleVersion}"
testImplementation "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
testImplementation "org.bouncycastle:bcprov-lts8on:${bouncycastleVersion}"
testImplementation "org.bouncycastle:bcpkix-lts8on:${bouncycastleVersion}"

testImplementation "co.paralleluniverse:quasar-core:$quasar_version"

Expand Down