Skip to content

Commit

Permalink
Merge branch 'release/6.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
straumat committed May 16, 2023
2 parents 8976211 + 0585d54 commit b290ce5
Show file tree
Hide file tree
Showing 22 changed files with 199 additions and 121 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ updates:
time: "18:00"
timezone: "Europe/Paris"
target-branch: development
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/docs"
Expand All @@ -17,6 +18,7 @@ updates:
time: "18:00"
timezone: "Europe/Paris"
target-branch: development
open-pull-requests-limit: 10

- package-ecosystem: github-actions
directory: "/"
Expand All @@ -26,3 +28,4 @@ updates:
time: "18:00"
timezone: "Europe/Paris"
target-branch: development
open-pull-requests-limit: 10
36 changes: 0 additions & 36 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

33 changes: 1 addition & 32 deletions .github/workflows/on-branch-push-or-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
# ================================================================================================================
- name: JDK 17 Setup
uses: actions/setup-java@v3.3.0
uses: actions/setup-java@v3.11.0
with:
distribution: 'temurin'
java-version: '17'
Expand Down Expand Up @@ -49,37 +49,6 @@ jobs:
-Dpackage=com.example
mvn -f archetype-test-basic/pom.xml test
# ================================================================================================================
- name: Install Go to generate the graphQL documentation with gqldoc
uses: actions/setup-go@v3
with:
go-version: '^1.17.3'

# ================================================================================================================
# - name: Add the GraphQL schema and its documentation to the website
# run: |
# cp spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/*.graphqls docs/docs/.vuepress/public/api/graphql/definition
# go install github.com/Code-Hex/gqldoc/cmd/[email protected]
# gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/learn/graphql-api-documentation

# ================================================================================================================
- name: Install vuepress, set release number, and build the website
run: |
yarn add -D vuepress@next
find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.maven.outputs.version }}/g' {} \;
yarn --cwd docs install
yarn --cwd docs docs:build docs
# ================================================================================================================
- name: Deploy the website to github pages
uses: JamesIves/[email protected]
with:
branch: gh-pages
target-folder: beta
folder: docs/docs/.vuepress/dist
commit-message: "Beta website deployment"
clean: false

# ================================================================================================================
# Testing that the graphql starter is working correctly.
- name: Start a postgres server and restore a database from production
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.3.0
uses: actions/setup-java@v3.11.0
with:
distribution: 'temurin'
java-version: '17'
Expand Down Expand Up @@ -52,14 +52,14 @@ jobs:
# ================================================================================================================
- name: Retrieve the latest release published on Github
uses: pozetroninc/github-action-get-latest-release@v0.6.0
uses: pozetroninc/github-action-get-latest-release@v0.7.0
id: getLatestRelease
with:
repository: ${{ github.repository }}

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

Expand All @@ -74,14 +74,14 @@ jobs:
# ================================================================================================================
- name: Install vuepress, set release number, and build the website
run: |
yarn add -D vuepress@next
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.3.3
uses: JamesIves/github-pages-deploy-action@v4.4.1
with:
branch: gh-pages
folder: docs/docs/.vuepress/dist
Expand Down
2 changes: 1 addition & 1 deletion .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.3.0
uses: actions/setup-java@v3.11.0
with:
distribution: 'temurin'
java-version: '17'
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@ docs/yarn.lock
/trading-bot-strategies/technical_analysis/ta4j-strategy/.idea/libraries/
/archetype-test-basic/
/archetype-test-ta4j-basic/
/util/test/api/graphql/package.json
/util/test/api/graphql/package.json
/docs/docs/.vuepress/
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<a href="https://trading-bot.cassandre.tech/learn/quickstart">Quick Start</a> |
<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>
Expand All @@ -17,6 +17,8 @@
<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"><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">
<a href="https://discord.gg/sv3VXuTgFS">
<img src="https://img.shields.io/discord/796141274171310110.svg?logo=discord&label=Discord"
Expand All @@ -41,7 +43,7 @@
</p>

<p align="center">
<a href="https://trading-bot.cassandre.tech/learn/quickstart">Quick Start</a> |
<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>
Expand Down
7 changes: 3 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
"docs:build": "vuepress build docs"
},
"devDependencies": {
"@vuepress/plugin-back-to-top": "^2.0.0-beta.45",
"@vuepress/plugin-docsearch": "^2.0.0-beta.45",
"@vuepress/plugin-google-analytics": "^2.0.0-beta.45",
"vuepress": "^2.0.0-beta.45"
"@vuepress/client": "2.0.0-beta.62",
"vue": "^3.3.2",
"vuepress": "2.0.0-beta.62"
}
}
42 changes: 21 additions & 21 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.0</version>
<version>6.0.1</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.6.6</version>
<version>2.7.11</version>
<relativePath/>
</parent>
<!-- =========================================================================================================== -->
Expand All @@ -73,41 +73,41 @@
<!-- Libraries releases -->

<!-- Core -->
<spring.version>2.6.6</spring.version>
<spring.version>2.7.11</spring.version>
<reactor.version>Dysprosium-SR25</reactor.version>
<xchange.version>5.0.13</xchange.version>
<bucket4j.version>7.4.0</bucket4j.version>
<liquibase.version>4.9.1</liquibase.version>
<opencsv.version>5.6</opencsv.version>
<bucket4j.version>7.6.0</bucket4j.version>
<liquibase.version>4.22.0</liquibase.version>
<opencsv.version>5.7.1</opencsv.version>

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

<!-- Tests -->
<junit-pioneer.version>1.7.0</junit-pioneer.version>
<junit-pioneer.version>2.0.1</junit-pioneer.version>
<awaitility.version>4.2.0</awaitility.version>
<hsqldb.version>2.6.1</hsqldb.version>
<jackson.version>2.12.6</jackson.version>
<hsqldb.version>2.7.1</hsqldb.version>
<jackson.version>2.15.0</jackson.version>

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

<!-- Maven -->
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
<maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
<maven.graphqlcodegen.plugin.version>1.18</maven.graphqlcodegen.plugin.version>
<maven.puppycrawl.checkstyle.version>10.2</maven.puppycrawl.checkstyle.version>
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
<maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
<maven.puppycrawl.checkstyle.version>10.11.0</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.8</maven.jacoco.plugin.version>
<maven.jacoco.plugin.version>0.8.10</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.4.0</maven.javadoc.plugin.version>
<maven.jar.plugin.version>3.2.2</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.5.0</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.18.0</version>
<version>1.19.0</version>
<configuration>
<gitFlowConfig>
<developmentBranch>development</developmentBranch>
Expand Down Expand Up @@ -171,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
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.1.17</version>
<version>5.6.3</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.0</version>
<version>6.0.1</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.0</version>
<version>6.0.1</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.0</version>
<version>6.0.1</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.0</version>
<version>6.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
12 changes: 9 additions & 3 deletions spring-boot-starter/autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-kucoin</artifactId>
<version>5.0.13</version>
<version>${xchange.version}</version>
<scope>test</scope>
</dependency>
<!-- For Coinbase integration tests -->
Expand All @@ -151,7 +151,7 @@
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-gemini</artifactId>
<version>5.0.13</version>
<version>${xchange.version}</version>
<scope>test</scope>
</dependency>
<!-- For Binance integration tests -->
Expand All @@ -161,6 +161,12 @@
<version>${xchange.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-stream-core</artifactId>
<version>${xchange.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<!-- =========================================================================================================== -->

Expand Down Expand Up @@ -369,7 +375,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
Loading

0 comments on commit b290ce5

Please sign in to comment.