ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 09:48:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,712 Commits 91 Branches 405 Tags 354 MiB
54fdd12a2d
Commit Graph

9712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waldemar Żurowski
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
Waldemar Zurowski
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
Waldemar Żurowski
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
Waldemar Zurowski
c60f72d927 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021/07/19) 2021-07-19 21:56:48 +02:00
Waldemar Żurowski
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
Waldemar Zurowski
e07ec2e7bd NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021/07/19) 2021-07-19 17:47:41 +02:00
Waldemar Żurowski
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
Waldemar Żurowski
f966b7a873
Merge pull request #6924 from corda/wz/merge-os-47-48-2021-06-25 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-25)
 2021-06-25 10:26:05 +02:00
Waldemar Zurowski
761532926b Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-06-25 2021-06-25 10:24:56 +02:00
Waldemar Żurowski
ddc4852986
Merge pull request #6923 from corda/wz/merge-os-46-47-2021-06-25 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-06-25)
 2021-06-25 10:24:06 +02:00
Waldemar Zurowski
ad077b5263 Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-06-25 2021-06-25 10:22:33 +02:00
Waldemar Żurowski
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
Waldemar Zurowski
b0d17c4a38 Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-06-25 2021-06-25 10:20:21 +02:00
Waldemar Żurowski
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
Waldemar Zurowski
ac8ae8ad92 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-06-25 2021-06-25 10:17:32 +02:00
Waldemar Żurowski
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
Waldemar Zurowski
78549404f0 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-06-25 2021-06-25 10:13:15 +02:00
Waldemar Żurowski
dcfcc43412
INFRA-1299: remove non-existed task (#6919) 
* sneaked in from Corda Enterprise
 2021-06-25 10:09:59 +02:00
Waldemar Żurowski
59d49b77f8
Merge pull request #6916 from corda/wz/merge-os-47-48-2021-06-07 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-07)
 2021-06-08 10:29:26 +02:00
Waldemar Zurowski
1f2b18c02a NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-07) 2021-06-07 20:17:41 +02:00
Waldemar Żurowski
a544ff7fab
Merge pull request #6915 from corda/wz/merge-os-46-47-2021-06-07 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-06-07)
 2021-06-07 20:14:28 +02:00
Waldemar Zurowski
8a1223aefe NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-06-07) 2021-06-07 14:51:19 +02:00
Waldemar Żurowski
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
Waldemar Zurowski
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
Waldemar Żurowski
3cc8d93e3f
INFRA-1299: retire parallel builds for JDK11 releases (#6913) 2021-06-07 10:05:18 +02:00
Waldemar Żurowski
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
Waldemar Zurowski
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
Waldemar Żurowski
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
Waldemar Żurowski
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
Waldemar Zurowski
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
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
Dries Samyn
acde7cc364
INFRA-1386 - remove nightly publish to dockerhub (#6908) 
* INFRA-1386 - remove nightly publish to dockerhub.

* Remove entirely.
 2021-05-26 10:47:39 +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
d4ff6d6b73
Merge pull request #6902 from corda/aga/make-recordDependencies-suspendable-4.8 
NOTICK - forward merge from OS 4.7 (2021-04-27)
 2021-04-28 09:43:48 +01:00
Agnieszka Szczepanska
0b9513ffa3 Merge branch 'release/os/4.7' into aga/make-recordDependencies-suspendable-4.8 2021-04-27 15:08:13 +01:00
bpaunescu
02d82a8368
Merge pull request #6901 from corda/aga/make-recordDependencies-suspendable-4.7 
NOTICK - forward merge from OS 4.6 (2021-04-26)
 2021-04-27 14:48:04 +01:00
Agnieszka Szczepanska
9aa4389902 resolve merge conflicts 2021-04-26 11:35:17 +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
Ross Nicoll
339bb86c3c
NOTICK Fix URL for BouncyCastle Javadocs (#6900) 2021-04-23 17:50:20 +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
Edoardo Ierina
241170ffa4
Backward compatible fix for Merkle tree case where a single leaf becomes the tree root (#6895) 2021-04-12 11:09:39 +01:00
Edoardo Ierina
bde2d2a8c7
updated inxonsistent comments (#6892) 2021-03-22 14:38:22 +00:00
Adel El-Beik
bf9f4a5c4a
NOTICK: Merge from OS 4.7 (#6891) 
* CORDA-4098 assumption test (#6871) (#6873)

* 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>

Co-authored-by: Alexey Kadyrov <67952405+alexey-kadyrov-r3@users.noreply.github.com>

* CORDA-4130: Move checkNotaryWhitelisted call to run under attachmentsClassLoader (#6890)

* CORDA-4130: Move checkNotaryWhitelisted call to run under attachmentsClassLoader for normal transactions.

* CORDA-4130: Reverted API change.

* CORDA-4130: Further simplication. Removed protected method.

* CORDA-4130: Remove unused import.

* Revert "CORDA-4130: Remove unused import."

This reverts commit d0836bda81.

* Revert "CORDA-4130: Further simplication. Removed protected method."

This reverts commit 3023a2e1ac.

Co-authored-by: Nick Dunstone <49945179+nickdunstone13@users.noreply.github.com>
Co-authored-by: Alexey Kadyrov <67952405+alexey-kadyrov-r3@users.noreply.github.com>
 2021-03-19 10:21:29 +00:00
Adel El-Beik
1470d14795
CORDA-4130: Move checkNotaryWhitelisted call to run under attachmentsClassLoader (#6890) 
* CORDA-4130: Move checkNotaryWhitelisted call to run under attachmentsClassLoader for normal transactions.

* CORDA-4130: Reverted API change.

* CORDA-4130: Further simplication. Removed protected method.

* CORDA-4130: Remove unused import.

* Revert "CORDA-4130: Remove unused import."

This reverts commit d0836bda81.

* Revert "CORDA-4130: Further simplication. Removed protected method."

This reverts commit 3023a2e1ac.
 2021-03-18 14:24:30 +00:00