Commit Graph

9322 Commits

Author SHA1 Message Date
Dries Samyn
f7e00fbb7c
Merge pull request #6909 from corda/INFRA-1299-Retire-parallel-builds-for-Corda-Corda-Enterprise
INFRA-1299: switching from AKS to linear builds on two Jenkins agents
2021-06-01 20:44:49 +01:00
Waldemar Zurowski
8d994283c6 INFRA-1299: switching from AKS to linear builds on two Jenkins agents
* removed `.ci/dev/unit/Jenkinsfile` and
`.ci/dev/integration/Jenkinsfile` - they don't seem to be used anywhere
* switched mandatory tests to linear build - modeled after Corda
  Enterprise
* switched nightly regression tests to linear build - modeled after
  Corda Enterprise
2021-06-01 16:21:22 +02:00
Nick Dunstone
c6c5c065a5
ENT-6295: Upgrade to BC 1.68 on O/S 4.5 (#6906)
* Upgrade to BC 1.68 on O/S 4.5

* Added Ed25519 fix
2021-05-11 12:04:15 +01:00
bpaunescu
08ae62e5de
Merge pull request #6899 from corda/aga/make-recordDependencies-suspendable-4.6
NOTICK - forward merge from OS 4.5 (2021-04-21)
2021-04-26 11:20:48 +01:00
Agnieszka Szczepanska
832751d41d delete redundant lines at the end of file 2021-04-21 14:24:23 +02:00
Agnieszka Szczepanska
00c43e501c delete duplicated imports 2021-04-21 12:31:03 +02:00
Agnieszka Szczepanska
88f584cac5 fast forward merge 2021-04-21 12:16:22 +02:00
bpaunescu
d6b71c51cb
Merge pull request #6898 from corda/aga/make-recordDependencies-suspendable-4.5
NOTICK - make recordDependencies suspendable
2021-04-21 10:30:34 +01:00
Agnieszka Szczepanska
c48f32215c Merge branch 'release/os/4.4' into aga/make-recordDependencies-suspendable-4.5 2021-04-20 16:25:47 +02:00
Agnieszka Szczepanska
8dd9dee9c4
NOTICK - make recordDependencies suspendable (#6896)
* add suspendable annotation to recordDependencies

* add suspendable annotation to recordDependencies implementation
2021-04-14 08:30:53 +01:00
Rick Parker
e1221e6135
Merge pull request #6881 from corda/adel/merge-from-4.4-19-Feb-21
CORDA-4125: Merge into OS 4.5 from OS 4.4
2021-02-19 16:48:02 +00:00
Adel El-Beik
9cd02dc62d Merge remote-tracking branch 'origin/release/os/4.4' into adel/merge-from-4.4-19-Feb-21 2021-02-19 13:55:04 +00:00
Adel El-Beik
360b3f8d0c
CORDA-4125: Backport AttachmentClassLoader updates to 4.4 to enable ENT-6152 backport (#6878)
* CORDA-3755: Switched attachments map to a WeakHashMap (#6214)

* Bump OS release version 4.6

* CORDA-3755: Switched attachments map to a WeakHashMap

* CORDA-3755: Added explicit strong references to map key.

* CORDA-3755: Keeping detekt happy.

* CORDA-3755: Test a gc in verify.

* CORDA-3755: Making detekt happy.

* CORDA-3755: Suppress warnings for weak reference test.

* CORDA-3755: Fixing build failure with attachments.

* CORDA-3755: Rewrite based on Ricks input - now handles attachment already existing in map!

* CORDA-3755: Refactor WeakReference behaviour into AttachmentsHolderImpl and provide alternate version of this class for core-deterministic.

* CORDA-3755: Added more tests for WeakHashMap.

* CORDA-3755: Ignore the tests using System.gc keep for local testing only

* CORDA-3755: Adding comment to explain the ignored tests.

* Make AttachmentsHolderImpl package-private inside core-deterministic, just like it is inside core.

* CORDA-3755: Update assertions following review comments.

* CORDA-3755: Removing import

* CORDA-3755: Removed unused var.

* CORDA-3755: Reverting files that somehow got changed in rebase.

Co-authored-by: nargas-ritu <ritu.gupta@r3.com>
Co-authored-by: Chris Rankin <chris.rankin@r3.com>

* CORDA-3769: Switched attachments class loader cache to use caffeine (#6326)

* CORDA-3769: Switched attachments class loader cache to use caffeine with original implementation used by determinstic core.

* CORDA-3769: Removed default ctor arguments.

* CORDA-3769: Switched mapping function to Function type to avoid synthetic method being generated.

* CORDA-3769: Now using a cache created from NamedCacheFactory for the attachments class loader cache.

* CORDA-3769: Making detekt happy.

* CORDA-3769: The finality tests now check for UntrustedAttachmentsException which will actually happen in reality.

* CORDA-3769: Refactored after review comments.

* CORDA-3769: Removed the AttachmentsClassLoaderSimpleCacheImpl as DJVM does not need it. Also updated due to review comments.

* CORDA-3769: Removed the generic parameters from AttachmentsClassLoader.

* CORDA-3769: Removed unused imports.

* CORDA-3769: Updates from review comments.

* CORDA-3769: Updated following review comments. MigrationServicesForResolution now uses cache factory. Ctor updated for AttachmentsClassLoaderSimpleCacheImpl.

* CORDA-3769: Reduced max class loader cache size

* CORDA-3769: Fixed the attachments class loader cache size to a fixed default

* CORDA-3769: Switched attachments class loader size to be reduced by fixed value.

* CORDA-4125: Parameter has been added to a private ctor.

Co-authored-by: nargas-ritu <ritu.gupta@r3.com>
Co-authored-by: Chris Rankin <chris.rankin@r3.com>
2021-02-19 13:38:22 +00:00
Dan Newton
41b4f9b3aa
CORDA-4110 startFlowDynamicWithClientId restrict permissions (#6875)
Restrict permissions for `startFlowDynamicWithClientId` to not work with
 `InvokeRpc.startFlow` and instead require `InvokeRpc
 .startFlowWithClientId`.
2021-02-18 14:46:09 +00:00
Alexey Kadyrov
ae2bb9992f
CORDA-4098 assumption test (#6871)
* Upgrade of Bouncy Castle to resolve security issue

* Changed default signature scheme

* Reverted default change in draft

* Key conversion for BC with ed25519

* Initializing BC provider to use X509EdDSAEngine for Signature.Ed25519

* removed unsude imports

Co-authored-by: Nick Dunstone <nick.a.dunstone@gmail.com>
2021-02-17 10:27:45 +00:00
Dan Newton
4e437ace2a
CORDA-4110 startFlowDynamicWithClientId permissions (#6857) 2021-02-05 16:05:55 +00:00
Ross Nicoll
bab99e2fb4
NOTICK Move docs external links to HTTPS (#6835) 2020-12-15 15:27:52 +00:00
Waldemar Żurowski
b421f0daa0
INFRA-965: forward merge from 4.5 (2020-11-15) (#6806)
* EG-4168 Updating contributors.md list for OS 4.5 release branch (#6784)

* INFRA-965: forward merge from 4.4 (2020-11-14) (#6805)

* EG-4168 Updating contributors.md list for OS 4.4 release branch (#6785)

* INFRA-965: forward merge from 4.3 (2020-11-13) (#6803)

* INFRA-965: Jenkins/NexusIQ integration should target patches (#6802)

as well as major/minor releases

* Updated nightly builds to match changes for release branch builds

* Updated JDK11 builds to match changes for release branch builds

Co-authored-by: ivanterziev <61829352+ivanterziev-r3@users.noreply.github.com>

* Backporting updates for check-pr-title workflow

Co-authored-by: ivanterziev <61829352+ivanterziev-r3@users.noreply.github.com>
2020-11-15 20:36:25 +00:00
Waldemar Żurowski
bb8fcfe6be
INFRA-965: forward merge from 4.4 (2020-11-14) (#6805)
* EG-4168 Updating contributors.md list for OS 4.4 release branch (#6785)

* INFRA-965: forward merge from 4.3 (2020-11-13) (#6803)

* INFRA-965: Jenkins/NexusIQ integration should target patches (#6802)

as well as major/minor releases

* Updated nightly builds to match changes for release branch builds

* Updated JDK11 builds to match changes for release branch builds

Co-authored-by: ivanterziev <61829352+ivanterziev-r3@users.noreply.github.com>
2020-11-14 20:56:32 +00:00
Waldemar Żurowski
90238f22a0
INFRA-965: forward merge from 4.3 (2020-11-13) (#6803)
* INFRA-965: Jenkins/NexusIQ integration should target patches (#6802)

as well as major/minor releases

* Updated nightly builds to match changes for release branch builds
2020-11-14 10:18:51 +00:00
Waldemar Żurowski
19274751d9
INFRA-965: Jenkins/NexusIQ integration should target patches (#6802)
as well as major/minor releases
2020-11-13 17:03:33 +00:00
Ross Nicoll
f2dd3ac652
CORDA-4045 Disable flaky test (#6792)
Disable `Restart does not set senderUUID` as it is unstable.
2020-11-01 21:40:55 +00:00
ivanterziev
478ac74a82
EG-4168 Updating contributors.md list for OS 4.4 release branch (#6785) 2020-10-22 22:52:58 +01:00
ivanterziev
6b8602ed83
EG-4168 Updating contributors.md list for OS 4.5 release branch (#6784) 2020-10-22 22:52:54 +01:00
ivanterziev
fa6ef1770d
EG-4168 Updating contributors.md list for OS 4.6 release branch (#6783) 2020-10-22 22:52:47 +01:00
Dan Newton
72c359b165
ENT-5886 Parameterised queries in DBCheckpointStorage (#6768)
Direct SQL was causing issues with the saving of instants not
maintaining their timezones properly.

Changing to parameterised queries fixed this issue.

Also changed other queries to do the same, since it is good practice to
query in this way.
2020-10-22 13:38:39 +01:00
Ross Nicoll
d5790a6251
INFRA-826 Add publishing steps (#6780) 2020-10-21 11:58:54 +01:00
Adel El-Beik
e7df5818e4
INFRA-424 CORDA-4058: Disable flaky tests on openj9 (#6774) 2020-10-16 13:03:25 +01:00
Ross Nicoll
eb65cdc08a
CORDA-4045 Adjust test to remove scope for race conditions (#6769)
Change assertion in `Restart does not set senderUUID` to verify a single message has a sender UUID set, rather than the last to be recorded as sent has no sender UUID.
2020-10-14 13:44:41 +01:00
Ben McMahon
2790e945c6
INFRA-687 Change to use an out of process node (#6696)
* Change to use an out of process node
* Remove exception swallowing and add package for test constants to test process
2020-10-05 18:12:31 +01:00
Denis Rekalov
ee8f4ce733
Merge pull request #6761 from corda/denis/merge-os-4.5-to-4.6
NOTICK: merge OS 4.5 to 4.6
2020-10-05 12:58:32 +01:00
Denis Rekalov
6813033997 Merge branch 'release/os/4.5' into denis/merge-os-4.5-to-4.6 2020-10-05 14:09:00 +03:00
Ross Nicoll
75a744e297
Revert "INFRA-746 Block build changes to 4.6 (#6737)" (#6760)
This reverts commit b87e06c578, which was only needed until the 4.6
release shipped.
2020-10-05 11:55:55 +01:00
Ross Nicoll
17c09cc98f
Merge pull request #6759 from corda/denis/merge-os-4.4-to-4.5
NOTICK: merge OS 4.4 to 4.5
2020-10-05 11:44:57 +01:00
Denis Rekalov
c823398f0c Merge branch 'release/os/4.4' into denis/merge-os-4.4-to-4.5 2020-10-05 12:53:51 +03:00
Denis Rekalov
59d0410353
Merge pull request #6757 from corda/denis/merge_os_4.5_to_4.6
NOTICK: Merge OS 4.5 to 4.6
2020-10-05 10:35:12 +01:00
Rick Parker
3c919f0d69
Merge pull request #6756 from corda/denis/merge-os-4.3-to-4.4
NOTICK: Merge OS 4.3 to 4.4
2020-10-05 09:35:36 +01:00
Denis Rekalov
e837bb0ca8 Merge branch 'release/os/4.5' into denis/merge_os_4.5_to_4.6 2020-10-02 21:43:57 +01:00
Denis Rekalov
70769b137a Merge branch 'release/os/4.3' into denis/merge-os-4.3-to-4.4 2020-10-01 13:05:50 +01:00
Denis Rekalov
07d9a1ead8
CORDA-4043: Generate 16-octets certificate serial numbers (#6746) (#6755) 2020-10-01 12:26:51 +01:00
Denis Rekalov
396671cb87
CORDA-4043: Generate 16-octets certificate serial numbers (#6746) 2020-09-30 13:39:26 +01:00
Ross Nicoll
2dd2029e24
Merge pull request #6748 from corda/INFRA-683-os-45-bouncy-castle
NOTICK Merge OS 4.4 to 4.5
2020-09-25 13:42:25 +01:00
Andrius Dagys
cfd57faf5f
NOTICK: Update network parameter maxMessageSize API doc (#6334)
This network parameter is now enforced contrary to the description.
2020-09-25 11:25:51 +01:00
Ross Nicoll
5c1ca20dae Detekt 2020-09-25 10:38:46 +01:00
Ross Nicoll
5a93f848b0 Merge remote-tracking branch 'origin/release/os/4.4' into rni/notick-merge-44-45 2020-09-25 09:57:10 +01:00
Ross Nicoll
8048cb4966
CORDA-3845: Update BC, log4j, slf4j (#6699) (#6742)
* CORDA-3845: Update BC, log4j, slf4j (#6699)

* CORDA-3845: Update BC to 1.64
* CORDA-3845: Upgraded log4j to 2.12.1
* We can remove the use of Manifests from the logging package so that when _it_ logs it doesn't error on the fact the stream was already closed by the default Java logger.
* Remove the logging package as a plugin
* latest BC version
* Remove old test
* Fix some rebased changes to log file handling
* Update slf4j too

Co-authored-by: Ryan Fowler <fowlerrr@users.noreply.github.com>
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
2020-09-25 09:54:59 +01:00
Jerome Gerakis
25ab7667a5
backport of bugfix ENT-5752 into OS 4.3 (#6724) (#6744) 2020-09-24 14:30:35 +01:00
Ross Nicoll
b87e06c578
INFRA-746 Block build changes to 4.6 (#6737) 2020-09-22 16:05:40 +01:00
Ross Nicoll
8215d41eb8
Merge pull request #6732 from corda/rni/notick/merge-43-44
NOTICK Merge test stability fixes from 4.3 to 4.4
2020-09-22 16:03:37 +01:00
Ross Nicoll
88a205600d
INFRA-749 Shut down and delete test H2 databases (#6739) 2020-09-22 14:32:01 +01:00