Commit Graph

421 Commits

Author SHA1 Message Date
Adel El-Beik
6c4b8fdf23
ENT-11657: Upgrade artemis. (#7707)
* ENT-11657: Upgraded artemis.

* ENT-11657: Reverted dependencies task leftin.

* ENT-11657: Upgraded log4j and slf4j.
2024-04-03 11:15:00 +01:00
Arshad Mahmood
6dd33fb8f7 Upgrade to gradle 7.6, kotlin 1.8 and jdk 17
Major changes due to JDK 17:
1. JDK17 JCE Provider now has built-in support for eddsas, corda uses
   the bouncycastle (i2p) implementation. This PR removes the conflicting
   algorithms from the built-in JCE provider.

2. JavaScript scripting has been removed from the JDK, the corda log4j config was using
   scripting to conditionally output additional diagnostic info if the MDC
   was populated. This PR has removed the scripting.

3. The artifactory plug-ins used are now deprecated, this PR has removed them
   and uses the same code as Corda 5 for publishing to artifactory.

4. Javadoc generation has been modified to use the latest dokka plug-ins.

5. Gradle 7.6 has implemented an incredibly annoying change where transitive
   dependencies are not put on the compile classpath, so that they have to be
   explicitly added as dependencies to projects.

6. Mockito has been updated, which sadly meant that quite a few source files
   have to changes to use the new (org.mockito.kotlin) package name. This makes
   this PR appear much larger than it is.

7. A number of tests have been marked as ignored to get a green, broadly they fall
   into 3 classes.

   The first is related to crypto keypair tests, it appears some logic
   in the JDK prefers to use the SunJCE implementation and we prefer to use
   bouncycastle. I believe this issue can be fixed with better test setup.

   The second group is related to our use of a method called "uncheckedCast(..)",
   the purpose of this method was to get rid of the annoying unchecked cast compiler
   warning that would otherwise exist. It looks like the Kotlin 1.9 compiler type
   inference differs and at runtime sometimes the type it infers is "Void" which causes
   an exception at runtime. The simplest solution is to use an explicit cast instead of
   unchecked cast, Corda 5 have removed unchecked cast from their codebase.

   The third class are a number of ActiveMQ tests which appear to have a memory leak somewhere.
2023-11-06 10:24:17 +00:00
Ronan Browne
ee8eac4516 NOTICK: release support optionally exclude shell dependency 2022-03-08 10:50:59 +00: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
Adel El-Beik
96576a7278 ENT-6687: Updated build.gradle so corda-shell is copied into drivers directory. 2022-03-01 12:35:46 +00:00
Chris Cochrane
9dfdd71c22
ENT-6631 - upgrade jackson version to get rid of databind vulnerability, keeping jackson-module-kotlin the same 2022-02-24 13:26:37 +00:00
Viktor Kolomeyko
78aed771b2
NOTICK: Change repository for ghostdriver library (#7015)
Since SCI Java repository is no longer available, the library has been copied to the internal `corda-dependencies` repository.
2022-01-11 12:57:20 +00: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 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 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 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 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 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 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 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
Denis Rekalov
551b3f0811
CORDA-4054: combine different identities of the same notary after its key rotation (#6734) 2020-10-16 13:53:04 +01:00
filipesoliveira
d8eb117104 Fixed an issue caused by the irs-demo project that would prevent builds from succeed.
Build command that would fail every time: “./gradlew clean build slowIntegrationTest”.

Notes:
The evaluationDependsOn lines inside the build.gradle file under the irs-demo folder where moved above the dependencies for best practices and to avoid weird errors.

The archiveClassifier added to the build.gradle file under irs-demo/web folder is the actual fix. The archive classifier accepts a string that is appended to the jar file. By changing the filename of the jar, Boot Spring is prevented from overwriting the jar and causing build issues.
2020-08-20 16:46:41 +01:00
Jonathan Locke
badfcf7f07
CORDA-3942: Disable IRSDemoTest (#6564)
Temporarily disable IRSDemoTest as it is breaking many OS builds.
2020-08-05 15:49:12 +01:00
Christian Sailer
377c3f9d78 Merge remote-tracking branch 'origin/release/os/4.6' into christians/ENT-5273-update-from-os-4.6 2020-07-21 14:17:27 +01:00
Oliver Knowles
a500084d38
CORDA-3201 - Enforce separate key for notary identity (#6308) 2020-07-20 10:59:08 +01:00
Chris Rankin
16eb9dfc08
NOTICK: Fix some Gradle technical debt. (#6430) 2020-07-07 09:08:58 +01:00
Christian Sailer
836dd559e8
ENT-5316 split schema migration
* ENT-5273 Split schema migration into separate core and app schema migration, with separate command line flags
2020-06-15 15:52:31 +01:00
Ryan Fowler
48ed9dbc6b
NOTICK: Fix IRSDemo code to wait for a response when updating day (#6329) 2020-06-10 18:30:00 +01:00
Chris Rankin
7e13491a25
CORDA-3716: Fix Enum serializers to handle enums that override toString()
* CORDA-3716: Fix SandboxEnumSerializer to handle enums that override toString().

* Remove more uses of Enum.toString() from the Corda serializer.

* Add test coverage for this case to standard enum serializer.

* Increase maxWaitTimeout in IRSDemoTest to 150 seconds.
2020-04-20 17:49:12 +01:00
Chris Rankin
6f437b5b09
CORDA-3716: Fix SandboxEnumSerializer to handle enums that override toString(). (#6159)
* CORDA-3716: Fix SandboxEnumSerializer to handle enums that override toString().

* Remove more uses of Enum.toString() from the Corda serializer.

* Add test coverage for this case to standard enum serializer.

* Increase maxWaitTimeout in IRSDemoTest to 150 seconds.
2020-04-19 23:29:08 +01:00
Chris Rankin
ffa2caed32 Merge branch 'release/os/4.4' into chrisr3-44-merge 2020-03-04 16:27:44 +00:00
Chris Rankin
e006b871c8
CORDA-3644: Scan the CorDapp classloader directly for SerializationWhitelist. (#6014)
* CORDA-3644: Scan the CorDapp classloader directly for SerializationWhitelist.

* CORDA-3644: Filter CorDapps from out-of-process node classpaths by their manifest attributes. Also exclude directories and blatant test artifacts.

* Fix IRS Demo - its "tests" artifact had a non-standard classifier of "test".
2020-03-04 10:09:40 +00:00
Christian Sailer
e38cd9ec63
ENT-5043 separate out test utils (#5998)
* Remove unused dependencies from test-common

* Explicit imports and formatting

* Add core-test-utils project

* Add dependency

* Move Kryo serialization context to node-api (not serialization as we do not want to pull kryo into the serialization lib)

* Move AMQP server serialization scheme to node api

* Move serialization tests to node-api

* Move internal test helpers without further dependencies.

* Move out some types from RPCClientProxyHandler to node-api in preparation for moving the AMQP scheme

* Move client AMQP context to node-api so we can move the test serialization rule out.

* Move InternalSerializationTestHelpers to core-test-utils

* Moved testing.core to core-test-utils

* Make detekt happy

* Add api-scanner to core-test-utils

* Remove inlined package names introduced by IntelliJ refactoring

* Update api-current.txt to account for reordering.

* Add core-test-utils to list of published artifacts.

* Add missing import

* Location of things in api text has moved again (publish name of artefact?)

* Revert all additions to the API, leaving just the reordering

* Code review: fix up core-test-utils build.gradle and introduce kryo version constant.

* Remove OpenSsl flag from ssl config stub (can't be used from node-api)

* Suppress detekt warning

* Move core test util tests to the right module

* Expose kotlin test as a transient dependency - projects have come to rely on that.

* Fix typo in package name
2020-03-03 15:55:17 +00:00
Razvan Codreanu
30167fd2e8
TM-204 Fixing regression builds (#6009)
* TM-204 attempting to fix regression builds

* TM-204 attempting to fix regression builds

* TM-204 reverting spring boot version and only removing missing dependency

* TM-204 reverting to original build.gradle

* TM-204 re applying dependency

* TM-204 consolidating dependencies

* TM-204 setting spring boot dependency

* TM-204 reverting and upgrading dependency management plugin version in parent gradle file

* TM-204 apply dependency plugin differently

* TM-204 new gradle files

* TM-204 try and fix corda rpc evaluation

* TM-204 try and fix corda rpc evaluation

* TM-204 separate slow integration and smoke test
2020-03-02 14:50:01 +00:00
Stefano Franz
b23af5f0d2
add timeouts to all tests (#5875) 2020-02-11 10:14:05 +00:00
Chris Rankin
971eb56a98 CORDA-3346: Remove the JitPack repository from Corda. 2019-10-21 13:15:03 +01:00
Zoltan Kiss
f171de7b69 TM-23 Fail build on compiler warnings (#5453)
* java compile respects compilation.allWarningsAsErrors

* suppress or cleanup warnings

* suppress warning

* use non-deprecated kotlin dependency

* rename property

* handle property existence check

* Deal with warnings
2019-09-11 16:34:51 +01:00
Stefano Franz
3476a47378
move irs-demo to slowIntegrationTest (#5447) 2019-09-09 10:49:44 +00:00
Stefano Franz
a842740c9e
WIP Kubenetes parallel build (#5396)
* Split integration tests

* add simple example of printing all methods annotated with @Test

* add docker plugin to root project
remove docker plugin from child projects
add Dockerfile for image to use when testing
add task to build testing image to root project

* add comment describing proposed testing workflow

* simple attempt at running tests in docker container

* add my first k8s interaction script

* add fabric8 as dependnency to buildSrc

* before adding classpath

* collect reports from containers and run through testReports

* re-enable kubes backed testing

* for each project
1. add a list tests task
2. use this list tests task to modify the included tests
3. add a parallel version of the test task

* tweak logic for downloading test report XML files

* use output of parallel testing tasks in report tasks to determine build resultCode

* prepare for jenkins test

* prepare for jenkins test

* make docker reg password system property

* add logging to print out docker reg creds

* enable docker build

* fix gradle build file

* gather xml files into root project

* change log level for gradle modification

* stop printing gradle docker push passwd

* tidy up report generation

* fix compilation errors

* split signature constraints test into two

* change Sig constraint tests type hierarchy

* tidy up build.gradle

* try method based test includes

* add unit test for test listing

* fix  bug with test slicing

* stop filtering ignored tests to make the numbers match existing runs

* change log level to ensure print out

* move all plugin logic to buildSrc files

* tidy up test modification
add comments to explain what DistributedTesting plugin does

* move new plugins into properly named packages

* tidy up runConfigs

* fix compile errors due to merge with slow-integration-test work

* add system parameter to enable / disable build modification

* add -Dkubenetise to build command

* address review comments

* type safe declaration of parameters in KubesTest
2019-09-03 15:40:08 +00:00
willhr3
07b96aea18 CORDA-2925 Rebase identity service changes onto 4.3 (#5407)
* CORDA-2925 Rebase identity service changes onto 4.3

* CORDA-2925 Move migration to after v13

* CORDA-2925 Update schema list

* Change corda-version
2019-08-29 11:57:07 +01:00
Jonathan Locke
122bf3b3e0 Merge OS 4.1 into OS 4.3
Corrected changelog
Corrected irs-demo cordapp build.gradle file - removed unnecessary dependency

feel free to be detailed.
2019-08-27 16:21:47 +01:00
Jonathan Locke
e5f314ffbf Merge branch 'release/4' into jlocke/merge_4.1_20190827
Merged release/4 (Corda OS version 4.1) into a branch created from master (Corda OS version 4.3)

Conflicts:
	build.gradle
	client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
	common/logging/build.gradle
	common/logging/src/main/kotlin/net/corda/common/logging/CordaVersion.kt
	constants.properties
	core-tests/src/test/kotlin/net/corda/coretests/utilities/ProgressTrackerTest.kt
	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
	docs/source/api-contract-constraints.rst
	docs/source/api-stability-guarantees.rst
	docs/source/app-upgrade-notes.rst
	docs/source/changelog.rst
	docs/source/clientrpc.rst
	docs/source/conf.py
	docs/source/corda-network/UAT.md
	docs/source/getting-set-up.rst
	docs/source/network-builder.rst
	docs/source/upgrading-cordapps.rst
	docs/source/versioning.rst
	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt
	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertyDescriptor.kt
	serialization/src/main/kotlin/net/corda/serialization/internal/model/LocalTypeInformationBuilder.kt
	tools/network-builder/src/main/resources/node-Dockerfile
	tools/network-builder/src/main/resources/notary-Dockerfile
2019-08-27 14:51:22 +01:00
Dominic Fox
dd98461d87 CORDA-3031 Constrain max heap size for Spring boot processes (#5234)
* Constrain max heap size for Spring boot processes

* Increase allowance to 256M
2019-06-20 18:13:57 +01:00
Shams Asari
4e835d5483
CORDA-2333: Updated the majority of the dependencies that were out of date (#5235)
Some where not touched, including the crypto ones, libraries related to messaging and Kotlin.
2019-06-20 16:19:16 +01:00
Shams Asari
2152961d46
CORDA-2333: Dependency update pass for tests and demos (#5211) 2019-06-13 10:15:13 +01:00
fowlerrr
f273d894ef Extract jackson dependency from finance-workflows (#5163)
Extract jackson dependency from finance-workflows and move it to IRS Demo where it is actually needed
2019-05-23 18:22:56 +01:00
Chris Rankin
b9f7c1a08a CORDA-2893, ENT-3422: Tweak JUnit 5 configurations to keep vintage engine off compile classpaths. (#5138)
* Tweak JUnit 5 configurations to keep vintage engine off compile classpaths.

* Configure Gradle tests to use JUnit 5.
2019-05-20 11:57:56 +01:00
Dominic Fox
0b63157a4b ENT-3422 Add JUnit 5 dependencies to all projects (#5084)
* ENT-3422 Add JUnit 5 dependencies to all projects

* Remove explicit junit 4 imports where not needed

* Minor PR fixes

* Limit import scope
2019-05-15 16:40:12 +01:00
Dan Newton
750033540a CORDA-2535 - Fixes to IRS demo (#4995)
* CORDA-2535 Move classes from test src to main

For some reason a load of classes were in the test src rather than the
main src even though they were needed during runtime. These have been
moved back into main so they are compiled for use in the demo app.

* CORDA-2535 Fix missing trade id irs-demo home page

Change `deal.ref` to `deal.common.tradeID`

* CORDA-2535 Highlight in irs-demo that `node` module should not be depended on

The demo relies on `node` unless some larger refactoring is made. This
is being kept as it is, but to discourage developers from doing the
same in their CorDapps, a comment has been added to `build.gradle`
explaining why it is there and that developers should not do the same.
2019-05-03 13:47:42 +01:00
Dan Newton
851ceac3d1 Use compileOnly instead of cordaCompile in irs-demo to depend on node module (#5044) 2019-04-25 12:45:23 +01:00
Dan Newton
69526229e1 CORDA-2535: Fixes to IRS demo (#4995)
* CORDA-2535 Move classes from test src to main

For some reason a load of classes were in the test src rather than the
main src even though they were needed during runtime. These have been
moved back into main so they are compiled for use in the demo app.

* CORDA-2535 Fix missing trade id irs-demo home page

Change `deal.ref` to `deal.common.tradeID`

* CORDA-2535 Highlight in irs-demo that `node` module should not be depended on

The demo relies on `node` unless some larger refactoring is made. This
is being kept as it is, but to discourage developers from doing the
same in their CorDapps, a comment has been added to `build.gradle`
explaining why it is there and that developers should not do the same.
2019-04-16 12:33:45 +01:00
Chris Rankin
b5f0004185 BUILD: Tidy up Gradle for irs-demo:web. 2019-03-22 14:56:57 +01:00
Chris Rankin
dc83afb4de CORDA-2672: Tidy up CorDapp deployments in samples. (#4815)
* CORDA-2672: Tidy up CorDapp deployments in samples.

* CORDA-2672: Refactor Attachment Demo.

* Remove Bank of Corda from Trader Demo.

* Configure SLF4J simple loggers, fix comments and documentation.
2019-03-11 16:48:35 +00:00