Commit Graph

379 Commits

Author SHA1 Message Date
Waldemar Zurowski
0d294e3472 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25) v2 2022-05-25 17:02:44 +02:00
Waldemar Zurowski
494079b2f2 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-25) 2022-05-25 14:50:19 +02:00
Waldemar Żurowski
cb2c54e2b7
NOTICK: added missing backslash (#7185) 2022-05-25 14:38:29 +02:00
Waldemar Zurowski
ef76ae0973 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25)
Conflicts:
*
client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt
*
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
* constants.properties
* gradle/wrapper/gradle-wrapper.properties
* tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
2022-05-25 10:14:38 +02:00
Waldemar Zurowski
bb54f77e09 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2022-05-24 2022-05-24 16:48:08 +02:00
Waldemar Żurowski
589c714cba
CORE-4784: Generate license and wiki reports (#7181) 2022-05-24 16:45:09 +02:00
Connel McGovern
bbb6b1a51d
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:26:04 +01:00
Connel McGovern
ab19a61169
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:25:07 +01:00
Connel McGovern
bdf96634ee
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:24:25 +01:00
Connel McGovern
6484945513
Update Jenkinsfile 2022-05-09 16:16:44 +01:00
Connel McGovern
48980134c9
Update Jenkinsfile 2022-05-09 16:16:32 +01:00
Connel McGovern
c30e7be3a7
Update Jenkinsfile 2022-05-09 16:16:20 +01:00
Connel McGovern
cd8ecac19e INFRA-1743 Slack & E-mail notification 2022-05-09 13:17:58 +01:00
Connel McGovern
5149889b34 INFRA-1743 Slack & E-mail notification 2022-05-09 13:16:38 +01:00
Connel McGovern
56581b340a INFRA-1743 Slack & E-mail notification 2022-05-09 13:15:27 +01:00
Ronan Browne
1001926075
Merge pull request #7133 from corda/connelm/INFRA-1743/release-email-notification4.6
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-03-25 17:33:19 +00:00
Ronan Browne
b5d11e7e2f
Merge pull request #7134 from corda/connelm/INFRA-1743/release-email-notification4.5
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-03-25 17:33:06 +00:00
Ronan Browne
475acb6495
Merge pull request #7135 from corda/connelm/INFRA-1743/release-email-notification4.4
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-03-25 17:32:52 +00:00
ConnelMcGovern
b03e71cb53 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:56:35 +00:00
ConnelMcGovern
682aa43f97 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:54:21 +00:00
ConnelMcGovern
8a0249b08b INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:53:09 +00:00
ConnelMcGovern
75e97fdaf1 ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:43:33 +00:00
ConnelMcGovern
1af3b85b53 ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:42:09 +00:00
ConnelMcGovern
13a129e7cb ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:40:44 +00:00
Connel McGovern
648f4cf397
INFRA-1735 Teams notification's for C4 (#7110)
* INFRA-1728 set correct java version for JDK 11 base image
2022-03-15 15:56:48 +01:00
Connel McGovern
8a240e2859
INFRA-1735 Teams notification's for C4 (#7109)
* INFRA-1728 set correct java version for JDK 11 base image
2022-03-15 08:58:21 +01:00
Connel McGovern
a84c174aad
INFRA-1735 Teams notification's for C4 (#7111)
* INFRA-1728 set correct java version for JDK 11 base image
2022-03-15 08:57:57 +01:00
Ronan Browne
7658c5a413
INFRA-1720: remove dockerhub publishing nightly (#7079) 2022-02-22 09:37:15 +01:00
Ronan Browne
beaed61028
INFRA-1720: remove dockerhub publishing nightly (#7081) 2022-02-22 09:36:33 +01:00
Ronan Browne
a624e863fa
INFRA-1720: remove dockerhub publishing nightly (#7080) 2022-02-22 09:36:01 +01:00
Waldemar Żurowski
5de343ecf0
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-01-11) (#7014)
* ENT-6494: Upgraded log4j to 2.17.0 (#6996)

* NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-01-07) (#7007)

* backported from emergency releases for log4j updates
* adds a build parameter, which control if tests should be run or not, default is `true`

* ENT-6494: Upgraded log4j to 2.17.1

Co-authored-by: Adel El-Beik <48713346+adelel1@users.noreply.github.com>
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
2022-01-11 12:44:42 +01:00
Waldemar Żurowski
99403e9d18
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-01-07) (#7007)
* backported from emergency releases for log4j updates
* adds a build parameter, which control if tests should be run or not, default is `true`
2022-01-08 22:10:27 +01:00
Waldemar Zurowski
525df323a6 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2022-01-04
Conflicts:
	build.gradle
2022-01-04 12:13:57 +01:00
Waldemar Żurowski
9a7308f954
NOTICK: allow to skip executing all tests for a release (#7001)
* backported from emergency releases for log4j updates
* adds a build parameter, which control if tests should be run or not, default is `true`
2022-01-04 11:50:24 +01: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 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 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 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 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
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
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
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