Skip to content

Commit

Permalink
Update to latest Aeron, Agrona, SBE (#197)
Browse files Browse the repository at this point in the history
* Bump gradle to latest
* Update to latest Aeron, Agrona, SBE
* Update readme
  • Loading branch information
eleventy7 authored Apr 14, 2023
1 parent b642119 commit bb8b7bb
Show file tree
Hide file tree
Showing 126 changed files with 139 additions and 158 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion aeron-core/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion aeron-core/src/main/resources/messages.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ 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.
Expand Down
2 changes: 1 addition & 1 deletion aeron-core/src/main/resources/sbe/sbe.xsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ 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.
Expand Down
2 changes: 1 addition & 1 deletion aeron-mdc/aeron-mdc-publisher/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-javaagent:/root/aeron/aeron-agent-1.40.0.jar \
-javaagent:/root/aeron/aeron-agent-1.41.0.jar \
-Djava.net.preferIPv4Stack=true \
-Daeron.event.log=admin \
-jar /root/jar/aeron-mdc-publisher-uber.jar
4 changes: 2 additions & 2 deletions aeron-mdc/aeron-mdc-publisher/setup-docker.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
2 changes: 1 addition & 1 deletion aeron-mdc/aeron-mdc-subscriber/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-javaagent:/root/aeron/aeron-agent-1.40.0.jar \
-javaagent:/root/aeron/aeron-agent-1.41.0.jar \
-Djava.net.preferIPv4Stack=true \
-Daeron.event.log=admin \
-jar /root/jar/aeron-mdc-subscriber-uber.jar
4 changes: 2 additions & 2 deletions aeron-mdc/aeron-mdc-subscriber/setup-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion agrona/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion agrona/src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion archive-core/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion archive-core/src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions archive-multi-host/archive-client/setup-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
4 changes: 2 additions & 2 deletions archive-multi-host/archive-host/setup-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
2 changes: 1 addition & 1 deletion archive-replication/archive-backup/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-javaagent:/root/aeron/aeron-agent-1.40.0.jar \
-javaagent:/root/aeron/aeron-agent-1.41.0.jar \
-Djava.net.preferIPv4Stack=true \
-Daeron.event.log=admin \
-Daeron.event.archive.log=all \
Expand Down
4 changes: 2 additions & 2 deletions archive-replication/archive-backup/setup-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
4 changes: 2 additions & 2 deletions archive-replication/archive-client/setup-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
4 changes: 2 additions & 2 deletions archive-replication/archive-host/setup-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apt-get install \
mkdir /root/aeron
mkdir /root/jar

wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.41.0/aeron-all-1.41.0.jar -P /root/aeron/
wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.41.0/aeron-agent-1.41.0.jar -P /root/aeron/

apt-get remove wget --quiet --assume-yes
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion async/src/main/java/com/aeroncookbook/async/TimerItem.java
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion async/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion async/src/main/resources/messages.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ 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.
Expand Down
2 changes: 1 addition & 1 deletion async/src/main/resources/sbe/sbe.xsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Loading

0 comments on commit bb8b7bb

Please sign in to comment.