Commit Graph

10420 Commits

Author SHA1 Message Date
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
5c32d3dec4 ENT-11073 Checkpoint agent: update java assist version. (#7554) 2023-11-02 17:46:29 +00:00
e697444b6d Merge pull request #7550 from corda/merge-release/os/4.11-release/os/4.12-2023-10-27-23
ENT-10100: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-27
2023-11-01 10:25:33 +00:00
60bcc99154 ENT-11037 Expose and use additional Ledger Recovery statistics (#7553) 2023-10-31 15:55:55 +00:00
7f867a0a49 ENT-11038 - Redirect Liquibase logging via Slf4j (#7552) 2023-10-30 15:41:21 +00:00
8ab92f0ee3 Merge pull request #7551 from corda/colljos/finality_flow_force_recover_flowids
ENT-11036 Add "forceRecoverFlowIds" parameter to FinalityRecoveryFlow
2023-10-27 18:17:31 +01:00
5e017dfbc8 Drop FlowRecoveryQuery criteria: excludeFlowIds 2023-10-27 14:13:29 +01:00
04b1e8fb3d Add "forceRecoverFlowIds" parameter to FinalityRecoveryFlow 2023-10-27 13:45:19 +01:00
2f6d226f9d Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-27 2023-10-27 12:29:00 +00:00
c626d3a435 ENT-10100: fix batch support during recovery of in flight transactions (#7549) 2023-10-27 13:26:07 +01:00
89deb85c64 Merge pull request #7542 from corda/merge-release/os/4.11-release/os/4.12-2023-10-24-19
ENT-10100: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-24
2023-10-26 15:02:46 +01:00
e52f086d11 ENT-11036 Additional parameter to enable recovery of IN_FLIGHT transactions (post ledger peer recovery) (#7546) 2023-10-26 09:38:52 +01:00
be515abd08 ENT-11004 Store Ledger Recovery records only if the transaction was locally stored in the first place. (#7544) 2023-10-24 17:02:17 +01:00
be433c1fd0 ENT-10100 Filter out UNVERIFIED txns + move TransactionStatus package. (#7543) 2023-10-24 17:01:37 +01:00
9d452f0003 Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-24 2023-10-24 09:42:55 +00:00
bc718088fe ENT-10100 Changes required to support recovery of IN_FLIGHT transactions. (#7541) 2023-10-24 10:38:46 +01:00
3ed68aa745 Merge pull request #7540 from corda/merge-release/os/4.11-release/os/4.12-2023-10-19-18
ENT-10100: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-19
2023-10-19 17:56:42 +01:00
f296a82642 Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-19 2023-10-19 11:12:34 +00:00
7556b9a432 Merge pull request #7539 from corda/colljos/ledger_recovery_tweaks3
ENT-10100 Ledger Recovery: set verboseLogging to false by default.
2023-10-19 12:11:21 +01:00
39928563f6 Set verboseLogging to false by default.
Override toString() for ReceiverDistributionRecord
2023-10-19 09:29:05 +01:00
c6390f16d1 Merge pull request #7538 from corda/merge-release/os/4.11-release/os/4.12-2023-10-17-17
ENT-10923: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-17
2023-10-17 22:16:12 +01:00
3ecbf25c09 Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-17 2023-10-17 13:08:31 +00:00
a7d390038d Merge pull request #7537 from corda/merge-release/os/4.10-release/os/4.11-2023-10-17-7
ENT-10923: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-10-17
2023-10-17 14:07:36 +01:00
664df241e4 Merge pull request #7536 from corda/merge-release/os/4.11-release/os/4.12-2023-10-17-16
ENT-10110: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-17
2023-10-17 12:18:02 +01:00
0befdd6ebb Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2023-10-17-7 2023-10-17 11:03:02 +01:00
50400dc5d2 Merge pull request #7535 from corda/merge-release/os/4.9-release/os/4.10-2023-10-17-6
ENT-10923: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-17
2023-10-17 10:22:19 +01:00
5ae5ca95ea Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-17 2023-10-17 06:05:08 +00:00
157b6dba57 Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-17 2023-10-17 06:04:13 +00:00
6a2bad8077 ENT-10110 Back-port changes from ENT + additional clean-up (#7532) 2023-10-17 07:03:49 +01:00