Chris Cochrane
9b794795a0
ENT-11351 - Compiler warnings pass 4 ( #7663 )
...
* Compiler warnings
* Resolve detekt errors
* Reverted code change; added warning suppression
* Address PR review comments
2024-01-29 13:49:00 +00:00
Shams Asari
a7d0684fe7
ENT-11384: Cleanup JarScanningCordappLoader ( #7664 )
...
* It uses URLs when in fact CorDapps are jar files, and so should being Path. It also does URL equality, which is not recommended
* Address (very old) TODO of removing RestrictedURL, which is not needed
Also, back-ported some minor changes from https://github.com/corda/enterprise/pull/5057 .
2024-01-29 13:44:14 +00:00
Adel El-Beik
d642ebfbd7
Merge pull request #7662 from corda/arshadm/ent-6914-disable-node-metadata
...
ENT-6914 Disabled module metadata generation for the node capsule
2024-01-25 14:10:38 +00:00
Shams Asari
63f8e220c8
ENT-11251: Upgrade to Kotlin language version 1.9 ( #7660 )
2024-01-25 13:51:19 +00:00
Arshad Mahmood
4ea42c4d75
ENT-6914 Disabled module metadata generation for the node capsule as it was generating invalid json
2024-01-25 12:11:47 +00:00
Adel El-Beik
3d90c1d850
Merge pull request #7658 from corda/merge-release/os/4.11-release/os/4.12-2024-01-22-120
...
ENT-10900: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-22
2024-01-25 10:39:51 +00:00
Chris Cochrane
975500d878
ENT-11351 - Compiler warnings pass 3 ( #7659 )
...
* More compiler warnings fixed
* Amended deprecation suppression annotations, as per review comments
2024-01-25 10:18:58 +00:00
Adel El-Beik
3abb218bca
Merge pull request #7654 from corda/shams-external-verifier-analyse-txs
...
ENT-11255: Scan attachments to determine if they are Kotlin 1.2 or later
2024-01-23 16:56:47 +00:00
Balwant Kothari
5c193ce47f
ENT-11113 Uncommented ignored test cases ( #7648 )
...
ENT-11113 Uncommented ignored test cases
ENT-11113 Updated time for Flow Speed Test
2024-01-23 15:11:50 +00:00
Chris Cochrane
f15e6ec56a
ENT-11351 - Compiler warnings pass 2 ( #7655 )
...
* Addressed compiler warnings
* Removed unchecked cast fixes - not for this PR
* Sorted out detekt issues
2024-01-23 10:19:03 +00:00
r3-build
fd66ff81d0
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-22
2024-01-22 14:09:52 +00:00
Adel El-Beik
d1ab9b1c25
Merge pull request #7657 from corda/merge-release/os/4.10-release/os/4.11-2024-01-22-78
...
ENT-10900: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-22
2024-01-22 14:08:28 +00:00
Adel El-Beik
a0ce265b35
Merge pull request #7656 from corda/arshadm/ent-6914-fix-publish-pom
...
ENT-6914 Fix generated pom
2024-01-22 13:27:39 +00:00
r3-build
aca4c81a27
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-22
2024-01-22 12:11:53 +00:00
Adel El-Beik
418a0c1585
Merge pull request #7653 from corda/merge-release/os/4.9-release/os/4.10-2024-01-17-81
...
ENT-10900: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-17
2024-01-22 12:10:39 +00:00
Shams Asari
f30ba33929
ENT-11255: Scan attachments to determine if they are Kotlin 1.2 or later
...
The node now sends a transaction to the verifier if any of its attachments were compiled with Kotlin 1.2 (the net.corda.node.verification.external system property has been removed). It uses kotlinx-metadata to read the Kotlin metadata in the attachment to determine this. For now this scanning is done each time the attachment is loaded from the database.
The existing external verification integration tests were converted into smoke tests so that 4.11 nodes could be involved. This required various improvements to NodeProcess.Factory. A new JAVA_8_HOME environment variable, pointing to JDK 8, is required to run these tests.
There is still some follow-up work that needs to be done:
Sending transactions from a 4.11 node to a 4.12 node works, but not the other way round. A new WireTransaction component group needs to be introduced for storing 4.12 attachments so that they can be safely ignored by 4.11 nodes, and the 4.12 node needs to be able to load both 4.11 and 4.12 versions of the same contracts CorDapp so that they can be both attached to the transaction.
Even though attachments are cached when retrieved from the database, the Kotlin metadata version should be stored in the attachments db table, rather than being scanned each time.
Finally, VerificationService was refactored into NodeVerificationSupport and can be passed into SignedTransaction.verifyInternal, instead of needing the much heavier VerifyingServiceHub. This makes it easier for internal tools to verify transactions and spawn the verifier if necessary.
2024-01-22 11:31:51 +00:00
Arshad Mahmood
e5355d9e75
ENT-6914 Fix generated pom
2024-01-22 10:22:08 +00:00
Chris Cochrane
1ff853b421
ENT-11351 - Compiler warnings pass 1 ( #7652 )
...
* Removed warnings - pass 1
* Resolve detekt errors
* Properly compare X500 distinguished names
2024-01-19 10:26:50 +00:00
Adel El-Beik
c07b3906aa
Merge pull request #7650 from corda/merge-release/os/4.11-release/os/4.12-2024-01-15-112
...
ENT-10894: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-15
2024-01-18 12:26:31 +00:00
Adel El-Beik
4b92233cdd
Merge pull request #7647 from corda/bk/jd17_fixes_15_jan
...
ENT-11113 Test case no longer using reflection to change final modifier on node logger
2024-01-18 12:24:03 +00:00
Balwant Kothari
795e61807d
ENT-11113 Fixed review comments
2024-01-18 00:34:59 +05:30
Balwant Kothari
13e13fd236
ENT-11113 Updating test case to user overrridden Sysout instead of mock
2024-01-18 00:15:46 +05:30
Chris Cochrane
f7157abf9a
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-01-17-81
2024-01-17 17:08:59 +00:00
r3-build
b02b3c8b97
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-15
2024-01-15 13:57:06 +00:00
Adel El-Beik
aad2f3c170
Merge pull request #7649 from corda/merge-release/os/4.10-release/os/4.11-2024-01-15-70
...
ENT-10894: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-15
2024-01-15 13:55:56 +00:00
r3-build
7986c8bca6
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-15
2024-01-15 11:06:22 +00:00
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
