Skip to content

Commit e2e8c6f

Browse files
straumatstraumat
committed
Merge branch 'release/5.0.2'
2 parents 16ccf8e + 35fe9cb commit e2e8c6f

File tree

226 files changed

+1043
-1014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+1043
-1014
lines changed

‎.github/dependabot.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,31 @@ updates:
99
timezone: Europe/Paris
1010
open-pull-requests-limit: 10
1111
target-branch: development
12+
- package-ecosystem: maven
13+
directory: "trading-bot-archetypes/basic-archetype/src/main/resources/archetype-resources"
14+
schedule:
15+
interval: "weekly"
16+
day: "friday"
17+
time: "18:00"
18+
timezone: Europe/Paris
19+
open-pull-requests-limit: 10
20+
target-branch: development
21+
- package-ecosystem: maven
22+
directory: "trading-bot-archetypes/basic-ta4j-archetype/src/main/resources/archetype-resources"
23+
schedule:
24+
interval: "weekly"
25+
day: "friday"
26+
time: "18:00"
27+
timezone: Europe/Paris
28+
open-pull-requests-limit: 10
29+
target-branch: development
30+
31+
- package-ecosystem: "npm"
32+
directory: "/docs"
33+
schedule:
34+
interval: "weekly"
35+
day: "friday"
36+
time: "18:00"
37+
timezone: Europe/Paris
38+
open-pull-requests-limit: 10
39+
target-branch: development

‎.github/workflows/branch-push.yml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,28 @@ jobs:
1515
steps:
1616
# ================================================================================================================
1717
- name: JDK 11 Setup
18-
id: jdk
19-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v2
2019
with:
20+
distribution: 'adopt'
2121
java-version: '11'
2222

2323
# ================================================================================================================
2424
- name: Retrieve the sources
25-
id: sources
26-
uses: actions/checkout@v1
25+
uses: actions/checkout@v2
2726

2827
# ================================================================================================================
29-
- name: Retrieve the version
30-
id: version
28+
- name: Build, run tests, package and deploy to Maven central
3129
run: |
32-
echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
30+
mvn install -Dgpg.skip
3331
3432
# ================================================================================================================
35-
- name: Build, run tests, package and deploy to Maven central
36-
id: package
33+
- name: Retrieve the version from Maven pom
34+
id: version
3735
run: |
38-
mvn install -Dgpg.skip
36+
echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
3937
4038
# ================================================================================================================
4139
- name: Test Cassandre trading bot maven archetype - basic strategy
42-
id: cassandre-trading-bot-spring-boot-starter-basic-archetype
4340
run: |
4441
mvn -B archetype:generate \
4542
-DarchetypeGroupId=tech.cassandre.trading.bot \
@@ -53,7 +50,6 @@ jobs:
5350
5451
# ================================================================================================================
5552
- name: Test Cassandre trading bot maven archetype - basic ta4j strategy
56-
id: cassandre-trading-bot-spring-boot-starter-basic-ta4j-archetype
5753
run: |
5854
mvn -B archetype:generate \
5955
-DarchetypeGroupId=tech.cassandre.trading.bot \

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,35 @@ on:
66

77
jobs:
88
analyze:
9+
# ==================================================================================================================
10+
# Configuration.
911
name: Analyze
1012
runs-on: ubuntu-latest
1113

1214
steps:
13-
- name: Checkout repository
14-
uses: actions/checkout@v2
15-
with:
16-
# We must fetch at least the immediate parents so that if this is
17-
# a pull request then we can checkout the head.
18-
fetch-depth: 2
19-
20-
# If this run was triggered by a pull request event, then checkout
21-
# the head of the pull request instead of the merge commit.
22-
- run: git checkout HEAD^2
23-
if: ${{ github.event_name == 'pull_request' }}
24-
25-
# Initializes the CodeQL tools for scanning.
26-
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v1
28-
with:
29-
languages: java
30-
31-
- name: JDK 11 Setup
32-
uses: actions/setup-java@v1
33-
with:
34-
java-version: '11'
35-
36-
- name: Build, run tests, package and deploy to Maven central
37-
run: |
38-
mvn package
39-
40-
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@v1
15+
# ================================================================================================================
16+
- name: JDK 11 Setup
17+
uses: actions/setup-java@v2
18+
with:
19+
distribution: 'adopt'
20+
java-version: '11'
21+
22+
# ================================================================================================================
23+
- name: Retrieve the sources
24+
uses: actions/checkout@v2
25+
26+
# ================================================================================================================
27+
# Initializes the CodeQL tools for scanning.
28+
- name: Initialize CodeQL
29+
uses: github/codeql-action/init@v1.0.7
30+
with:
31+
languages: java
32+
33+
# ================================================================================================================
34+
- name: Build, run tests and package
35+
run: |
36+
mvn package
37+
38+
# ================================================================================================================
39+
- name: Perform CodeQL Analysis
40+
uses: github/codeql-action/analyze@v1.0.7

‎.github/workflows/continuous-integration.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
steps:
1515
# ================================================================================================================
1616
- name: GPG Setup
17-
id: gpg
1817
env:
1918
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
2019
run: |
@@ -23,28 +22,20 @@ jobs:
2322
2423
# ================================================================================================================
2524
- name: JDK 11 Setup
26-
id: jdk
27-
uses: actions/setup-java@v1
25+
uses: actions/setup-java@v2
2826
with:
27+
distribution: 'adopt'
2928
java-version: '11'
3029
server-id: ossrh
3130
server-username: MAVEN_USERNAME
3231
server-password: MAVEN_PASSWORD
3332

3433
# ================================================================================================================
3534
- name: Retrieve the sources
36-
id: sources
37-
uses: actions/checkout@v1
38-
39-
# ================================================================================================================
40-
- name: Retrieve the version
41-
id: version
42-
run: |
43-
echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
35+
uses: actions/checkout@v2
4436

4537
# ================================================================================================================
4638
- name: Build, run tests, package and deploy to Maven central
47-
id: package
4839
env: # Environment variables.
4940
# GPG.
5041
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
@@ -54,9 +45,21 @@ jobs:
5445
run: |
5546
mvn deploy -B -Dgpg.passphrase=${GPG_PASSPHRASE}
5647
48+
# ================================================================================================================
49+
- name: Upload codacy coverage results
50+
run: |
51+
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
52+
--project-token ${{ secrets.CODACY_API_TOKEN }} \
53+
-r spring-boot-starter/autoconfigure/target/site/jacoco/jacoco.xml
54+
55+
# ================================================================================================================
56+
- name: Retrieve the version from Maven pom
57+
id: version
58+
run: |
59+
echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
60+
5761
# ================================================================================================================
5862
- name: Test Cassandre trading bot maven archetype - basic strategy
59-
id: cassandre-trading-bot-spring-boot-starter-basic-archetype
6063
run: |
6164
mvn -B archetype:generate \
6265
-DarchetypeGroupId=tech.cassandre.trading.bot \
@@ -70,7 +73,6 @@ jobs:
7073
7174
# ================================================================================================================
7275
- name: Test Cassandre trading bot maven archetype - basic ta4j strategy
73-
id: cassandre-trading-bot-spring-boot-starter-basic-ta4j-archetype
7476
run: |
7577
mvn -B archetype:generate \
7678
-DarchetypeGroupId=tech.cassandre.trading.bot \

‎.github/workflows/integration-tests.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
# ================================================================================================================
15-
- name: Retrieve the sources
16-
uses: actions/checkout@v1
17-
1814
# ================================================================================================================
1915
- name: JDK 11 Setup
20-
uses: actions/setup-java@v1
16+
uses: actions/setup-java@v2
2117
with:
18+
distribution: 'adopt'
2219
java-version: '11'
2320

21+
# ================================================================================================================
22+
- name: Retrieve the sources
23+
uses: actions/checkout@v2
24+
2425
# ================================================================================================================
2526
- name: Build, run tests, package and deploy to Maven central - Also sends Qase tests reports
2627
env: # Environment variables.
@@ -49,4 +50,4 @@ jobs:
4950
BINANCE_KEY: ${{ secrets.BINANCE_KEY }}
5051
BINANCE_SECRET: ${{ secrets.BINANCE_SECRET }}
5152
run: |
52-
mvn -Pintegration package
53+
mvn -Pintegration package

‎.github/workflows/release-creation.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,28 @@ jobs:
1414
steps:
1515
# ================================================================================================================
1616
- name: GPG Setup
17+
env:
18+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
1719
run: |
1820
echo "$GPG_PRIVATE_KEY" > private.asc
1921
gpg --import --batch private.asc
20-
env:
21-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
2222
2323
# ================================================================================================================
2424
- name: JDK 11 Setup
25-
uses: actions/setup-java@v1
25+
uses: actions/setup-java@v2
2626
with:
27+
distribution: 'adopt'
2728
java-version: '11'
2829
server-id: ossrh
2930
server-username: MAVEN_USERNAME
3031
server-password: MAVEN_PASSWORD
3132

3233
# ================================================================================================================
3334
- name: Retrieve the sources
34-
uses: actions/checkout@v1
35+
uses: actions/checkout@v2
3536

3637
# ================================================================================================================
37-
- name: Build, run tests, package and deploy
38+
- name: Build, package and deploy
3839
id: package
3940
env: # Environment variables.
4041
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -50,13 +51,12 @@ jobs:
5051
# ================================================================================================================
5152
- name: Build Changelog
5253
id: build_changelog
53-
uses: heinrichreimer/github-changelog-generator-action@v2.1.1
54+
uses: heinrichreimer/github-changelog-generator-action@v2.2
5455
with:
5556
token: ${{ secrets.GITHUB_TOKEN }}
5657

5758
# ================================================================================================================
5859
- name: Create the release
59-
id: create_release
6060
uses: actions/create-release@v1
6161
env:
6262
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -142,7 +142,6 @@ jobs:
142142

143143
# ================================================================================================================
144144
- name: Change release in website sources
145-
id: sed
146145
run: find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.getLatestRelease.outputs.release }}/g' {} \;
147146

148147
# ================================================================================================================
@@ -156,9 +155,9 @@ jobs:
156155
157156
# ================================================================================================================
158157
- name: Deploy the documentation website
159-
uses: JamesIves/github-pages-deploy-action@4.1.0
158+
uses: JamesIves/github-pages-deploy-action@4.1.4
160159
with:
161160
branch: gh-pages
162161
folder: docs/src/.vuepress/dist
163162
commit-message: "Documentation website update"
164-
clean: true
163+
clean: true

‎.github/workflows/website-update.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ jobs:
1414
steps:
1515
# ================================================================================================================
1616
- name: Retrieve the sources
17-
id: sources
18-
uses: actions/checkout@v1
17+
uses: actions/checkout@v2
1918

2019
# ================================================================================================================
2120
- uses: pozetroninc/github-action-get-latest-release@master
@@ -25,7 +24,6 @@ jobs:
2524

2625
# ================================================================================================================
2726
- name: Change release in website sources
28-
id: sed
2927
run: find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.getLatestRelease.outputs.release }}/g' {} \;
3028

3129
# ================================================================================================================
@@ -39,7 +37,7 @@ jobs:
3937
4038
# ================================================================================================================
4139
- name: Deploy the documentation website
42-
uses: JamesIves/github-pages-deploy-action@4.1.0
40+
uses: JamesIves/github-pages-deploy-action@4.1.4
4341
with:
4442
branch: gh-pages
4543
folder: docs/src/.vuepress/dist

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
| Version | Supported |
66
| ------- | ------------------ |
77
| 5.x.x | :white_check_mark: |
8-
| 4.x.x | :white_check_mark: |
8+
| 4.x.x | :x: |
99
| 3.x.x | :x: |
1010
| 2.x.x | :x: |
1111
| 1.x.x | :x: |

‎docs/src/learn/dry-mode-and-backtesting.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ curl -s "https://api.kucoin.com/api/v1/market/candles?type=1day&symbol=BTC-USDT&
6262

6363
It will create a file named `tickers-btc-usdt.tsv` that contains the historical rate of BTC-USDT from `startDate` (3 months ago) to `endDate` (now). Of course, you can choose your own dates and currency pair.
6464

65-
Place this file in the `src/test/resources` folder of your project and add those lines to your JUnit test class:
65+
Place this file in the `src/test/resources` folder of your project and add this line to your JUnit test class:
6666

6767
```java
68-
@ComponentScan("tech.cassandre.trading.bot")
6968
@Import(TickerFluxMock.class)
7069
```
7170

‎docs/src/learn/technical-analysis.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,9 @@ curl -s "https://api.kucoin.com/api/v1/market/candles?type=1day&symbol=BTC-USDT&
257257

258258
It will create a file named `tickers-btc-usdt.tsv` that contains the historical rate of `btc-usdt` from `startDate` (3 months ago) to `endDate` (now). Of course, you can change dates and currency pair.
259259

260-
Now place this file in the `src/test/resources` folder of our project and add those lines to your JUnit test class:
260+
Now place this file in the `src/test/resources` folder of our project and add this line to your JUnit test class:
261261

262262
```java
263-
@ComponentScan("tech.cassandre.trading.bot")
264263
@Import(TickerFluxMock.class)
265264
```
266265

0 commit comments

Comments
 (0)