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
70c94adc1d
NOTICK: added newly introduced input ( #6940 )
...
see https://github.com/corda/jira-create-issue-action/pull/8
2021-08-05 20:18:41 +02:00
Waldemar Żurowski
bf9d0212d9
Merge pull request #6938 from corda/wz/merge-os-47-48-2021-07-27
...
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-07-27)
2021-07-28 10:03:29 +02:00
Waldemar Zurowski
646fc9678f
Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-07-27
2021-07-27 17:15:01 +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 Żurowski
eb5e5918b9
Merge pull request #6931 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:18:09 +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
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
f966b7a873
Merge pull request #6924 from corda/wz/merge-os-47-48-2021-06-25
...
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-25)
2021-06-25 10:26:05 +02:00
Waldemar Zurowski
761532926b
Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-06-25
2021-06-25 10:24:56 +02:00
Waldemar Żurowski
ddc4852986
Merge pull request #6923 from corda/wz/merge-os-46-47-2021-06-25
...
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-06-25)
2021-06-25 10:24:06 +02:00
Waldemar Zurowski
ad077b5263
Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-06-25
2021-06-25 10:22:33 +02:00
Waldemar Żurowski
c31c132ac3
Merge pull request #6922 from corda/wz/merge-os-45-46-2021-06-25
...
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-06-25)
2021-06-25 10:21:40 +02: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 Ż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
59d49b77f8
Merge pull request #6916 from corda/wz/merge-os-47-48-2021-06-07
...
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-07)
2021-06-08 10:29:26 +02:00
Waldemar Zurowski
1f2b18c02a
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-06-07)
2021-06-07 20:17:41 +02:00
Waldemar Żurowski
a544ff7fab
Merge pull request #6915 from corda/wz/merge-os-46-47-2021-06-07
...
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-06-07)
2021-06-07 20:14:28 +02:00
Waldemar Zurowski
8a1223aefe
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2021-06-07)
2021-06-07 14:51:19 +02:00
Waldemar Żurowski
75b1f0676b
Merge pull request #6914 from corda/wz/merge-os-45-46-2021-06-07
...
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021-06-07)
2021-06-07 14:49:09 +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 Żurowski
b8dc6be9d3
Merge pull request #6912 from corda/wz/merge-os-44-45-2021-06-03
...
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021-06-03)
2021-06-03 14:02:52 +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