Commit Graph

332 Commits

Author SHA1 Message Date
Waldemar Zurowski
ac60c66b2f NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-31) 2022-05-31 18:07:40 +02:00
Waldemar Zurowski
d149e9792a NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-31) 2022-05-31 15:08:42 +02:00
Waldemar Zurowski
f5f49dbf7c NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-31) 2022-05-31 11:54:52 +02:00
Waldemar Zurowski
bc9f7e6513 NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31) 2022-05-31 09:21:29 +02:00
Waldemar Zurowski
911f033e42 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30) 2022-05-30 18:08:16 +02:00
Waldemar Zurowski
142b7d3fd0 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30) 2022-05-30 14:49:32 +02:00
Waldemar Żurowski
6a3e6276a4
CORE-4784: remove obsolete check when generating NexusIQ reports (#7194)
* do not use `isReleasePatch` when deciding if NexusIQ reports should be
  created. That is not available after 4.8 branch and reports should be
  generated for the patched releases in the first place.
2022-05-30 13:57:13 +02:00
Waldemar Zurowski
9d3548d36e NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-26)
Conflicts:
* build.gradle
2022-05-26 20:21:53 +02:00
Waldemar Zurowski
031eb263e6 NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-26)
Conflicts:
* constants.properties
2022-05-26 16:38:00 +02:00
Waldemar Żurowski
0c8d685fbd
Merge pull request #7190 from corda/wz/merge-os-47-48-2022-05-26
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26)
2022-05-26 16:33:17 +02:00
Waldemar Zurowski
ec14f9ccba NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26) 2022-05-26 14:13:33 +02:00
Ronan Browne
ab5f4fe0a4
INFRA-1697 authenticate on agent 2 2022-05-26 12:06:47 +01:00
Waldemar Zurowski
63008c12db Removed obsolete MS Teams hooks from nightly builds 2022-05-26 11:39:41 +02:00
Waldemar Zurowski
0336c938a6 NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-25)
Conflicts:
* .ci/dev/regression/Jenkinsfile
*
core/src/main/kotlin/net/corda/core/internal/PlatformVersionSwitches.kt
2022-05-25 19:07:45 +02:00
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
Ronan Browne
a54682f3d0
Merge pull request #7071 from corda/ronanb/INFRA-1697/remove-credentals
INFRA-1697: remove authentication details from gradlew wrapper download and add helper to add them in when ran on CI
2022-05-23 17:29:52 +01:00
Ronan Browne
340b3199b0
Merge branch 'release/os/4.8' into ronanb/INFRA-1697/remove-credentals-4.8 2022-05-23 17:13:23 +01:00
Viktor Kolomeyko
355411b195 Merge remote-tracking branch 'origin/release/os/4.9' into vkolomeyko/cc4.9-cc4.10-merge
# Conflicts:
#	.ci/dev/regression/Jenkinsfile
#	build.gradle
2022-05-18 15:27:44 +01:00
Ronan Browne
4d16d94848
Merge pull request #7167 from corda/connelm/INFRA-1743/release-email-notification4.7
NOTICK Remove Slack tagging on successful/unstable builds
2022-05-11 18:15:44 +01: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
e8e46a220a
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:23:35 +01:00
Connel McGovern
2f82660cdb
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:22:46 +01:00
Connel McGovern
5e9358c2c0
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:14:28 +01:00
Connel McGovern
8a2f4431df
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:14:09 +01:00
Ronan Browne
75ddc62902
Merge pull request #7132 from corda/connelm/INFRA-1743/release-email-notification4.7
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-05-10 17:13:46 +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
1888ed6ba1
Update Jenkinsfile 2022-05-09 16:16:08 +01:00
Connel McGovern
99e2991bc3
Update Jenkinsfile 2022-05-09 16:15:53 +01:00
Connel McGovern
855a020774
Update Jenkinsfile 2022-05-09 16:15:42 +01:00
Connel McGovern
652d5c1551
Update Jenkinsfile 2022-05-09 16:15:22 +01:00
Connel McGovern
8d83f76cad
Merge branch 'release/os/4.10' into connelm/INFRA-1743/release-email-notification4.10 2022-05-09 13:32:06 +01:00
Connel McGovern
fa634fd158
Update Jenkinsfile 2022-05-09 13:30:25 +01:00
Connel McGovern
7ac3889172
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:40 +01:00
Connel McGovern
cd591a50cd
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:38 +01:00
Connel McGovern
5b1e1bc8d0
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:35 +01:00
Connel McGovern
7a7a8c8e2b
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:33 +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
444a1b8fd5
NOTICK: add shared library call 2022-05-02 11:40:59 +01:00
ronanbrowne88
7ce0ab2789 INFRA-1746 tidy up 2022-05-01 11:35:50 +01:00
ronanbrowne88
9bda96ff0a INFRA-1746 add slack notifications 2022-05-01 11:27:44 +01:00
Adel El-Beik
cb4c7a80ca Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9-1stApr 2022-04-01 16:58:08 +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
8808a5563c INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:52:30 +00:00
ConnelMcGovern
b89eedb744 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:51:48 +00:00
ConnelMcGovern
ae0bf74505 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:50:37 +00:00
ConnelMcGovern
c624bb0cc0 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 13:09:00 +00:00
Connel McGovern
7de81c5cd7
Merge branch 'release/os/4.10' into connelm/INFRA-1743/release-email-notification4.10 2022-03-23 13:08:22 +00:00
ConnelMcGovern
55973ab7f7 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 12:23:11 +00:00
Ronan Browne
35986f7ad5
Merge pull request #7123 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
2022-03-23 09:42:51 +00:00
ConnelMcGovern
84c2cb5882 ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:44:24 +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
ConnelMcGovern
d1adf3643d ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:15:05 +00:00
Ronan Browne
3271978361 INFRA-1697: remove authentication details from gradlew wrapper download and add helper to add them in when ran on CI 2022-03-16 16:41:16 +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
8dce286a2f
INFRA-1735 Teams notification's for C4 (#7107)
* INFRA-1728 set correct java version for JDK 11 base image
2022-03-15 08:58:58 +01:00
Connel McGovern
8da0e718a5
INFRA-1735 Teams notification's for C4 (#7108)
* INFRA-1728 set correct java version for JDK 11 base image
2022-03-15 08:58:36 +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
Connel McGovern
4844614314
INFRA-1735 Teams notification's for C4 (#7106) 2022-03-15 08:57:41 +01:00
Connel McGovern
4ca2927dd3
INFRA-1735 Teams notification's for C4 (#7105)
* INFRA-1728 set correct java version for JDK 11 base image
2022-03-15 08:57:04 +01:00
Ronan Browne
f933d23d26
INFRA-1728 set correct java version for JDK 11 base image (#7101)
Use Specific JDK version not the latest Java 11 base image
2022-03-10 17:59:25 +00:00
Ronan Browne
787d0cde99
INFRA-1728 set correct java version for JDK 11 base image (#7102)
Use Specific JDK version not the latest Java 11 base image
2022-03-10 15:38:41 +00:00
Ronan Browne
ee8eac4516 NOTICK: release support optionally exclude shell dependency 2022-03-08 10:50:59 +00:00
Ronan Browne
e1746e068c
NOTICK: add flag to ensure API docs are published as part of release process (#7103) 2022-03-07 18:00:10 +01:00
Rick Parker
1e227fdfc4
ENT-6711 - Fix for upgrade to Jackson 2.12 and beyond (actual upgrade to 2.13.1) (#7096)
* NOTICK - Don't know what the JIRA is but wanted to share.

* Updates to resolve bukld issues

* NOTICK: Fixed JDK11 version to prevent capsule version error

* ENT-6711: Added comment for use of jackson_kotlin_version.

* ENT-6711: Avoid deprecation warning, switched to the default method.

Co-authored-by: Chris Cochrane <chris.cochrane@r3.com>
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
2022-03-07 11:08:06 +00:00
Ronan Browne
387cb30e2e
ENT-6609 update docker images so repo for community edition is corda/community (#7088) 2022-02-24 11:36:40 +01:00
Ronan Browne
38988527b9
ENT-6609 update docker images so repo for community edition is corda/community (#7089) 2022-02-24 11:36:06 +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
Ronan Browne
e00bd93478
INFRA-1386 - remove nightly publish to dockerhub (#6908) (#7078)
* INFRA-1386 - remove nightly publish to dockerhub.

* Remove entirely.

Co-authored-by: Dries Samyn <dries.samyn@r3.com>
2022-02-22 09:35:17 +01:00
Ronan Browne
f25317ddf0 INFRA-1697 minor tidy up 2022-02-21 20:57:56 +00:00
Ronan Browne
f304eeded0
INFRA-1697: fix white space 2022-02-14 17:06:31 +00:00
Ronan Browne
a21292d03f INFRA-1697: remove authentication details from gradlew wrapper download and add helper to add them in when ran on CI 2022-02-14 17:04:47 +00:00
Ronan Browne
ce211000cd
ENT-6426: update docker tagging (#7047)
* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-1.8

based on pattern
{repo}:{version}-{base-Image}

* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-openjdk8

based on pattern
{repo}:{version}-{base-Image}

Remove some redundant code

* ENT-6426 update corda repo tagging

* ENT-6426 update corda repo tagging

* ENt-6426 update corda tagging in line with feedback
2022-01-26 13:32:18 +00:00
Ronan Browne
2d2289b3bf
ENT-6426: update docker tagging inline with our dockerhub policies (#7027)
* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-1.8

based on pattern
{repo}:{version}-{base-Image}

* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-openjdk8

based on pattern
{repo}:{version}-{base-Image}

Remove some redundant code

* ENT-6426 update corda repo tagging
2022-01-19 10:34:35 +00:00
Ryan Fowler
857b8aa286
ENT-6542: Add Community Edition string for R3 builds (#7026) 2022-01-18 11:12:32 +00:00
Waldemar Zurowski
00ba7b3447 Merge branch 'release/os/4.7' into wz/merge-os-47-48-2022-01-12 2022-01-12 09:52:52 +01:00
Waldemar Zurowski
46a358965e Merge branch 'release/os/4.6' into wz/merge-os-46-47-2022-01-12 2022-01-12 07:34:32 +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