Skip to content

Commit

Permalink
Merge branch 'release/6.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
straumat committed Jan 15, 2024
2 parents b290ce5 + f856e8a commit 4ea3f9d
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 69 deletions.
15 changes: 3 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,20 @@ updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: "Europe/Paris"
interval: "monthly"
target-branch: development
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/docs"
schedule:
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: "Europe/Paris"
interval: "monthly"
target-branch: development
open-pull-requests-limit: 10

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: "Europe/Paris"
interval: "monthly"
target-branch: development
open-pull-requests-limit: 10
4 changes: 2 additions & 2 deletions .github/workflows/on-branch-push-or-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
steps:
# ================================================================================================================
- name: JDK 17 Setup
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4.0.0
with:
distribution: 'temurin'
java-version: '17'

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# ================================================================================================================
- name: Build, run tests and deploy locally
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
# ================================================================================================================
- name: JDK 17 Setup
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4.0.0
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -28,7 +28,7 @@ jobs:

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# ================================================================================================================
- name: GPG Setup
Expand All @@ -48,7 +48,7 @@ jobs:
# GPG.
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: |
mvn deploy -B -DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE}
mvn deploy -B -Dgpg.passphrase=${GPG_PASSPHRASE}
# ================================================================================================================
- name: Retrieve the latest release published on Github
Expand All @@ -59,7 +59,7 @@ jobs:

# ================================================================================================================
- name: Install Go to generate the graphQL documentation with gqldoc
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '^1.17.3'

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

# ================================================================================================================
- name: Deploy the website to github pages
uses: JamesIves/github-pages-deploy-action@v4.4.1
with:
branch: gh-pages
folder: docs/docs/.vuepress/dist
commit-message: "Website deployment"
clean: true
#- name: Deploy the website to github pages
# uses: JamesIves/github-pages-deploy-action@v4.4.3
# with:
# branch: gh-pages
# folder: docs/docs/.vuepress/dist
# commit-message: "Website deployment"
# clean: true
4 changes: 2 additions & 2 deletions .github/workflows/on-tag-push-create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
# ================================================================================================================
- name: JDK 17 Setup
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4.0.0
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -28,7 +28,7 @@ jobs:

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# ================================================================================================================
- name: GPG Setup
Expand Down
11 changes: 3 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<p align="center">
<a href="https://trading-bot.cassandre.tech/tutorial/create-your-project.html">Quick Start</a> |
<a href="https://trading-bot.cassandre.tech">Documentation</a> |
<a href="https://discord.gg/sv3VXuTgFS">Discord</a> |
<a href="https://twitter.com/cassandretech">Twitter</a>
</p>

Expand All @@ -15,15 +14,11 @@
<hr>

<h3 align="center">Create and run your java crypto trading bot in minutes</h2>
<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>
<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>

<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>
<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>

<p align="center">
<a href="https://discord.gg/sv3VXuTgFS">
<img src="https://img.shields.io/discord/796141274171310110.svg?logo=discord&label=Discord"
alt="Cassandre trading bot on discord" />
</a>
<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">
<img src="https://api.codacy.com/project/badge/Grade/f26dc41008a64bb18dcd404b46b69fc8"
alt="Cassandre trading bot on codacy" />
Expand All @@ -33,7 +28,7 @@
alt="Cassandre trading bot on codacy" />
</a>
<a href="https://github.com/cassandre-tech/cassandre-trading-bot/actions">
<img src="https://github.com/cassandre-tech/cassandre-trading-bot/workflows/Continuous%20integration/badge.svg"
<img src="https://github.com/cassandre-tech/cassandre-trading-bot/actions/workflows/on-development-push-publish-snapshot-and-website.yml/badge.svg"
alt="Cassandre trading bot continuous integration" />
</a>
<a href="https://search.maven.org/search?q=g:tech.cassandre.trading.bot">
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
## Supported Versions

| Version | Supported |
|---------| ------------------ |
|---------|--------------------|
| 6.x.x | :white_check_mark: |
| 5.x.x | :white_check_mark: |
| 5.x.x | :x: |
| 4.x.x | :x: |
| 3.x.x | :x: |
| 2.x.x | :x: |
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"docs:build": "vuepress build docs"
},
"devDependencies": {
"@vuepress/client": "2.0.0-beta.62",
"@vuepress/client": "2.0.0-rc.0",
"vue": "^3.3.2",
"vuepress": "2.0.0-beta.62"
"vuepress": "^2.0.0-rc.0"
}
}
32 changes: 16 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Project information -->
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<packaging>pom</packaging>
<name>Cassandre trading bot</name>
<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>
Expand Down Expand Up @@ -55,7 +55,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.11</version>
<version>2.7.16</version>
<relativePath/>
</parent>
<!-- =========================================================================================================== -->
Expand All @@ -73,40 +73,40 @@
<!-- Libraries releases -->

<!-- Core -->
<spring.version>2.7.11</spring.version>
<spring.version>2.7.18</spring.version>
<reactor.version>Dysprosium-SR25</reactor.version>
<xchange.version>5.0.13</xchange.version>
<bucket4j.version>7.6.0</bucket4j.version>
<liquibase.version>4.22.0</liquibase.version>
<opencsv.version>5.7.1</opencsv.version>
<liquibase.version>4.25.1</liquibase.version>
<opencsv.version>5.9</opencsv.version>

<!-- Core utils -->
<lombok.version>1.18.26</lombok.version>
<lombok.version>1.18.28</lombok.version>
<lombok.mapstruct.version>0.2.0</lombok.mapstruct.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<guava.version>31.1-jre</guava.version>
<guava.version>32.1.2-jre</guava.version>

<!-- Tests -->
<junit-pioneer.version>2.0.1</junit-pioneer.version>
<junit-pioneer.version>2.2.0</junit-pioneer.version>
<awaitility.version>4.2.0</awaitility.version>
<hsqldb.version>2.7.1</hsqldb.version>
<jackson.version>2.15.0</jackson.version>
<hsqldb.version>2.7.2</hsqldb.version>
<jackson.version>2.15.2</jackson.version>

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

<!-- Maven -->
<maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
<maven.graphqlcodegen.plugin.version>1.18</maven.graphqlcodegen.plugin.version>
<maven.puppycrawl.checkstyle.version>10.11.0</maven.puppycrawl.checkstyle.version>
<maven.puppycrawl.checkstyle.version>10.12.3</maven.puppycrawl.checkstyle.version>
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
<maven.jacoco.plugin.version>0.8.10</maven.jacoco.plugin.version>
<maven.jacoco.plugin.version>0.8.11</maven.jacoco.plugin.version>
<maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
<maven.lombok.plugin.version>1.18.20.0</maven.lombok.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
<maven.archetype-packaging.version>3.2.1</maven.archetype-packaging.version>
</properties>
Expand Down Expand Up @@ -138,7 +138,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
<configuration>
<gitFlowConfig>
<developmentBranch>development</developmentBranch>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>com.netflix.graphql.dgs.codegen</groupId>
<artifactId>graphql-dgs-codegen-core</artifactId>
<version>5.6.3</version>
<version>6.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -319,7 +319,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-starter-test/autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-starter-test/starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-starter/autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-starter/starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion trading-bot-archetypes/basic-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down

0 comments on commit 4ea3f9d

Please sign in to comment.