Skip to content

Commit 93f9355

Browse files
straumatstraumat
committed
Merge branch 'release/5.0.5'
2 parents 104eca3 + f1fcc80 commit 93f9355

File tree

31 files changed

+360
-229
lines changed

31 files changed

+360
-229
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@ 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
3012

3113
- package-ecosystem: "npm"
3214
directory: "/docs"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches-ignore:
66
- development
77
- master
8+
pull_request:
89

910
jobs:
1011
build:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,16 @@ jobs:
109109
-DartifactId=archetype-test-api-graphql \
110110
-Dversion=1.0-SNAPSHOT \
111111
-Dpackage=com.example
112+
sed 's/<dependencies>/<dependencies>\r\n<!--Postgresql driver -->\r\n<dependency>\r\n<groupId>org.postgresql<\/groupId>\r\n<artifactId>postgresql<\/artifactId>\r\n<version>42.2.24<\/version>\r\n<\/dependency>\r\n<!-- Postgresql driver -->/g' archetype-test-api-graphql/pom.xml > archetype-test-api-graphql.xml
113+
cat archetype-test-api-graphql.xml > archetype-test-api-graphql/pom.xml
112114
cp util/test/api/graphql/application.properties archetype-test-api-graphql/src/main/resources/
113115
cp util/test/api/graphql/user-trade.tsv archetype-test-api-graphql/src/main/resources/
114116
mvn -f archetype-test-api-graphql/pom.xml spring-boot:run &
115117
116118
- name: Runs graphQL tests.
117119
run: |
120+
sleep 30
118121
cp util/test/api/graphql/package.json .
119122
cp util/test/api/graphql/*.js .
120123
npm install --save-dev jest isomorphic-fetch
121-
sleep 30
122124
npm run test

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ jobs:
4848
mvn deploy -DskipTests=true -B -Dgpg.passphrase=${GPG_PASSPHRASE}
4949
echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
5050
51-
# ================================================================================================================
52-
- name: Build Changelog
53-
id: build_changelog
54-
uses: heinrichreimer/github-changelog-generator-action@v2.2
55-
with:
56-
token: ${{ secrets.GITHUB_TOKEN }}
57-
5851
# ================================================================================================================
5952
- name: Create the release
6053
uses: actions/create-release@v1
@@ -63,7 +56,7 @@ jobs:
6356
with:
6457
tag_name: ${{ steps.package.outputs.version }}
6558
release_name: ${{ steps.package.outputs.version }}
66-
body: ${{ steps.build_changelog.outputs.changelog }}
59+
body: ${{ steps.package.outputs.version }}
6760
draft: false
6861
prerelease: false
6962

‎docs/src/learn/graphql-api.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# GraphQL API
22

3-
::: warning
4-
Available in 5.0.4 release.
5-
:::
6-
73
## Overview
84
Cassandre GraphQL API allows you to ONLY query your data (balances, strategies, orders, trades and positions).
95

‎docs/src/learn/import-historical-data.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# Import historical data
22

3-
::: warning
4-
Available in 5.0.4 release.
5-
:::
6-
73
## Overview
84
This feature allows you to import historical data (tickers you selected) in Cassandre database, so you can initialise your strategy.
95

‎pom.xml‎

Lines changed: 45 additions & 4 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>5.0.4</version>
11+
<version>5.0.5</version>
1212
<packaging>pom</packaging>
1313
<name>Cassandre trading bot</name>
1414
<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>
@@ -55,21 +55,62 @@
5555
<parent>
5656
<groupId>org.springframework.boot</groupId>
5757
<artifactId>spring-boot-starter-parent</artifactId>
58-
<version>2.5.4</version>
58+
<version>2.5.5</version>
5959
<relativePath/>
6060
</parent>
6161
<!-- =========================================================================================================== -->
6262

6363
<!-- =========================================================================================================== -->
6464
<!-- Project configuration -->
6565
<properties>
66+
<!-- Java build configuration -->
67+
<java.version>11</java.version>
6668
<maven.compiler.target>11</maven.compiler.target>
6769
<maven.compiler.source>11</maven.compiler.source>
68-
<java.version>11</java.version>
6970
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7071
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
71-
<!-- XChange release -->
72+
73+
<!-- Libraries releases -->
74+
75+
<!-- Core -->
76+
<spring.version>2.5.5</spring.version>
77+
<reactor.version>Dysprosium-SR24</reactor.version>
7278
<xchange.version>5.0.11</xchange.version>
79+
<bucket4j.version>6.3.0</bucket4j.version>
80+
<liquibase.version>4.5.0</liquibase.version>
81+
<opencsv.version>5.5.2</opencsv.version>
82+
83+
<!-- Core utils -->
84+
<lombok.version>1.18.22</lombok.version>
85+
<lombok.mapstruct.version>0.2.0</lombok.mapstruct.version>
86+
<mapstruct.version>1.4.2.Final</mapstruct.version>
87+
<guava.version>31.0.1-jre</guava.version>
88+
89+
<!-- Other -->
90+
<ta4j.version>0.14</ta4j.version>
91+
92+
<!-- Tests -->
93+
<junit-pioneer.version>1.4.2</junit-pioneer.version>
94+
<awaitility.version>4.1.0</awaitility.version>
95+
<hsqldb.version>2.6.0</hsqldb.version>
96+
<jackson.version>2.12.5</jackson.version>
97+
98+
<!-- GraphQL API -->
99+
<graphql-dgs.version>4.9.1</graphql-dgs.version>
100+
101+
<!-- Maven -->
102+
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
103+
<puppycrawl.checkstyle.version>9.0.1</puppycrawl.checkstyle.version>
104+
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
105+
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
106+
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
107+
<maven.jacoco.plugin.version>0.8.7</maven.jacoco.plugin.version>
108+
<maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
109+
<maven.lombok.plugin.version>1.18.20.0</maven.lombok.plugin.version>
110+
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
111+
<maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
112+
<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
113+
<maven.archetype-packaging.version>3.2.0</maven.archetype-packaging.version>
73114
</properties>
74115
<!-- =========================================================================================================== -->
75116

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.projectlombok</groupId>
3737
<artifactId>lombok</artifactId>
38-
<version>1.18.20</version>
38+
<version>${lombok.version}</version>
3939
<scope>provided</scope>
4040
</dependency>
4141

@@ -51,6 +51,7 @@
5151
<dependency>
5252
<groupId>org.springframework.boot</groupId>
5353
<artifactId>spring-boot-starter-test</artifactId>
54+
<scope>test</scope>
5455
<exclusions>
5556
<exclusion>
5657
<groupId>org.junit.vintage</groupId>
@@ -61,17 +62,19 @@
6162
<dependency>
6263
<groupId>org.awaitility</groupId>
6364
<artifactId>awaitility</artifactId>
64-
<version>4.0.3</version>
65+
<version>${awaitility.version}</version>
66+
<scope>test</scope>
6567
</dependency>
6668
<dependency>
6769
<groupId>org.junit-pioneer</groupId>
6870
<artifactId>junit-pioneer</artifactId>
69-
<version>1.3.8</version>
71+
<version>${junit-pioneer.version}</version>
72+
<scope>test</scope>
7073
</dependency>
7174
<dependency>
7275
<groupId>org.hsqldb</groupId>
7376
<artifactId>hsqldb</artifactId>
74-
<version>2.6.0</version>
77+
<version>${hsqldb.version}</version>
7578
<scope>test</scope>
7679
</dependency>
7780
<!-- Used for tests -->
@@ -93,12 +96,12 @@
9396
<plugin>
9497
<groupId>org.apache.maven.plugins</groupId>
9598
<artifactId>maven-checkstyle-plugin</artifactId>
96-
<version>3.1.2</version>
99+
<version>${maven.checkstyle.plugin.version}</version>
97100
<dependencies>
98101
<dependency>
99102
<groupId>com.puppycrawl.tools</groupId>
100103
<artifactId>checkstyle</artifactId>
101-
<version>8.41.1</version>
104+
<version>${puppycrawl.checkstyle.version}</version>
102105
</dependency>
103106
</dependencies>
104107
<executions>
@@ -121,7 +124,7 @@
121124
<plugin>
122125
<groupId>org.apache.maven.plugins</groupId>
123126
<artifactId>maven-compiler-plugin</artifactId>
124-
<version>3.8.1</version>
127+
<version>${maven.compiler.plugin.version}</version>
125128
<configuration>
126129
<compilerArgument>-Xlint:unchecked</compilerArgument>
127130
<source>${java.version}</source>
@@ -130,22 +133,22 @@
130133
<path>
131134
<groupId>org.mapstruct</groupId>
132135
<artifactId>mapstruct-processor</artifactId>
133-
<version>1.4.1.Final</version>
136+
<version>${mapstruct.version}</version>
134137
</path>
135138
<path>
136139
<groupId>org.projectlombok</groupId>
137140
<artifactId>lombok</artifactId>
138-
<version>1.18.16</version>
141+
<version>${lombok.version}</version>
139142
</path>
140143
<path>
141144
<groupId>org.projectlombok</groupId>
142145
<artifactId>lombok-mapstruct-binding</artifactId>
143-
<version>0.2.0</version>
146+
<version>${lombok.mapstruct.version}</version>
144147
</path>
145148
<path>
146149
<groupId>org.springframework.boot</groupId>
147150
<artifactId>spring-boot-configuration-processor</artifactId>
148-
<version>2.4.1</version>
151+
<version>${spring.version}</version>
149152
</path>
150153
</annotationProcessorPaths>
151154
</configuration>
@@ -154,7 +157,7 @@
154157
<plugin>
155158
<groupId>org.apache.maven.plugins</groupId>
156159
<artifactId>maven-jar-plugin</artifactId>
157-
<version>3.2.0</version>
160+
<version>${maven.jar.plugin.version}</version>
158161
<configuration>
159162
<archive>
160163
<manifestEntries>
@@ -166,7 +169,7 @@
166169
<plugin>
167170
<groupId>org.apache.maven.plugins</groupId>
168171
<artifactId>maven-source-plugin</artifactId>
169-
<version>3.2.1</version>
172+
<version>${maven.source.plugin.version}</version>
170173
<executions>
171174
<execution>
172175
<id>attach-sources</id>
@@ -179,7 +182,7 @@
179182
<plugin>
180183
<groupId>org.apache.maven.plugins</groupId>
181184
<artifactId>maven-javadoc-plugin</artifactId>
182-
<version>3.2.0</version>
185+
<version>${maven.javadoc.plugin.version}</version>
183186
<configuration>
184187
<detectOfflineLinks>false</detectOfflineLinks>
185188
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
@@ -203,7 +206,7 @@
203206
<dependency>
204207
<groupId>com.netflix.graphql.dgs</groupId>
205208
<artifactId>graphql-dgs-platform-dependencies</artifactId>
206-
<version>4.8.0</version>
209+
<version>${graphql-dgs.version}</version>
207210
<type>pom</type>
208211
<scope>import</scope>
209212
</dependency>
@@ -216,7 +219,7 @@
216219
<parent>
217220
<groupId>tech.cassandre.trading.bot</groupId>
218221
<artifactId>cassandre-trading-bot-project</artifactId>
219-
<version>5.0.4</version>
222+
<version>5.0.5</version>
220223
<relativePath>../../../pom.xml</relativePath>
221224
</parent>
222225
<!-- =========================================================================================================== -->

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/configuration.graphqls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"Server configuration"
1+
"Server configuration."
22
type Configuration {
33
"API Version."
44
apiVersion: String!

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/currency.graphqls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"A trade is the action of buying and selling goods and services."
1+
"Currency."
22
type Currency {
33
"Code."
44
code: ID!

0 commit comments

Comments
 (0)