Skip to content

Commit 4ea3f9d

Browse files
committed
Merge branch 'release/6.0.2'
2 parents b290ce5 + f856e8a commit 4ea3f9d

File tree

15 files changed

+55
-69
lines changed

15 files changed

+55
-69
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,20 @@ updates:
33
- package-ecosystem: maven
44
directory: "/"
55
schedule:
6-
interval: "weekly"
7-
day: "sunday"
8-
time: "18:00"
9-
timezone: "Europe/Paris"
6+
interval: "monthly"
107
target-branch: development
118
open-pull-requests-limit: 10
129

1310
- package-ecosystem: npm
1411
directory: "/docs"
1512
schedule:
16-
interval: "weekly"
17-
day: "sunday"
18-
time: "18:00"
19-
timezone: "Europe/Paris"
13+
interval: "monthly"
2014
target-branch: development
2115
open-pull-requests-limit: 10
2216

2317
- package-ecosystem: github-actions
2418
directory: "/"
2519
schedule:
26-
interval: "weekly"
27-
day: "sunday"
28-
time: "18:00"
29-
timezone: "Europe/Paris"
20+
interval: "monthly"
3021
target-branch: development
3122
open-pull-requests-limit: 10

.github/workflows/on-branch-push-or-pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
steps:
1010
# ================================================================================================================
1111
- name: JDK 17 Setup
12-
uses: actions/setup-java@v3.11.0
12+
uses: actions/setup-java@v4.0.0
1313
with:
1414
distribution: 'temurin'
1515
java-version: '17'
1616

1717
# ================================================================================================================
1818
- name: Retrieve the sources
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
# ================================================================================================================
2222
- name: Build, run tests and deploy locally

.github/workflows/on-development-push-publish-snapshot-and-website.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
# ================================================================================================================
2020
- name: JDK 17 Setup
21-
uses: actions/setup-java@v3.11.0
21+
uses: actions/setup-java@v4.0.0
2222
with:
2323
distribution: 'temurin'
2424
java-version: '17'
@@ -28,7 +28,7 @@ jobs:
2828

2929
# ================================================================================================================
3030
- name: Retrieve the sources
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
# ================================================================================================================
3434
- name: GPG Setup
@@ -48,7 +48,7 @@ jobs:
4848
# GPG.
4949
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
5050
run: |
51-
mvn deploy -B -DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE}
51+
mvn deploy -B -Dgpg.passphrase=${GPG_PASSPHRASE}
5252
5353
# ================================================================================================================
5454
- name: Retrieve the latest release published on Github
@@ -59,7 +59,7 @@ jobs:
5959

6060
# ================================================================================================================
6161
- name: Install Go to generate the graphQL documentation with gqldoc
62-
uses: actions/setup-go@v4
62+
uses: actions/setup-go@v5
6363
with:
6464
go-version: '^1.17.3'
6565

@@ -72,18 +72,18 @@ jobs:
7272
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/fr/tutorial/graphql-api-documentation
7373
7474
# ================================================================================================================
75-
- name: Install vuepress, set release number, and build the website
76-
run: |
77-
find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.getLatestRelease.outputs.release }}/g' {} \;
78-
yarn --cwd docs add -D vuepress@next
79-
yarn --cwd docs install
80-
yarn --cwd docs docs:build docs
75+
#- name: Install vuepress, set release number, and build the website
76+
# run: |
77+
# find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.getLatestRelease.outputs.release }}/g' {} \;
78+
# yarn --cwd docs add -D vuepress@next
79+
# yarn --cwd docs install
80+
# yarn --cwd docs docs:build docs
8181

8282
# ================================================================================================================
83-
- name: Deploy the website to github pages
84-
uses: JamesIves/github-pages-deploy-action@v4.4.1
85-
with:
86-
branch: gh-pages
87-
folder: docs/docs/.vuepress/dist
88-
commit-message: "Website deployment"
89-
clean: true
83+
#- name: Deploy the website to github pages
84+
# uses: JamesIves/github-pages-deploy-action@v4.4.3
85+
# with:
86+
# branch: gh-pages
87+
# folder: docs/docs/.vuepress/dist
88+
# commit-message: "Website deployment"
89+
# clean: true

.github/workflows/on-tag-push-create-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
# ================================================================================================================
2020
- name: JDK 17 Setup
21-
uses: actions/setup-java@v3.11.0
21+
uses: actions/setup-java@v4.0.0
2222
with:
2323
distribution: 'temurin'
2424
java-version: '17'
@@ -28,7 +28,7 @@ jobs:
2828

2929
# ================================================================================================================
3030
- name: Retrieve the sources
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
# ================================================================================================================
3434
- name: GPG Setup

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<p align="center">
22
<a href="https://trading-bot.cassandre.tech/tutorial/create-your-project.html">Quick Start</a> |
33
<a href="https://trading-bot.cassandre.tech">Documentation</a> |
4-
<a href="https://discord.gg/sv3VXuTgFS">Discord</a> |
54
<a href="https://twitter.com/cassandretech">Twitter</a>
65
</p>
76

@@ -15,15 +14,11 @@
1514
<hr>
1615

1716
<h3 align="center">Create and run your java crypto trading bot in minutes</h2>
18-
<p align="center">Our Spring boot starter takes care of exchange connections, accounts, orders, trades, and positions so you can focus on building your strategies.</p>
17+
<p align="center">Our Spring boot starter takes care of exchange connections, accounts, orders, trades, and positions, so you can focus on building your strategies.</p>
1918

20-
<p align="center"><i>We are thrilled to share that our open source project is still actively maintained! While there won't be major upgrades in the near future, we remain dedicated to providing ongoing support and ensuring the project continues to thrive.</i></p>
19+
<p align="center"><i>Our open source project is still actively maintained! While there won't be major upgrades in the near future, we remain dedicated to providing ongoing support and ensuring the project continues to thrive.</i></p>
2120

2221
<p align="center">
23-
<a href="https://discord.gg/sv3VXuTgFS">
24-
<img src="https://img.shields.io/discord/796141274171310110.svg?logo=discord&label=Discord"
25-
alt="Cassandre trading bot on discord" />
26-
</a>
2722
<a href="https://www.codacy.com/gh/cassandre-tech/cassandre-trading-bot?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cassandre-tech/cassandre-trading-bot&amp;utm_campaign=Badge_Grade">
2823
<img src="https://api.codacy.com/project/badge/Grade/f26dc41008a64bb18dcd404b46b69fc8"
2924
alt="Cassandre trading bot on codacy" />
@@ -33,7 +28,7 @@
3328
alt="Cassandre trading bot on codacy" />
3429
</a>
3530
<a href="https://github.com/cassandre-tech/cassandre-trading-bot/actions">
36-
<img src="https://github.com/cassandre-tech/cassandre-trading-bot/workflows/Continuous%20integration/badge.svg"
31+
<img src="https://github.com/cassandre-tech/cassandre-trading-bot/actions/workflows/on-development-push-publish-snapshot-and-website.yml/badge.svg"
3732
alt="Cassandre trading bot continuous integration" />
3833
</a>
3934
<a href="https://search.maven.org/search?q=g:tech.cassandre.trading.bot">

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
## Supported Versions
44

55
| Version | Supported |
6-
|---------| ------------------ |
6+
|---------|--------------------|
77
| 6.x.x | :white_check_mark: |
8-
| 5.x.x | :white_check_mark: |
8+
| 5.x.x | :x: |
99
| 4.x.x | :x: |
1010
| 3.x.x | :x: |
1111
| 2.x.x | :x: |

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"docs:build": "vuepress build docs"
1414
},
1515
"devDependencies": {
16-
"@vuepress/client": "2.0.0-beta.62",
16+
"@vuepress/client": "2.0.0-rc.0",
1717
"vue": "^3.3.2",
18-
"vuepress": "2.0.0-beta.62"
18+
"vuepress": "^2.0.0-rc.0"
1919
}
2020
}

pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Project information -->
99
<groupId>tech.cassandre.trading.bot</groupId>
1010
<artifactId>cassandre-trading-bot-project</artifactId>
11-
<version>6.0.1</version>
11+
<version>6.0.2</version>
1212
<packaging>pom</packaging>
1313
<name>Cassandre trading bot</name>
1414
<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>
@@ -55,7 +55,7 @@
5555
<parent>
5656
<groupId>org.springframework.boot</groupId>
5757
<artifactId>spring-boot-starter-parent</artifactId>
58-
<version>2.7.11</version>
58+
<version>2.7.16</version>
5959
<relativePath/>
6060
</parent>
6161
<!-- =========================================================================================================== -->
@@ -73,40 +73,40 @@
7373
<!-- Libraries releases -->
7474

7575
<!-- Core -->
76-
<spring.version>2.7.11</spring.version>
76+
<spring.version>2.7.18</spring.version>
7777
<reactor.version>Dysprosium-SR25</reactor.version>
7878
<xchange.version>5.0.13</xchange.version>
7979
<bucket4j.version>7.6.0</bucket4j.version>
80-
<liquibase.version>4.22.0</liquibase.version>
81-
<opencsv.version>5.7.1</opencsv.version>
80+
<liquibase.version>4.25.1</liquibase.version>
81+
<opencsv.version>5.9</opencsv.version>
8282

8383
<!-- Core utils -->
84-
<lombok.version>1.18.26</lombok.version>
84+
<lombok.version>1.18.28</lombok.version>
8585
<lombok.mapstruct.version>0.2.0</lombok.mapstruct.version>
8686
<mapstruct.version>1.5.5.Final</mapstruct.version>
87-
<guava.version>31.1-jre</guava.version>
87+
<guava.version>32.1.2-jre</guava.version>
8888

8989
<!-- Tests -->
90-
<junit-pioneer.version>2.0.1</junit-pioneer.version>
90+
<junit-pioneer.version>2.2.0</junit-pioneer.version>
9191
<awaitility.version>4.2.0</awaitility.version>
92-
<hsqldb.version>2.7.1</hsqldb.version>
93-
<jackson.version>2.15.0</jackson.version>
92+
<hsqldb.version>2.7.2</hsqldb.version>
93+
<jackson.version>2.15.2</jackson.version>
9494

9595
<!-- GraphQL API -->
9696
<graphql-dgs.version>5.3.0</graphql-dgs.version>
9797

9898
<!-- Maven -->
99-
<maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
99+
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
100100
<maven.graphqlcodegen.plugin.version>1.18</maven.graphqlcodegen.plugin.version>
101-
<maven.puppycrawl.checkstyle.version>10.11.0</maven.puppycrawl.checkstyle.version>
101+
<maven.puppycrawl.checkstyle.version>10.12.3</maven.puppycrawl.checkstyle.version>
102102
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
103103
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
104104
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
105-
<maven.jacoco.plugin.version>0.8.10</maven.jacoco.plugin.version>
105+
<maven.jacoco.plugin.version>0.8.11</maven.jacoco.plugin.version>
106106
<maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
107107
<maven.lombok.plugin.version>1.18.20.0</maven.lombok.plugin.version>
108-
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
109-
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
108+
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
109+
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
110110
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
111111
<maven.archetype-packaging.version>3.2.1</maven.archetype-packaging.version>
112112
</properties>
@@ -138,7 +138,7 @@
138138
<plugin>
139139
<groupId>com.amashchenko.maven.plugin</groupId>
140140
<artifactId>gitflow-maven-plugin</artifactId>
141-
<version>1.19.0</version>
141+
<version>1.20.0</version>
142142
<configuration>
143143
<gitFlowConfig>
144144
<developmentBranch>development</developmentBranch>

spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.netflix.graphql.dgs.codegen</groupId>
3535
<artifactId>graphql-dgs-codegen-core</artifactId>
36-
<version>5.6.3</version>
36+
<version>6.1.2</version>
3737
<scope>provided</scope>
3838
</dependency>
3939
<dependency>
@@ -319,7 +319,7 @@
319319
<parent>
320320
<groupId>tech.cassandre.trading.bot</groupId>
321321
<artifactId>cassandre-trading-bot-project</artifactId>
322-
<version>6.0.1</version>
322+
<version>6.0.2</version>
323323
<relativePath>../../../pom.xml</relativePath>
324324
</parent>
325325
<!-- =========================================================================================================== -->

spring-boot-starter-api/spring-boot-starter-api-graphql/starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<parent>
107107
<groupId>tech.cassandre.trading.bot</groupId>
108108
<artifactId>cassandre-trading-bot-project</artifactId>
109-
<version>6.0.1</version>
109+
<version>6.0.2</version>
110110
<relativePath>../../../pom.xml</relativePath>
111111
</parent>
112112
<!-- =========================================================================================================== -->

0 commit comments

Comments
 (0)