Commit Graph

8839 Commits

Author SHA1 Message Date
Ronan Browne
a624e863fa
INFRA-1720: remove dockerhub publishing nightly (#7080) 2022-02-22 09:36:01 +01:00
Adel El-Beik
12fd451919
ENT-6588 Restrict database operations platform flag (#7053) (#7073)
* ENT-6588 Restrict database operations platform flag

Put the restricting of database operations in `RestrictedConnection` and
`RestrictedEntityManager` behind a platform version flag.

`RESTRICTED_DATABASE_OPERATIONS = 7` was added to signify this.

If the version is less than 7, then the database operations will not be
restricted. A warning is logged to indicate that they are using
potentially dangerous methods.

If the version is 7 or greater, then the database operations are
restricted and throw an error if called.

Co-authored-by: Dan Newton <dan.newton@r3.com>
2022-02-17 14:07:11 +00:00
Ramzi El-Yafi
0b2b3e464e
Merge pull request #7037 from corda/ramzi/os-44-45-merge
NOTICK Merge OS 4.4 -> OS 4.5 20/01/22
2022-01-20 14:44:59 +00:00
Ramzi El-Yafi
4dfd4c613a Merge remote-tracking branch 'origin/release/os/4.4' into ramzi/os-44-45-merge 2022-01-20 10:19:16 +00:00
Ramzi El-Yafi
a45be650c7
ENT-6533 Update validating notary flow to be non-idempotent (#7031) 2022-01-20 09:52:45 +00:00
Waldemar Żurowski
8cfe6064ab
Merge pull request #7018 from corda/wz/merge-os-44-45-2022-01-11
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-01-11)
2022-01-11 16:25:16 +01:00
Waldemar Zurowski
0fdfc98345 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2022-01-11 2022-01-11 15:52:40 +01:00
Waldemar Żurowski
24de478aaf
Merge pull request #7017 from corda/wz/merge-os-43-44-2022-01-11
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2022-01-11)
2022-01-11 15:46:13 +01:00
Waldemar Zurowski
e92baeeb26 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2022-01-11
Conflicts:
	build.gradle
2022-01-11 14:39:38 +01:00
Waldemar Żurowski
d91b06605f
NOTICK: Change repository for ghostdriver library (#7016)
* Maven SCI Java repository is not available
* `ghostdriver` moved to `corda-dependencies` repository in R3
  Artifactory
2022-01-11 14:35:32 +01:00
Adel El-Beik
c69a840e2e
Merge pull request #7010 from corda/adel/log4j-4.4
ENT-6494: Upgraded log4j to 2.17.1
2022-01-10 13:42:16 +00:00
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
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
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
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
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
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
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
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
3cc8d93e3f
INFRA-1299: retire parallel builds for JDK11 releases (#6913) 2021-06-07 10:05:18 +02:00