daa5de7592
Merge pull request #7584 from corda/cc/dev/os/4.11/db_identifier_too_long
...
ENT-11168 - reduce database index name.
2023-11-21 15:07:58 +00:00
a1253c1f12
Merge pull request #7582 from corda/merge-release/os/4.10-release/os/4.11-2023-11-20-9
...
ES-1331: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-20
2023-11-21 13:03:25 +00:00
d8b19de46e
Renamed index to keep Oracle happy
2023-11-21 11:48:37 +00:00
2adb502405
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2023-11-20-9
2023-11-21 09:16:06 +00:00
aa4d2e56fc
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21
2023-11-21 03:02:05 +00:00
171977574e
Merge pull request #7581 from corda/merge-release/os/4.9-release/os/4.10-2023-11-20-8
...
ES-1331: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 21:18:43 +00:00
5e9fdb7b2b
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 14:29:12 +00:00
8d4eac4977
Merge pull request #7579 from corda/merge-release/os/4.8-release/os/4.9-2023-11-19-6
...
ES-1331: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-19
2023-11-20 14:25:52 +00:00
f8925687a2
Merge pull request #7580 from corda/connelm/ES-1131/re-add-authenticateGradleWrapper
...
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:38:01 +00:00
7c681e025d
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:06:46 +00:00
fa899c55c2
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:05:54 +00:00
18d98760b1
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2023-11-19-6
2023-11-19 19:56:09 +00:00
44bfb2821d
Merge pull request #7578 from corda/merge-release/os/4.7-release/os/4.8-2023-11-17-6
...
ES-1331: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-11-17
2023-11-19 19:13:06 +00:00
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6
2023-11-18 18:10:07 +00:00
5b846406c8
ES-1331: Enable Gradle Enterprise build scans & remote caching ( #7574 )
...
* ES-1131: Enable Gradle Enterprise build scans & remote caching
2023-11-17 17:41:45 +00:00
52e43d4223
ES-1622: Switch corda/corda Github Actions to use Github App for authentication ( #7577 )
...
* Update jira_assign_issue.yml
* Update jira_close_issue.yml
* Update jira_create_issue.yml
* Update .github/workflows/jira_assign_issue.yml
* Update .github/workflows/jira_assign_issue.yml
---------
Co-authored-by: Waldemar Żurowski <45210402+wzur-r3@users.noreply.github.com >
2023-11-16 16:21:07 +00:00
afbd39660b
Merge pull request #7576 from corda/adel/ENT-11107
...
ENT-11107: Ctors added to LedgerRecoveryFlow to match EnterpriseLedge…
2023-11-16 11:35:10 +00:00
b715140625
ENT-11107: Ctors added to LedgerRecoveryFlow to match EnterpriseLedgerRecoveryFlow.
2023-11-15 16:11:45 +00:00
45bd9c95d8
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-14
2023-11-14 13:58:20 +00:00
e39ceeab36
Merge pull request #7573 from corda/cc/dev/os/4.11/changeset_checksum
...
ENT-11130 - OS vs Enterprise changeset checksums
2023-11-14 13:55:53 +00:00
9065c1703a
Updated changeset to match Enterprise
2023-11-13 17:07:49 +00:00
fb9a6ef7c5
Merge pull request #7572 from corda/cc/dev/4.12/jetty_upgrade
...
ENT-11007 - Jetty upgrade
2023-11-13 09:36:15 +00:00
2380364650
Jetty upgrade
2023-11-10 15:59:16 +00:00
f40b6599fe
Merge pull request #7571 from corda/cc/dev/4.11/revert_netty
...
ENT-11129 - Revert netty version
2023-11-10 15:58:57 +00:00
974d81cf41
Revert netty version
2023-11-10 12:41:44 +00:00
28bbe09710
Merge pull request #7569 from corda/colljos/fix_sdr_index
...
ENT-11127 Update index name (to meet Oracle max length limitation of 30 chars).
2023-11-09 15:50:05 +00:00
e94e02fc4b
Update index name (to meet Oracle max length limitation of 30 chars).
2023-11-09 11:25:56 +00:00
24da24e57c
Merge pull request #7568 from corda/feature/arshadm/publish-release-preview
...
ENT-11125 Fix publish preview releases
2023-11-08 15:17:36 +00:00
1b4189b2b3
Added explicit publishing configuration for projects bundled as jars, this change was required when upgrading to kotlin 1.9.0
2023-11-08 10:48:10 +00:00
c445c72d3a
ENT-10110 Store Ledger Recovery records only if the transaction was locally stored in the first place. ( #7564 )
2023-11-08 08:52:25 +00:00
3c34caabc3
ENT-10888,ENT-11108 - Security vulnerabilties ( #7556 )
...
* Security vulnerabilties
* Upgraded netty
* ENT-11108: Upgraded tcnative depedency to 2.2.224.
* Added architecture classifiers for netty-tcnative
2023-11-07 10:46:03 +00:00
73fce5fa36
Merge pull request #7482 from corda/feature/arshadm/ent-6914-jdk17-compatibility-rebased
...
ENT-6914 - Updated project to build with Gradle 7.6, Kotlin 1.8 and JDK 17
2023-11-06 13:10:02 +00:00
1614bd5a63
Updated api definitions due to format change,
2023-11-06 10:45:00 +00:00
958c0bf53c
Updated to use Corda Shell HC01
2023-11-06 10:25:34 +00:00
6dd33fb8f7
Upgrade to gradle 7.6, kotlin 1.8 and jdk 17
...
Major changes due to JDK 17:
1. JDK17 JCE Provider now has built-in support for eddsas, corda uses
the bouncycastle (i2p) implementation. This PR removes the conflicting
algorithms from the built-in JCE provider.
2. JavaScript scripting has been removed from the JDK, the corda log4j config was using
scripting to conditionally output additional diagnostic info if the MDC
was populated. This PR has removed the scripting.
3. The artifactory plug-ins used are now deprecated, this PR has removed them
and uses the same code as Corda 5 for publishing to artifactory.
4. Javadoc generation has been modified to use the latest dokka plug-ins.
5. Gradle 7.6 has implemented an incredibly annoying change where transitive
dependencies are not put on the compile classpath, so that they have to be
explicitly added as dependencies to projects.
6. Mockito has been updated, which sadly meant that quite a few source files
have to changes to use the new (org.mockito.kotlin) package name. This makes
this PR appear much larger than it is.
7. A number of tests have been marked as ignored to get a green, broadly they fall
into 3 classes.
The first is related to crypto keypair tests, it appears some logic
in the JDK prefers to use the SunJCE implementation and we prefer to use
bouncycastle. I believe this issue can be fixed with better test setup.
The second group is related to our use of a method called "uncheckedCast(..)",
the purpose of this method was to get rid of the annoying unchecked cast compiler
warning that would otherwise exist. It looks like the Kotlin 1.9 compiler type
inference differs and at runtime sometimes the type it infers is "Void" which causes
an exception at runtime. The simplest solution is to use an explicit cast instead of
unchecked cast, Corda 5 have removed unchecked cast from their codebase.
The third class are a number of ActiveMQ tests which appear to have a memory leak somewhere.
2023-11-06 10:24:17 +00:00
3cd2e809ce
Merge pull request #7562 from corda/merge-release/os/4.11-release/os/4.12-2023-11-03-30
...
ENT-10760: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-03
2023-11-04 10:11:10 +00:00
ae956d12e5
Merge pull request #7563 from corda/merge-release/os/4.11-release/os/4.12-2023-11-03-31
...
ENT-10760: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-03
2023-11-04 10:10:25 +00:00
f32c4f7520
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-03
2023-11-03 21:37:59 +00:00
a566a083c0
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-03
2023-11-03 21:37:50 +00:00
f667aa5e04
Merge pull request #7557 from corda/merge-release/os/4.11-release/os/4.12-2023-11-02-27
...
ENT-11073: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-02
2023-11-03 21:36:59 +00:00
517dbf118e
Merge pull request #7560 from corda/merge-release/os/4.10-release/os/4.11-2023-11-03-8
...
ENT-10760: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-03
2023-11-03 21:35:59 +00:00
2f8d164dd0
Merge pull request #7561 from corda/bk/update_h2_version
...
ENT-11115: Bumping up H2 version 2.2.224
2023-11-03 21:33:57 +00:00
702842caeb
ENT-9940: Updated quasar to 0.7.16_r3 ( #7559 )
2023-11-03 15:43:51 +00:00
632a7481db
Bumping up H2 version 2.2.224
2023-11-03 19:14:49 +05:30
793ce12a2e
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-03
2023-11-03 13:13:04 +00:00
2ff74c1d1a
Merge pull request #7558 from corda/merge-release/os/4.9-release/os/4.10-2023-11-03-7
...
ENT-10760: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-03
2023-11-03 13:11:58 +00:00
a31fd82951
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-03
2023-11-03 10:00:35 +00:00
01a6539111
ENT-10760: Fixed typo in Delete settings. ( #7555 )
2023-11-03 09:58:00 +00:00
361cd678cb
ENT-10531 Add additional index on distribution records tables. Sync table names. ( #7548 )
2023-11-02 18:31:43 +00:00
bb2c2b62e5
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-02
2023-11-02 17:47:59 +00:00
