ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,900 Commits 91 Branches 405 Tags 354 MiB
40a96c5760
Commit Graph

535 Commits

Author SHA1 Message Date
r3-build
40a96c5760 Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14 2023-12-14 17:06:04 +00:00
r3-build
0dbdd08984 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14 2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895 ENT-11281/Activating forward merge logic 2023-12-14 14:57:13 +00:00
Connel McGovern
7c681e025d ES-1131: Re-add authenticateGradleWrapper 2023-11-20 11:06:46 +00:00
Connel McGovern
fa899c55c2 ES-1131: Re-add authenticateGradleWrapper 2023-11-20 11:05:54 +00:00
Ronan Browne
18d98760b1
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2023-11-19-6 2023-11-19 19:56:09 +00:00
Adel El-Beik
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6 2023-11-18 18:10:07 +00:00
Connel McGovern
5b846406c8
ES-1331: Enable Gradle Enterprise build scans & remote caching (#7574) 
* ES-1131: Enable Gradle Enterprise build scans & remote caching
 2023-11-17 17:41:45 +00:00
Waldemar Zurowski
a7274c4ec2 ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 18:30:28 +01:00
Waldemar Zurowski
fd55e4c8d4 ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 16:08:20 +01:00
Waldemar Zurowski
1c903b0ff2 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 14:06:10 +01:00
Waldemar Żurowski
dfe0ed294e
ES-1313: changes for better future forward merges (#7486) 
* add more comments as a form of documentation
* move variable names away from calling pipeline for better experience
of future forward merges if pipeline parameters were to change
 2023-09-07 14:39:02 +02:00
Waldemar Zurowski
658e7217a3 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7 
Conflicts:

* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 11:27:57 +01:00
Ronan Browne
8e2115293a
ES-1313: Update Jenkinsfile for slack channel (#7484) 2023-09-07 11:49:33 +02:00
Waldemar Żurowski
3a093ef324
updated forward merged to new branch 2023-09-01 18:25:46 +02:00
r3-build
313d342b02 Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-09-01 2023-09-01 16:23:11 +00:00
Waldemar Żurowski
3d8636c716
updated for new branch 2023-09-01 14:55:04 +02:00
r3-build
fe9483d331 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-09-01 2023-09-01 12:47:45 +00:00
Waldemar Żurowski
267b500c93
updated forward merged to new branch 2023-09-01 11:56:24 +02:00
r3-build
8349675a23 Merging forward updates from release/os/4.6 to release/os/4.7 - 2023-09-01 2023-09-01 09:51:40 +00:00
Waldemar Żurowski
b0f86e26f9
ES-412: added automatic forward merge for Corda 4 (#7469) 
* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
 2023-09-01 10:50:47 +01:00
Waldemar Zurowski
849f8666a6 INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8 2023-08-30 16:40:20 +01:00
Waldemar Zurowski
5daa091fdc INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7 2023-08-30 14:30:31 +01:00
Waldemar Żurowski
00b1f3d2c7
INFRA-1804: revert back to standard agent (#7463) 
* Snyk binaries have been already incorporated into standard Jenkins
agent
 2023-08-30 15:28:29 +02:00
Ronan Browne
306951c97d
ES-657: add auto import and snyk scanning for c4 corda community docker images (#7415) 2023-07-17 18:27:28 +01:00
Ronan Browne
befae353ac ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13) 2023-07-13 15:25:55 +01:00
Ronan Browne
6bcc843f19 ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13) 2023-07-13 07:07:17 +01:00
Ronan Browne
010a9a6c08 ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12) 2023-07-12 20:02:32 +01:00
Ronan Browne
33df909cee
ES-757: update paramater in line with latest shared lib change (#7417) 2023-07-12 20:01:56 +01:00
Ronan Browne
9dd0bd8509
ES-757: ensure correct method is called with extra paramater 2023-07-11 13:11:02 +01:00
Ronan Browne
5e3ee980b3 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-07-05) 2023-07-05 20:54:02 +01:00
Ronan Browne
56c6eb42ef
ES-757: remove extra paramater (#7403) 2023-07-05 16:28:51 +01:00
Ronan Browne
6b1a2cb027
ES-839: Disable Internal docker publishing for 4.7 ( only supported post 4.9 pacthes) (#7410) 
* ES-839: Disable Docker publishing for 4.7
* ES-839: remove broken repo
 2023-07-05 16:28:08 +01:00
Ronan Browne
1dc94b438c INFRA-2040: Merging forward updates from 4.6 to 4.7 (2023-06-23) 2023-06-23 20:50:53 +01:00
Ronan Browne
01ead5376b
ES-758: add corda remotes env vars to Jenkins logic (#7400) 
* ES-758: add corda remotes

* ES-758: add corda remotes
 2023-06-23 20:46:36 +01:00
Connel McGovern
2246c94fd5
ES-562: Updating .snyk YAML indentation & updating modules to scan on Snyk nightly (#7385) 
* NOTICK: Correct Yaml whitespace
* Update JenkinsfileSnykScan Snyk modules
* Correcting YAML indentation
* NOTICK: Update reges to match ES Jira tickets
* Removing bridge/bridgecapsule from main release branch CI pipeline
 2023-06-06 17:08:19 +01:00
Connel McGovern
596b51c2fd Removing bridge/bridgecapsule from main release branch CI pipeline 2023-06-06 16:59:15 +01:00
Connel McGovern
dfcc7019dc ES-562: Correct modules to scan for C4 OS Snyk scan nightly 2023-06-06 16:57:27 +01:00
Connel McGovern
7b16352218
ES-562: Correct modules to scan for C4 OS Snyk scan nightly (#7386) 
* ES-562: Correct modules to scan for C4 OS Snyk scan nightly
* Include 'ES' jira code in PR title check
 2023-06-06 16:46:58 +01:00
Connel McGovern
51fc4910cc Removing bridge/bridgecapsule from main release branch CI pipeline 2023-06-06 16:43:28 +01:00
Connel McGovern
f212e0fd85 ES-562: Correct modules to scan for C4 OS Snyk scan nightly 2023-06-06 16:42:49 +01:00
Ronan Browne
5db96e679c use correct agent 2023-04-21 08:43:29 +01:00
Ronan Browne
269b196c57 INFRA-2040: Merging forward updates from 4.8 to 4.9 (2023-04-21) 2023-04-21 08:42:42 +01:00
Ronan Browne
90cecf69e5 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-04-18) 2023-04-18 19:20:47 +01:00
Ronan Browne
1e7a515a8a INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17 17:26:39 +01:00
Ronan Browne
5e9dee18b1 INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16) 2023-04-16 18:23:22 +01:00
Ronan Browne
2e9f62f4da
INFRA-2040: remove lingering nexus code (#7330) 2023-04-16 18:19:43 +01:00
Shams Asari
724a4e5a36 Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
#	node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
 2023-04-11 11:54:26 +01:00
Shams Asari
0213861d22
ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server (#7315) 2023-03-22 13:22:12 +00:00
Connel McGovern
6e56dffba8
INFRA-1955: Shared lib implicit import syntax (#7313) 2023-03-15 14:49:10 +00:00