Skip to content

Commit b290ce5

Browse files
committed
Merge branch 'release/6.0.1'
2 parents 8976211 + 0585d54 commit b290ce5

File tree

22 files changed

+199
-121
lines changed

22 files changed

+199
-121
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ updates:
88
time: "18:00"
99
timezone: "Europe/Paris"
1010
target-branch: development
11+
open-pull-requests-limit: 10
1112

1213
- package-ecosystem: npm
1314
directory: "/docs"
@@ -17,6 +18,7 @@ updates:
1718
time: "18:00"
1819
timezone: "Europe/Paris"
1920
target-branch: development
21+
open-pull-requests-limit: 10
2022

2123
- package-ecosystem: github-actions
2224
directory: "/"
@@ -26,3 +28,4 @@ updates:
2628
time: "18:00"
2729
timezone: "Europe/Paris"
2830
target-branch: development
31+
open-pull-requests-limit: 10

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
# ================================================================================================================
1111
- name: JDK 17 Setup
12-
uses: actions/setup-java@v3.3.0
12+
uses: actions/setup-java@v3.11.0
1313
with:
1414
distribution: 'temurin'
1515
java-version: '17'
@@ -49,37 +49,6 @@ jobs:
4949
-Dpackage=com.example
5050
mvn -f archetype-test-basic/pom.xml test
5151
52-
# ================================================================================================================
53-
- name: Install Go to generate the graphQL documentation with gqldoc
54-
uses: actions/setup-go@v3
55-
with:
56-
go-version: '^1.17.3'
57-
58-
# ================================================================================================================
59-
# - name: Add the GraphQL schema and its documentation to the website
60-
# run: |
61-
# cp spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/*.graphqls docs/docs/.vuepress/public/api/graphql/definition
62-
# go install github.com/Code-Hex/gqldoc/cmd/gqldoc@v0.0.6
63-
# gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/learn/graphql-api-documentation
64-
65-
# ================================================================================================================
66-
- name: Install vuepress, set release number, and build the website
67-
run: |
68-
yarn add -D vuepress@next
69-
find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.maven.outputs.version }}/g' {} \;
70-
yarn --cwd docs install
71-
yarn --cwd docs docs:build docs
72-
73-
# ================================================================================================================
74-
- name: Deploy the website to github pages
75-
uses: JamesIves/github-pages-deploy-action@v4.3.0
76-
with:
77-
branch: gh-pages
78-
target-folder: beta
79-
folder: docs/docs/.vuepress/dist
80-
commit-message: "Beta website deployment"
81-
clean: false
82-
8352
# ================================================================================================================
8453
# Testing that the graphql starter is working correctly.
8554
- name: Start a postgres server and restore a database from production

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

Lines changed: 5 additions & 5 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.3.0
21+
uses: actions/setup-java@v3.11.0
2222
with:
2323
distribution: 'temurin'
2424
java-version: '17'
@@ -52,14 +52,14 @@ jobs:
5252
5353
# ================================================================================================================
5454
- name: Retrieve the latest release published on Github
55-
uses: pozetroninc/github-action-get-latest-release@v0.6.0
55+
uses: pozetroninc/github-action-get-latest-release@v0.7.0
5656
id: getLatestRelease
5757
with:
5858
repository: ${{ github.repository }}
5959

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

@@ -74,14 +74,14 @@ jobs:
7474
# ================================================================================================================
7575
- name: Install vuepress, set release number, and build the website
7676
run: |
77-
yarn add -D vuepress@next
7877
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
7979
yarn --cwd docs install
8080
yarn --cwd docs docs:build docs
8181
8282
# ================================================================================================================
8383
- name: Deploy the website to github pages
84-
uses: JamesIves/github-pages-deploy-action@v4.3.3
84+
uses: JamesIves/github-pages-deploy-action@v4.4.1
8585
with:
8686
branch: gh-pages
8787
folder: docs/docs/.vuepress/dist

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

Lines changed: 1 addition & 1 deletion
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.3.0
21+
uses: actions/setup-java@v3.11.0
2222
with:
2323
distribution: 'temurin'
2424
java-version: '17'

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,5 @@ docs/yarn.lock
122122
/trading-bot-strategies/technical_analysis/ta4j-strategy/.idea/libraries/
123123
/archetype-test-basic/
124124
/archetype-test-ta4j-basic/
125-
/util/test/api/graphql/package.json
125+
/util/test/api/graphql/package.json
126+
/docs/docs/.vuepress/

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="https://trading-bot.cassandre.tech/learn/quickstart">Quick Start</a> |
2+
<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> |
44
<a href="https://discord.gg/sv3VXuTgFS">Discord</a> |
55
<a href="https://twitter.com/cassandretech">Twitter</a>
@@ -17,6 +17,8 @@
1717
<h3 align="center">Create and run your java crypto trading bot in minutes</h2>
1818
<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>
1919

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>
21+
2022
<p align="center">
2123
<a href="https://discord.gg/sv3VXuTgFS">
2224
<img src="https://img.shields.io/discord/796141274171310110.svg?logo=discord&label=Discord"
@@ -41,7 +43,7 @@
4143
</p>
4244

4345
<p align="center">
44-
<a href="https://trading-bot.cassandre.tech/learn/quickstart">Quick Start</a> |
46+
<a href="https://trading-bot.cassandre.tech/tutorial/create-your-project.html">Quick Start</a> |
4547
<a href="https://trading-bot.cassandre.tech">Documentation</a> |
4648
<a href="https://discord.gg/sv3VXuTgFS">Discord</a> |
4749
<a href="https://twitter.com/cassandretech">Twitter</a>

docs/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
"docs:build": "vuepress build docs"
1414
},
1515
"devDependencies": {
16-
"@vuepress/plugin-back-to-top": "^2.0.0-beta.45",
17-
"@vuepress/plugin-docsearch": "^2.0.0-beta.45",
18-
"@vuepress/plugin-google-analytics": "^2.0.0-beta.45",
19-
"vuepress": "^2.0.0-beta.45"
16+
"@vuepress/client": "2.0.0-beta.62",
17+
"vue": "^3.3.2",
18+
"vuepress": "2.0.0-beta.62"
2019
}
2120
}

pom.xml

Lines changed: 21 additions & 21 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.0</version>
11+
<version>6.0.1</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.6.6</version>
58+
<version>2.7.11</version>
5959
<relativePath/>
6060
</parent>
6161
<!-- =========================================================================================================== -->
@@ -73,41 +73,41 @@
7373
<!-- Libraries releases -->
7474

7575
<!-- Core -->
76-
<spring.version>2.6.6</spring.version>
76+
<spring.version>2.7.11</spring.version>
7777
<reactor.version>Dysprosium-SR25</reactor.version>
7878
<xchange.version>5.0.13</xchange.version>
79-
<bucket4j.version>7.4.0</bucket4j.version>
80-
<liquibase.version>4.9.1</liquibase.version>
81-
<opencsv.version>5.6</opencsv.version>
79+
<bucket4j.version>7.6.0</bucket4j.version>
80+
<liquibase.version>4.22.0</liquibase.version>
81+
<opencsv.version>5.7.1</opencsv.version>
8282

8383
<!-- Core utils -->
84-
<lombok.version>1.18.22</lombok.version>
84+
<lombok.version>1.18.26</lombok.version>
8585
<lombok.mapstruct.version>0.2.0</lombok.mapstruct.version>
86-
<mapstruct.version>1.4.2.Final</mapstruct.version>
86+
<mapstruct.version>1.5.5.Final</mapstruct.version>
8787
<guava.version>31.1-jre</guava.version>
8888

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

9595
<!-- GraphQL API -->
96-
<graphql-dgs.version>4.9.25</graphql-dgs.version>
96+
<graphql-dgs.version>5.3.0</graphql-dgs.version>
9797

9898
<!-- Maven -->
99-
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
99+
<maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
100100
<maven.graphqlcodegen.plugin.version>1.18</maven.graphqlcodegen.plugin.version>
101-
<maven.puppycrawl.checkstyle.version>10.2</maven.puppycrawl.checkstyle.version>
102-
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
103-
<maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
101+
<maven.puppycrawl.checkstyle.version>10.11.0</maven.puppycrawl.checkstyle.version>
102+
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
103+
<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.8</maven.jacoco.plugin.version>
105+
<maven.jacoco.plugin.version>0.8.10</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>
108108
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
109-
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
110-
<maven.jar.plugin.version>3.2.2</maven.jar.plugin.version>
109+
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
110+
<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>
113113
<!-- =========================================================================================================== -->
@@ -138,7 +138,7 @@
138138
<plugin>
139139
<groupId>com.amashchenko.maven.plugin</groupId>
140140
<artifactId>gitflow-maven-plugin</artifactId>
141-
<version>1.18.0</version>
141+
<version>1.19.0</version>
142142
<configuration>
143143
<gitFlowConfig>
144144
<developmentBranch>development</developmentBranch>
@@ -171,7 +171,7 @@
171171
<plugin>
172172
<groupId>org.apache.maven.plugins</groupId>
173173
<artifactId>maven-gpg-plugin</artifactId>
174-
<version>3.0.1</version>
174+
<version>3.1.0</version>
175175
<executions>
176176
<execution>
177177
<id>sign-artifacts</id>

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.1.17</version>
36+
<version>5.6.3</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.0</version>
322+
<version>6.0.1</version>
323323
<relativePath>../../../pom.xml</relativePath>
324324
</parent>
325325
<!-- =========================================================================================================== -->

0 commit comments

Comments
 (0)