From bb8b7bbf2510783a006986aa18d5861b4de1a20e Mon Sep 17 00:00:00 2001 From: Shaun L <534336+eleventy7@users.noreply.github.com> Date: Fri, 14 Apr 2023 10:25:56 -0400 Subject: [PATCH] Update to latest Aeron, Agrona, SBE (#197) * Bump gradle to latest * Update to latest Aeron, Agrona, SBE * Update readme --- README.md | 2 +- .../aeroncookbook/aeron/rpc/Constants.java | 2 +- .../aeron/rpc/client/Client.java | 2 +- .../aeron/rpc/client/ClientAgent.java | 2 +- .../aeron/rpc/client/ClientDemuxer.java | 2 +- .../aeron/rpc/server/Server.java | 2 +- .../aeron/rpc/server/ServerAgent.java | 2 +- .../aeron/rpc/server/ServerDemuxer.java | 2 +- aeron-core/src/main/resources/logback.xml | 2 +- aeron-core/src/main/resources/messages.xml | 2 +- aeron-core/src/main/resources/sbe/sbe.xsd | 2 +- aeron-mdc/aeron-mdc-publisher/entrypoint.sh | 2 +- aeron-mdc/aeron-mdc-publisher/setup-docker.sh | 4 ++-- aeron-mdc/aeron-mdc-subscriber/entrypoint.sh | 2 +- .../aeron-mdc-subscriber/setup-docker.sh | 4 ++-- .../agrona/agents/ReceiveAgent.java | 2 +- .../agrona/agents/SendAgent.java | 2 +- .../agrona/agents/StartHere.java | 2 +- .../agrona/broadcast/ReceiveAgent.java | 2 +- .../agrona/broadcast/SendAgent.java | 2 +- .../agrona/broadcast/StartHere.java | 2 +- .../agrona/ringbuffer/ReceiveAgent.java | 2 +- .../agrona/ringbuffer/SendAgent1.java | 2 +- .../agrona/ringbuffer/SendAgent2.java | 2 +- .../agrona/ringbuffer/StartHere.java | 2 +- agrona/src/main/resources/logback.xml | 2 +- .../com/aeroncookbook/agrona/ClockTests.java | 2 +- .../agrona/DirectBufferTests.java | 2 +- agrona/src/test/resources/logback-test.xml | 2 +- .../aeroncookbook/archive/SimplestCase.java | 2 +- .../java/com/aeroncookbook/archive/Utils.java | 2 +- archive-core/src/main/resources/logback.xml | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../archive-client/setup-docker.sh | 4 ++-- .../archive-host/setup-docker.sh | 4 ++-- .../archive-backup/entrypoint.sh | 2 +- .../archive-backup/setup-docker.sh | 4 ++-- .../archive-client/setup-docker.sh | 4 ++-- .../archive-host/setup-docker.sh | 4 ++-- .../com/aeroncookbook/async/AsyncSample.java | 2 +- .../com/aeroncookbook/async/TimerAgent.java | 2 +- .../aeroncookbook/async/TimerClientAgent.java | 2 +- .../com/aeroncookbook/async/TimerItem.java | 2 +- async/src/main/resources/logback.xml | 2 +- async/src/main/resources/messages.xml | 2 +- async/src/main/resources/sbe/sbe.xsd | 2 +- .../cluster/rsm/client/ClusterClient.java | 2 +- .../cluster/rsm/client/RsmClusterClient.java | 2 +- .../rsm/node/ReplicatedStateMachine.java | 2 +- .../cluster/rsm/node/RsmCluster.java | 2 +- .../cluster/rsm/node/RsmClusteredService.java | 2 +- .../cluster/rsm/node/RsmDemuxer.java | 2 +- cluster-rsm/src/main/resources/logback.xml | 2 +- cluster-rsm/src/main/resources/messages.xml | 2 +- cluster-rsm/src/main/resources/sbe/sbe.xsd | 2 +- .../rsm/ReplicatedStateMachineTests.java | 2 +- .../src/test/resources/logback-test.xml | 2 +- gradle/libs.versions.toml | 14 +++++++------- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 61608 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- .../com/aeroncookbook/ipc/SimplestCase.java | 2 +- .../ipc/agents/ReceiveAgent.java | 2 +- .../aeroncookbook/ipc/agents/SendAgent.java | 2 +- .../aeroncookbook/ipc/agents/StartHere.java | 2 +- ipc-core/src/main/resources/logback.xml | 2 +- ipc-core/src/test/resources/logback-test.xml | 2 +- rfq/admin/readme.md | 2 +- rfq/admin/setup-docker.sh | 2 +- .../com/aeroncookbook/rfq/admin/Admin.java | 3 +-- .../rfq/admin/cli/CliCommands.java | 3 +-- .../rfq/admin/cli/InstrumentAdd.java | 3 +-- .../rfq/admin/cli/InstrumentDisable.java | 3 +-- .../rfq/admin/cli/InstrumentEnable.java | 3 +-- .../rfq/admin/cli/InstrumentList.java | 3 +-- .../rfq/admin/cli/RfqAccept.java | 3 +-- .../rfq/admin/cli/RfqCancel.java | 3 +-- .../rfq/admin/cli/RfqCounter.java | 3 +-- .../rfq/admin/cli/RfqCreate.java | 3 +-- .../aeroncookbook/rfq/admin/cli/RfqQuote.java | 3 +-- .../rfq/admin/cli/RfqReject.java | 3 +-- .../cluster/AdminClientEgressListener.java | 3 +-- .../cluster/ClusterInteractionAgent.java | 3 +-- rfq/cluster/setup-docker.sh | 2 +- .../rfq/domain/instrument/Instrument.java | 2 +- .../domain/instrument/InstrumentAddType.java | 2 +- .../rfq/domain/instrument/Instruments.java | 2 +- .../com/aeroncookbook/rfq/domain/rfq/Rfq.java | 2 +- .../aeroncookbook/rfq/domain/rfq/Rfqs.java | 2 +- .../rfq/domain/rfq/states/RfqAccepted.java | 2 +- .../rfq/domain/rfq/states/RfqCanceled.java | 2 +- .../rfq/domain/rfq/states/RfqCompleted.java | 2 +- .../rfq/domain/rfq/states/RfqCountered.java | 2 +- .../rfq/domain/rfq/states/RfqCreated.java | 2 +- .../rfq/domain/rfq/states/RfqExpired.java | 2 +- .../rfq/domain/rfq/states/RfqQuoted.java | 2 +- .../rfq/domain/rfq/states/RfqRejected.java | 2 +- .../rfq/domain/rfq/states/RfqState.java | 2 +- .../rfq/domain/rfq/states/RfqStates.java | 2 +- .../rfq/infra/AppClusteredService.java | 3 +-- .../rfq/infra/ClientSessionListener.java | 2 +- .../rfq/infra/ClientSessions.java | 3 +-- .../rfq/infra/ClusterClientResponder.java | 3 +-- .../rfq/infra/ClusterClientResponderImpl.java | 3 +-- .../aeroncookbook/rfq/infra/SbeDemuxer.java | 3 +-- rfq/cluster/src/main/resources/logback.xml | 2 +- sbe-core/src/main/resources/logback.xml | 2 +- .../java/com/aeroncookbook/sbe/SbeTests.java | 2 +- sbe-core/src/test/resources/logback-test.xml | 2 +- sbe-protocol/src/main/resources/logback.xml | 2 +- sbe-protocol/src/main/resources/messages.xml | 2 +- sbe-protocol/src/main/resources/sbe/sbe.xsd | 2 +- settings.gradle.kts | 2 +- .../com/aeroncookbook/lamport/Message.java | 2 +- .../com/aeroncookbook/lamport/Process.java | 2 +- .../lamport/RunLamportClock.java | 2 +- .../com/aeroncookbook/rsm/AddCommand.java | 2 +- .../com/aeroncookbook/rsm/EventListener.java | 2 +- .../aeroncookbook/rsm/MultiplyCommand.java | 2 +- .../com/aeroncookbook/rsm/NewValueEvent.java | 2 +- .../java/com/aeroncookbook/rsm/RunRsm.java | 2 +- .../com/aeroncookbook/rsm/SetCommand.java | 2 +- .../aeroncookbook/rsm/SimpleStateMachine.java | 2 +- .../aeroncookbook/rsm/SnapshotCommand.java | 2 +- theory/src/main/resources/logback.xml | 2 +- theory/src/test/resources/logback-test.xml | 2 +- 126 files changed, 139 insertions(+), 158 deletions(-) mode change 100644 => 100755 aeron-mdc/aeron-mdc-publisher/setup-docker.sh diff --git a/README.md b/README.md index d49aa711..25120453 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Projects: Requires: - Java 17 -- Gradle 8.0.1 +- Gradle 8.0.2 - Docker (to run some samples) Tested on Ubuntu 20 + macOS 13 diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/Constants.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/Constants.java index 611609f1..9636c9f3 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/Constants.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/Client.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/Client.java index 945a6d72..d5a2f7de 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/Client.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/Client.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientAgent.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientAgent.java index d94c2b33..d794de2f 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientAgent.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientAgent.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientDemuxer.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientDemuxer.java index d989503c..5faca851 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientDemuxer.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/client/ClientDemuxer.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/Server.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/Server.java index 54bed69a..50f221ec 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/Server.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/Server.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerAgent.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerAgent.java index 446ac72b..7ab55285 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerAgent.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerAgent.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerDemuxer.java b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerDemuxer.java index d37b4921..facaf7ed 100644 --- a/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerDemuxer.java +++ b/aeron-core/src/main/java/com/aeroncookbook/aeron/rpc/server/ServerDemuxer.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Shaun Laurens. + * Copyright 2019-2023 Adaptive Financial Consulting Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aeron-core/src/main/resources/logback.xml b/aeron-core/src/main/resources/logback.xml index f202a32a..4aa2ee17 100644 --- a/aeron-core/src/main/resources/logback.xml +++ b/aeron-core/src/main/resources/logback.xml @@ -1,5 +1,5 @@