Commit Graph

9194 Commits

Author SHA1 Message Date
0873996efa Merge pull request #6930 from corda/wz/merge-os-45-46-2021-07-19
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021/07/19)
2021-07-19 22:12:27 +02:00
f3065b81b5 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021/07/19)
Conflicts:
	samples/irs-demo/build.gradle
2021-07-19 22:07:31 +02:00
2d72d2e67f Merge pull request #6929 from corda/wz/merge-os-44-45-2021-07-19
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021/07/19)
2021-07-19 22:02:24 +02:00
c60f72d927 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021/07/19) 2021-07-19 21:56:48 +02:00
981e5591ed Merge pull request #6928 from corda/wz/merge-os-43-44-2021-07-19
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021/07/19)
2021-07-19 21:55:49 +02:00
e07ec2e7bd NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021/07/19) 2021-07-19 17:47:41 +02:00
9e790c4767 INFRA-1309: migrate docker-compose-rule-junit4 from Bintray to Maven Central (#6927)
docker-compose-rule-junit4 is available from Maven Central, but from
version 1.0.0 onwards

Bumping version number to 1.5.0 introduces following list of
dependencies:

* com.fasterxml.jackson.core:jackson-annotations:2.4.4 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-core:2.9.7 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.11.0 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.9.7 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.9.8 (Apache 2.0)
* com.fasterxml.jackson.core:jackson-databind:2.9.9 (Apache 2.0)
* com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2
  (Apache 2.0)
* com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8 (Apache
  2.0)
* com.fasterxml.jackson.module:jackson-module-afterburner:2.9.8 (Apache
  2.0)
* com.github.zafarkhaja:java-semver:0.9.0 (MIT)
* com.google.code.findbugs:jsr305:3.0.2 (Apache 2.0)
* com.google.errorprone:error_prone_annotations:2.3.3 (Apache 2.0)
* com.google.guava:guava:18.0 (Apache 2.0)
* com.google.guava:guava:21.0  (Apache 2.0)
* commons-io:commons-io:2.6  (Apache 2.0)
* com.palantir.conjure.java.api:errors:2.12.0 (Apache 2.0)
* com.palantir.conjure.java:conjure-lib:5.15.0 (Apache 2.0)
* com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:
  4.18.1 (Apache 2.0)
* com.palantir.docker.compose:docker-compose-rule-core:1.5.0 (Apache
  2.0)
* com.palantir.docker.compose:docker-compose-rule-events-api-objects:
  1.5.0 (Apache 2.0)
* com.palantir.docker.compose:docker-compose-rule-junit4:1.5.0 (Apache
  2.0)
* com.palantir.ri:resource-identifier:1.1.0 (Apache 2.0)
* com.palantir.safe-logging:preconditions:1.11.0 (Apache 2.0)
* com.palantir.safe-logging:preconditions:1.13.0 (Apache 2.0)
* com.palantir.safe-logging:preconditions:1.9.0 (Apache 2.0)
* com.palantir.safe-logging:safe-logging:1.11.0 (Apache 2.0)
* com.palantir.safe-logging:safe-logging:1.13.0 (Apache 2.0)
* com.palantir.tokens:auth-tokens:3.6.1  (Apache 2.0)
* jakarta.annotation:jakarta.annotation-api:1.3.5 (EPL 2.0)
* jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (EPL 2.0)
* joda-time:joda-time:2.10.3 (Apache 2.0)
* junit:junit:4.13 (EPL 1.0)
* one.util:streamex:0.7.2 (Apache 2.0)
* org.apache.commons:commons-lang3:3.7 (Apache 2.0)
* org.awaitility:awaitility:4.0.2 (Apache 2.0)
* org.hamcrest:hamcrest:2.1 (BSD 3-clause)
* org.hamcrest:hamcrest-core:2.1 (BSD 3-clause)
* org.slf4j:slf4j-api:1.7.25 (MIT)
2021-07-19 15:02:33 +02:00
c31c132ac3 Merge pull request #6922 from corda/wz/merge-os-45-46-2021-06-25
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-06-25)
2021-06-25 10:21:40 +02:00
b0d17c4a38 Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-06-25 2021-06-25 10:20:21 +02:00
454413b5a8 Merge pull request #6921 from corda/wz/merge-os-44-45-2021-06-25
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021-06-25)
2021-06-25 10:19:34 +02:00
ac8ae8ad92 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-06-25 2021-06-25 10:17:32 +02:00
ec2fd5b59b Merge pull request #6920 from corda/wz/merge-os-43-44-2021-06-25
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021-06-25)
2021-06-25 10:15:15 +02:00
78549404f0 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-06-25 2021-06-25 10:13:15 +02:00
dcfcc43412 INFRA-1299: remove non-existed task (#6919)
* sneaked in from Corda Enterprise
2021-06-25 10:09:59 +02:00
75b1f0676b Merge pull request #6914 from corda/wz/merge-os-45-46-2021-06-07
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-06-07)
2021-06-07 14:49:09 +02:00
c762ff6778 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-06-07)
Conflicts:
	.ci/dev/compatibility/JenkinsfileJDK11Azul
2021-06-07 11:06:29 +02:00
3cc8d93e3f INFRA-1299: retire parallel builds for JDK11 releases (#6913) 2021-06-07 10:05:18 +02:00
b8dc6be9d3 Merge pull request #6912 from corda/wz/merge-os-44-45-2021-06-03
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021-06-03)
2021-06-03 14:02:52 +02:00
813c8a72d4 NOTICK: Merging forward updates from OS 4.4 to OS 4.5
Conflicts:
	.ci/dev/nightly-regression/Jenkinsfile
	Jenkinsfile
2021-06-03 12:10:34 +02:00
863d6b0c28 Merge pull request #6910 from corda/wz/merge-os-43-44-2021-06-02
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021-06-02)
2021-06-03 08:37:03 +02:00
286873a4e4 INFRA-1299: switch from Azure Jenkins agents to AWS (#6911)
* JDK11 compatibility - simply switch to AWS Jenkins agent
* Corda preview - simply switch from Azure agent to AWS agent
* part of retiring `k8s` agent used for parallel builds
2021-06-02 14:23:30 +02:00
993f0e78f5 NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021-06-02)
Conflicts:
	.ci/dev/nightly-regression/Jenkinsfile
	Jenkinsfile
2021-06-02 08:57:01 +02:00
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
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
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
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
832751d41d delete redundant lines at the end of file 2021-04-21 14:24:23 +02:00
00c43e501c delete duplicated imports 2021-04-21 12:31:03 +02:00
88f584cac5 fast forward merge 2021-04-21 12:16:22 +02:00
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
c48f32215c Merge branch 'release/os/4.4' into aga/make-recordDependencies-suspendable-4.5 2021-04-20 16:25:47 +02:00
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
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
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
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
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
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
4e437ace2a CORDA-4110 startFlowDynamicWithClientId permissions (#6857) 2021-02-05 16:05:55 +00:00
bab99e2fb4 NOTICK Move docs external links to HTTPS (#6835) 2020-12-15 15:27:52 +00:00
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
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
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
19274751d9 INFRA-965: Jenkins/NexusIQ integration should target patches (#6802)
as well as major/minor releases
2020-11-13 17:03:33 +00:00
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
478ac74a82 EG-4168 Updating contributors.md list for OS 4.4 release branch (#6785) 2020-10-22 22:52:58 +01:00
6b8602ed83 EG-4168 Updating contributors.md list for OS 4.5 release branch (#6784) 2020-10-22 22:52:54 +01:00
fa6ef1770d EG-4168 Updating contributors.md list for OS 4.6 release branch (#6783) 2020-10-22 22:52:47 +01:00
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
d5790a6251 INFRA-826 Add publishing steps (#6780) 2020-10-21 11:58:54 +01:00
e7df5818e4 INFRA-424 CORDA-4058: Disable flaky tests on openj9 (#6774) 2020-10-16 13:03:25 +01:00