Merge branch 'release/5.0.5'

cassandre-tech · Oct 16, 2021 · 93f9355 · 93f9355
2 parents 104eca3 + f1fcc80
commit 93f9355
Show file tree

Hide file tree

Showing 31 changed files with 360 additions and 229 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,24 +9,6 @@ updates:
       timezone: Europe/Paris
     open-pull-requests-limit: 10
     target-branch: development
-  - package-ecosystem: maven
-    directory: "trading-bot-archetypes/basic-archetype/src/main/resources/archetype-resources"
-    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "18:00"
-      timezone: Europe/Paris
-    open-pull-requests-limit: 10
-    target-branch: development
-  - package-ecosystem: maven
-    directory: "trading-bot-archetypes/basic-ta4j-archetype/src/main/resources/archetype-resources"
-    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "18:00"
-      timezone: Europe/Paris
-    open-pull-requests-limit: 10
-    target-branch: development
 
   - package-ecosystem: "npm"
     directory: "/docs"

diff --git a/.github/workflows/branch-push.yml b/.github/workflows/branch-push.yml
@@ -5,6 +5,7 @@ on:
     branches-ignore:
       - development
       - master
+  pull_request:
 
 jobs:
   build:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -109,14 +109,16 @@ jobs:
             -DartifactId=archetype-test-api-graphql \
             -Dversion=1.0-SNAPSHOT \
             -Dpackage=com.example
+          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
+          cat archetype-test-api-graphql.xml > archetype-test-api-graphql/pom.xml
           cp util/test/api/graphql/application.properties archetype-test-api-graphql/src/main/resources/
           cp util/test/api/graphql/user-trade.tsv archetype-test-api-graphql/src/main/resources/
           mvn -f archetype-test-api-graphql/pom.xml spring-boot:run &
 
       - name: Runs graphQL tests.
         run: |
+          sleep 30
           cp util/test/api/graphql/package.json .
           cp util/test/api/graphql/*.js .
           npm install --save-dev jest isomorphic-fetch
-          sleep 30
           npm run test
diff --git a/.github/workflows/release-creation.yml b/.github/workflows/release-creation.yml
@@ -48,13 +48,6 @@ jobs:
           mvn deploy -DskipTests=true -B -Dgpg.passphrase=${GPG_PASSPHRASE}
           echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
 
-      # ================================================================================================================
-      - name: Build Changelog
-        id: build_changelog
-        uses: heinrichreimer/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
       # ================================================================================================================
       - name: Create the release
         uses: actions/create-release@v1
@@ -63,7 +56,7 @@ jobs:
         with:
           tag_name: ${{ steps.package.outputs.version }}
           release_name: ${{ steps.package.outputs.version }}
-          body: ${{ steps.build_changelog.outputs.changelog }}
+          body: ${{ steps.package.outputs.version }}
           draft: false
           prerelease: false
 

diff --git a/docs/src/learn/graphql-api.md b/docs/src/learn/graphql-api.md
@@ -1,9 +1,5 @@
 # GraphQL API
 
-::: warning
-Available in 5.0.4 release.
-:::
-
 ## Overview
 Cassandre GraphQL API allows you to ONLY query your data (balances, strategies, orders, trades and positions).
 

diff --git a/docs/src/learn/import-historical-data.md b/docs/src/learn/import-historical-data.md
@@ -1,9 +1,5 @@
 # Import historical data
 
-::: warning
-Available in 5.0.4 release.
-:::
-
 ## Overview
 This feature allows you to import historical data (tickers you selected) in Cassandre database, so you can initialise your strategy.
 

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	<!-- Project information -->
 	<groupId>tech.cassandre.trading.bot</groupId>
 	<artifactId>cassandre-trading-bot-project</artifactId>
-	<version>5.0.4</version>
+	<version>5.0.5</version>
 	<packaging>pom</packaging>
 	<name>Cassandre trading bot</name>
 	<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>
@@ -55,21 +55,62 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.4</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 	<!-- =========================================================================================================== -->
 
 	<!-- =========================================================================================================== -->
 	<!-- Project configuration -->
 	<properties>
+		<!-- Java build configuration -->
+		<java.version>11</java.version>
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.source>11</maven.compiler.source>
-		<java.version>11</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<!-- XChange release -->
+
+		<!-- Libraries releases -->
+
+		<!-- Core -->
+		<spring.version>2.5.5</spring.version>
+		<reactor.version>Dysprosium-SR24</reactor.version>
 		<xchange.version>5.0.11</xchange.version>
+		<bucket4j.version>6.3.0</bucket4j.version>
+		<liquibase.version>4.5.0</liquibase.version>
+		<opencsv.version>5.5.2</opencsv.version>
+
+		<!-- Core utils -->
+		<lombok.version>1.18.22</lombok.version>
+		<lombok.mapstruct.version>0.2.0</lombok.mapstruct.version>
+		<mapstruct.version>1.4.2.Final</mapstruct.version>
+		<guava.version>31.0.1-jre</guava.version>
+
+		<!-- Other -->
+		<ta4j.version>0.14</ta4j.version>
+
+		<!-- Tests -->
+		<junit-pioneer.version>1.4.2</junit-pioneer.version>
+		<awaitility.version>4.1.0</awaitility.version>
+		<hsqldb.version>2.6.0</hsqldb.version>
+		<jackson.version>2.12.5</jackson.version>
+
+		<!-- GraphQL API -->
+		<graphql-dgs.version>4.9.1</graphql-dgs.version>
+
+		<!-- Maven -->
+		<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
+		<puppycrawl.checkstyle.version>9.0.1</puppycrawl.checkstyle.version>
+		<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
+		<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+		<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
+		<maven.jacoco.plugin.version>0.8.7</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.3.1</maven.javadoc.plugin.version>
+		<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
+		<maven.archetype-packaging.version>3.2.0</maven.archetype-packaging.version>
 	</properties>
 	<!-- =========================================================================================================== -->
 

diff --git a/spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/pom.xml b/spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.junit.vintage</groupId>
@@ -61,17 +62,19 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>4.0.3</version>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit-pioneer</groupId>
             <artifactId>junit-pioneer</artifactId>
-            <version>1.3.8</version>
+            <version>${junit-pioneer.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.6.0</version>
+            <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Used for tests -->
@@ -93,12 +96,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>${maven.checkstyle.plugin.version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.41.1</version>
+                        <version>${puppycrawl.checkstyle.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -121,7 +124,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>${maven.compiler.plugin.version}</version>
                 <configuration>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
                     <source>${java.version}</source>
@@ -130,22 +133,22 @@
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
-                            <version>1.4.1.Final</version>
+                            <version>${mapstruct.version}</version>
                         </path>
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.16</version>
+                            <version>${lombok.version}</version>
                         </path>
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>0.2.0</version>
+                            <version>${lombok.mapstruct.version}</version>
                         </path>
                         <path>
                             <groupId>org.springframework.boot</groupId>
                             <artifactId>spring-boot-configuration-processor</artifactId>
-                            <version>2.4.1</version>
+                            <version>${spring.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -154,7 +157,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>${maven.jar.plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -166,7 +169,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>${maven.source.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -179,7 +182,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>${maven.javadoc.plugin.version}</version>
                 <configuration>
                     <detectOfflineLinks>false</detectOfflineLinks>
                     <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
@@ -203,7 +206,7 @@
             <dependency>
                 <groupId>com.netflix.graphql.dgs</groupId>
                 <artifactId>graphql-dgs-platform-dependencies</artifactId>
-                <version>4.8.0</version>
+                <version>${graphql-dgs.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -216,7 +219,7 @@
     <parent>
         <groupId>tech.cassandre.trading.bot</groupId>
         <artifactId>cassandre-trading-bot-project</artifactId>
-        <version>5.0.4</version>
+        <version>5.0.5</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <!-- =========================================================================================================== -->

diff --git a/...g-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/configuration.graphqls b/...g-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/configuration.graphqls
@@ -1,4 +1,4 @@
-"Server configuration"
+"Server configuration."
 type Configuration {
     "API Version."
     apiVersion: String!

diff --git a/...spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/currency.graphqls b/...spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/currency.graphqls
@@ -1,4 +1,4 @@
-"A trade is the action of buying and selling goods and services."
+"Currency."
 type Currency {
     "Code."
     code: ID!

diff --git a/...api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/gain.graphqls b/...api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/gain.graphqls
@@ -1,4 +1,4 @@
-"Gain"
+"Gain."
 type Gain {
     "Gain made (percentage)."
     percentage: Float

diff --git a/...pi/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/order.graphqls b/...pi/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/order.graphqls
@@ -22,7 +22,7 @@ type Order {
     leverage: String
     "Order status."
     status: String
-    " Amount to be ordered / amount that has been matched against order on the order book/filled."
+    "Amount to be ordered / amount that has been matched against order on the order book/filled."
     cumulativeAmount: CurrencyAmount
     "An identifier provided by the user on placement that uniquely identifies the order."
     userReference: String

diff --git a/...spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/strategy.graphqls b/...spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/strategy.graphqls
@@ -1,10 +1,10 @@
-"Strategies"
+"Strategies."
 type Strategy {
     "Technical ID."
     id: Int!
     "An identifier that uniquely identifies the strategy - Comes from the Java annotation."
     strategyId: String!
-    "Strategy type - Basic or Ta4j"
+    "Strategy type - Basic or Ta4j."
     type: StrategyType!
     "Strategy name - Comes from the Java annotation."
     name: String

diff --git a/...pi/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/trade.graphqls b/...pi/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/trade.graphqls
@@ -1,4 +1,4 @@
-"A trade is the action of buying and selling goods and services."
+"A trade is the action of buying and selling (linked to an order)."
 type Trade {
     "Technical ID."
     id: Int!
@@ -14,7 +14,7 @@ type Trade {
     currencyPair: CurrencyPair!
     "Amount to be ordered / amount that was ordered."
     amount: CurrencyAmount!
-    "The price"
+    "The price."
     price: CurrencyAmount
     "The fee that was charged by the exchange for this trade."
     fee: CurrencyAmount