ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,427 Commits 91 Branches 405 Tags 354 MiB
73c98e6c2c
Commit Graph

10427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adel El-Beik
3d7db25d13
Merge pull request #7645 from corda/cc/dev/4.10/security_vulns 
ENT-10894 - Security vulnerabilities
 2024-01-15 11:05:20 +00:00
Balwant Kothari
49f35aa5ea
ENT-11113 Updating test case for accessing modifier as per JDK17 compatibility 2024-01-15 15:26:10 +05:30
Adel El-Beik
4793cd5f31
Merge pull request #7644 from corda/cc/dev/4.9/security_vulns 
ENT-10900 - Security vulnerabilities
 2024-01-12 18:29:16 +00:00
Adel El-Beik
d9e0172bf7
Merge pull request #7643 from corda/bk/os_fixes_412 
ENT-11113 Update instant time resolution in test cases
 2024-01-12 18:26:25 +00:00
Chris Cochrane
52a6d477da
Upgraded Jetty 2024-01-12 17:12:46 +00:00
Chris Cochrane
07a2d98d0b
Security vulnerabilities 2024-01-12 11:51:12 +00:00
Balwant Kothari
22e96f1bda
ENT-11113 Instant default time resolution is nano but HashedDistributionList.PublicHeader default derialisation happens at millis resolution to passing time in millis resolution as input 2024-01-11 18:15:19 +05:30
Adel El-Beik
e632a78776
Merge pull request #7642 from corda/shams-db-migration-net-params-bug 
ENT-11340: Uninitialised network parameters during schema migration
 2024-01-10 14:34:52 +00:00
Shams Asari
ccc605493d WIP 2024-01-10 10:47:32 +00:00
Balwant Kothari
477d170def
ENT-11113 Removed ignored annotation (#7641) 
ENT-11113 Removed ignored annotation
 2024-01-09 13:33:41 +00:00
Adel El-Beik
ab4a24eb98
Merge pull request #7636 from k163377/fix-kotlin-module 
ENT-11325: Fixed to not use API that will be discontinued in the future
 2024-01-04 15:27:20 +00:00
Adel El-Beik
ab4e63ee0d
Merge pull request #7637 from corda/shans-no-serialisation-1.2-javadoc 
ENT-11056: Turn off javadoc for serialization-1.2 module
 2024-01-04 10:54:45 +00:00
Balwant Kothari
b6007625f8
ENT-11113 Upgrading mockito kotlin version (#7639) 
* ENT-11113 Removing test case that is not relevate with Kotlin 1.9.0

* ENT-11113 Upgrade mockito kotlin version
 2024-01-03 18:28:16 +00:00
Balwant Kothari
5566d10863
ENT-11113 Removing test case that is not relevate with Kotlin 1.9.0 (#7638) 
* ENT-11113 Removing test case that is not relevate with Kotlin 1.9.0

* ENT-11113 Fix test cases
 2024-01-03 18:24:37 +00:00
Shams Asari
fbb8a774f3 ENT-11056: Turn off javadoc for serialisation-1.2 module 
It doesn't have any Java source code.
 2024-01-03 12:41:04 +00:00
Shams Asari
2e63ca6264
ENT-11065: Remove the need for JVM flags in client code (#7635) 2024-01-03 11:22:03 +00:00
Shams Asari
406f7ff292
ENT-11056: Compile the external verifier using Kotlin 1.2 (#7622) 
This requires Kotlin 1.2 versions of core and serialization (core-1.2 and serialization-1.2 respectively), which are just "shell" modules and which compile the existing source code with Kotlin 1.2. The 1.2 plugin does not work with the current version of Gradle and so the 1.2 compiler has to be called directly.

Now with two versions of Kotlin in the code base, each module needs to have its version manually specified to ensure a clean separation. Otherwise, the default Kotlin version can override 1.2 when needed.

Some of the code was tidied-up or improved to enable it to be cross-compiled. For post-1.2 APIs being used, they have been copied into core-1.2 with the same method signatures. OpenTelemetryComponent was moved to node-api, along with the dependency, to avoid also having a 1.2 version for the opentelemetry module.
 2024-01-02 17:02:20 +00:00
wrongwrong
6b765a93b4 Fixed to not use API that will be discontinued in the future 2023-12-30 16:59:52 +09:00
Adel El-Beik
4791f0d84f
Merge pull request #7630 from corda/merge-release/os/4.11-release/os/4.12-2023-12-21-86 
ENT-11118: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-12-21
 2023-12-22 12:23:02 +00:00
Adel El-Beik
7a8b2c89ef
Merge pull request #7633 from corda/arshadm/ent-11295-fix-mqsecurity-asnode 
ENT-11295 Fix tests in P2PMQSecurityTest
 2023-12-22 12:21:59 +00:00
Adel El-Beik
7b57ccf783
Merge pull request #7634 from corda/arshad/ent-11316-fix-config-parsing-test 
ENT-11316 Fix test failure due to issue in Kotlin 1.9 type inference
 2023-12-22 12:19:21 +00:00
Arshad Mahmood
74179a3ff5 ENT-11316 Fix test failure due issue in Kotlin 1.9 type inference 2023-12-21 15:44:14 +00:00
Arshad Mahmood
26861ffd05 ENT-11295 ActiveMQ behaviour has changed so that CREATE_ADDRESS is perforned before CREATE_DURABLE_QUEUE in this situation 2023-12-21 15:03:09 +00:00
Balwant Kothari
d235e887fe
ENT-11113 Ignored JDK 17 related fixes for byteman related issues (#7626) 
* Updated mockito version and removed ignored annotation to relevant test cases
 2023-12-21 11:11:55 +00:00
r3-build
2eb1e9f426 Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-12-21 2023-12-21 03:50:35 +00:00
Adel El-Beik
e815b381ef
Merge pull request #7617 from corda/merge-release/os/4.11-release/os/4.12-2023-12-15-79 
ENT-11281: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-12-15
 2023-12-19 13:15:51 +00:00
Adel El-Beik
7cbfc71a74
Merge pull request #7621 from corda/feature/arshad/ent-11294-fix-checkpoint-failing-test 
ENT-11294  Fix failing tests in - FlowCheckpointVersionNodeStartupCheckTest
 2023-12-19 11:26:10 +00:00
Jose Coll
fb6c4f6a3d
ENT-11003 [CRAFT][Sample CorDapp] simm-demo fails to create a trade (#7604) 
* Reference tiny contract-states jar (do this also gets deployed to node cordapps)
* Update artifact publishing.
* Add explicit compileKotlin pendency to sub-project shrink task.
 2023-12-19 11:14:35 +00:00
Jose Coll
0bcebd3dc1 Detekt. 2023-12-19 10:02:12 +00:00
Jose Coll
5a807e1eed Detekt. 2023-12-19 09:25:43 +00:00
Jose Coll
d049f8a6f3 Re-add build cache configuration. 2023-12-19 09:20:31 +00:00
Jose Coll
b47d5ec5c7 Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2023-12-15-79 2023-12-19 08:46:52 +00:00
Jose Coll
c1fe0e739a Resolve conflicts. 2023-12-19 08:46:26 +00:00
Arshad Mahmood
2a149e3aee ENT-11294 Handle kryo exception wrapped in KryoException 2023-12-18 16:12:34 +00:00
Adel El-Beik
dce725ff4b
Merge pull request #7609 from corda/arshadm/ent-11264-serizlized-lambda 
ENT-11264  Fix initialization of field serializer
 2023-12-18 15:54:15 +00:00
Adel El-Beik
422786dccc
Merge pull request #7608 from corda/shams-verification-service 
ENT-11267: Introducing VerificationService, which implements VerificationSupport in terms of node-based services
 2023-12-18 13:47:32 +00:00
Shams Asari
61a05a90eb
ENT-11155: Remove internal Kotlin utilities which have since been added after 1.2 (#7585) 
This is mostly the `Path` extension functions in `PathUtils.kt`.
 2023-12-18 12:05:08 +00:00
Adel El-Beik
4182e9f999
Merge pull request #7620 from corda/merge-release/os/4.10-release/os/4.11-2023-12-16-39 
ENT-11118: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-16
 2023-12-17 20:13:26 +00:00
r3-build
16ade601ad Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-16 2023-12-16 19:18:14 +00:00
Adel El-Beik
5569cd37be
Merge pull request #7619 from corda/merge-release/os/4.9-release/os/4.10-2023-12-15-37 
ENT-11118: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-15
 2023-12-16 19:15:09 +00:00
r3-build
1cf66d4a8f Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-15 2023-12-15 20:02:41 +00:00
Adel El-Beik
2208d56337
Merge pull request #7618 from corda/tom/ENT-11118/netty-ssl-handshake-fix 
ENT-11118: Netty SSL handshake fix (#5028)
 2023-12-15 19:59:39 +00:00
Adel El-Beik
10e005b072
Merge pull request #7612 from corda/arshadm/feature/ent-11253-publish-sources-and-javadoc 
ENT-11253 Publish sources and javadoc
 2023-12-15 18:04:56 +00:00
Tom Stark
71e187dddb ENT-11118: Netty SSL handshake fix (#5028) 
* ENT-11118: Added fix for netty SSL handshake fail
 2023-12-15 17:16:15 +00:00
Ronan Browne
292258a985
Merge pull request #7616 from corda/merge-release/os/4.10-release/os/4.11-2023-12-15-36 
ENT-11281: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15
 2023-12-15 12:04:49 +00:00
r3-build
a475c275db Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15 2023-12-15 11:41:19 +00:00
Ronan Browne
87a47c4ee5
Merge pull request #7615 from corda/merge-release/os/4.9-release/os/4.10-2023-12-14-35 
ENT-11281: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
 2023-12-15 11:40:05 +00:00
r3-build
27759ea74f Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14 2023-12-14 17:51:03 +00:00
Maciej Swierad
bf6fcb2a8f
Merge pull request #7614 from corda/merge-release/os/4.8-release/os/4.9-2023-12-14-33 
ENT-11281: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
 2023-12-14 17:48:48 +00:00
r3-build
40a96c5760 Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14 2023-12-14 17:06:04 +00:00