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,471 Commits 91 Branches 405 Tags 354 MiB
1dbd5147e5
Commit Graph

9471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adel El-Beik
6062059f49
Merge pull request #7011 from corda/adel/log4j-4.5 
ENT-6494: Upgraded log4j to 2.17.1
 2022-01-10 12:53:42 +00:00
Adel El-Beik
6998a24dc4
Merge pull request #7009 from corda/adel/log4j-4.3 
ENT-6494: Update log4j to 2.17.1
 2022-01-10 12:53:04 +00:00
Adel El-Beik
f8fc7281eb ENT-6494: Upgraded log4j to 2.17.1 2022-01-10 10:51:52 +00:00
Adel El-Beik
c0c6110d5a ENT-6494: Upgraded log4j to 2.17.1 2022-01-10 10:49:18 +00:00
Adel El-Beik
a5512ff2e6 ENT-6494: Upgraded log4j to 2.17.1 2022-01-10 10:47:07 +00:00
Adel El-Beik
e9bcbd13a5 ENT-6494: Upgraded log4j to 2.17.1 2022-01-10 10:44:13 +00:00
Adel El-Beik
47ad6a150d ENT-6494: Update log4j to 2.17.1 2022-01-10 10:41:11 +00: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
nargas-ritu
e00c7cd693
Merge pull request #7002 from corda/wz/merge-os-43-44-2022-01-04 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2022-01-04)
 2022-01-06 09:12:10 +00:00
Adel El-Beik
d3494f8a84 Revert "ENT-6494: Upgrade log4j to 2.17.0 (#6998)" 
This reverts commit db0e45146a.

# Conflicts:
#	build.gradle
 2022-01-05 15:37:25 +01:00
Waldemar Zurowski
0751bfd835 Revert "Updated classgraph version" 
This reverts commit 0d8f5fb965.
 2022-01-05 15:35:30 +01:00
Waldemar Zurowski
0d8f5fb965 Updated classgraph version 2022-01-05 15:22:50 +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
Adel El-Beik
a7d5b46120
ENT-6494: Upgraded log4j to 2.17.0 (#6994) 2021-12-21 11:26:33 +00:00
Adel El-Beik
67da0ffee5
ENT-6494: Upgraded log4j to 2.17.0 (#6995) 2021-12-21 11:26:05 +00:00
Adel El-Beik
0eeaa743d3
ENT-6494: Upgraded log4j to 2.17.0 (#6996) 2021-12-21 11:25:14 +00:00
Adel El-Beik
d2d826c305
ENT-6494: Upgraded log4j to 2.17.0 (#6997) 2021-12-21 11:24:42 +00:00
Adel El-Beik
db0e45146a
ENT-6494: Upgrade log4j to 2.17.0 (#6998) 2021-12-21 11:24:02 +00:00
Waldemar Żurowski
7d5d36c352
Update build.gradle (#6991) 2021-12-17 17:54:59 +01:00
Christian Sailer
4540e48087
Merge pull request #6970 from corda/nandor-os-4.6-os-4.7-20211011 
NAAS-301 Backport fix notary flow retries after ETA message sent (#6965)
 2021-10-11 18:06:50 +01:00
Christian Sailer
22f81b161d
Merge pull request #6969 from corda/nandor-os-4.5-os-4.6-20211011 
NAAS-300 Forward merge notary ETA fix
 2021-10-11 15:57:02 +01:00
nkovacsx
5d26ffcd89 Merge branch 'release/os/4.5' into nandor-os-4.5-os-4.6-20211011 2021-10-11 12:29:53 +01:00
nkovacsx
1dacee8d57
NAAS-295 Fix notary flow retries after ETA message sent (#6965) (#6968) 2021-10-11 12:27:31 +01:00
nkovacsx
9a3ea393a2
NAAS-295 Fix notary flow retries after ETA message sent (#6965) (#6966) 2021-10-08 14:53:24 +01:00
Ramzi El-Yafi
f859d809c7 NAAS-295 Fix notary flow retries after ETA message sent (#6965) 2021-10-07 09:43:53 +01:00
Waldemar Żurowski
18541019e4
Merge pull request #6945 from corda/wz/merge-os-46-47-2021-08-06 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7
 2021-08-06 20:19:00 +02:00
Waldemar Zurowski
b7560b9793 Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-08-06 2021-08-06 19:50:58 +02:00
Waldemar Żurowski
9d6614aac9
Merge pull request #6944 from corda/wz/merge-os-45-46-2021-08-06 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6
 2021-08-06 19:50:15 +02:00
Waldemar Zurowski
5017885b0f Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-08-06 2021-08-06 19:23:51 +02:00
Waldemar Żurowski
fcd30f554f
Merge pull request #6943 from corda/wz/merge-os-44-45-2021-08-06 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5
 2021-08-06 19:20:16 +02:00
Waldemar Zurowski
4e4ef3691f Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-08-06 2021-08-06 17:50:27 +02:00
Waldemar Żurowski
133af149e0
Merge pull request #6942 from corda/wz/merge-os-43-44-2021-08-06 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4
 2021-08-06 17:45:29 +02:00
Waldemar Zurowski
c1d5038d16 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-08-06 2021-08-06 15:43:12 +02:00
Waldemar Żurowski
16fdc289d7
INFRA-1549: added SCIJAVA repo (#6939) 
* `com.github.detro:ghostdriver` is gone from repositories configured
  already
* SCI Java public repo has it, and it is configured to resolve
  `com.github.detro` group only
 2021-08-05 20:19:16 +02:00
Waldemar Żurowski
5d38669b31
Merge pull request #6937 from corda/wz/merge-os-46-47-2021-07-27 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-07-27)
 2021-07-27 17:10:05 +02:00
Waldemar Zurowski
6b1faeb25e Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-07-27 2021-07-27 14:16:32 +02:00
Waldemar Żurowski
b7b597e8be
Merge pull request #6936 from corda/wz/merge-os-45-46-2021-07-26 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-07-27)
 2021-07-27 11:07:29 +02:00
Waldemar Zurowski
64de942752 Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-07-26 
Conflicts:
	build.gradle
 2021-07-27 07:33:25 +02:00
Waldemar Żurowski
6b3c8b5868
Merge pull request #6935 from corda/wz/merge-os-44-45-2021-07-26 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021-07-26)
 2021-07-26 18:28:12 +02:00
Waldemar Zurowski
5d27c62510 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-07-26 
Conflicts:
	build.gradle
 2021-07-26 09:29:43 +02:00
Waldemar Żurowski
b4a07dce55
Merge pull request #6934 from corda/wz/merge-os-43-44-2021-07-23 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021-07-23)
 2021-07-24 22:49:12 +02:00
Waldemar Zurowski
bb5eb6f93d Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-07-23 2021-07-23 13:23:09 +02:00
Waldemar Żurowski
f82f6f9b65
NOTICK: remote obsolete Maven repository for Kotlin in Bintray (#6933) 2021-07-23 11:10:21 +02:00
Waldemar Żurowski
08a3c73596
Merge pull request #6932 from corda/wz/merge-os-46-47-2021-07-19 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021/07/19)
 2021-07-19 22:21:57 +02:00
Waldemar Zurowski
ad83074e6d NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021/07/19) 2021-07-19 22:14:03 +02:00
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