Skip to content

Commit 665418e

Browse files
straumatstraumat
committed
Merge branch 'release/2.3.0'
2 parents 6383aa8 + 90fe805 commit 665418e

File tree

70 files changed

+872
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+872
-231
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535

3636
- name: Build, run tests, package and deploy to Maven central
3737
env: # Environment variables.
38-
# Maven options.
39-
MAVEN_OPTS: -Xmx1024m -XX:MaxPermSize=128m
4038
# Kucoin credentials.
4139
KUCOIN_NAME: ${{ secrets.KUCOIN_NAME }}
4240
KUCOIN_USERNAME: ${{ secrets.KUCOIN_USERNAME }}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
# ================================================================================================================
3737
- name: Build, run tests, package and deploy to Maven central
3838
env: # Environment variables.
39-
# Maven options.
40-
MAVEN_OPTS: -Xmx1024m -XX:MaxPermSize=128m
4139
# Ossrh credentials.
4240
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4341
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -56,11 +54,11 @@ jobs:
5654
# ================================================================================================================
5755
- name : Test Cassandre trading bot maven archetype - basic strategy
5856
run: |
59-
mvn -B archetype:generate -DarchetypeGroupId=tech.cassandre.trading.bot -DarchetypeArtifactId=cassandre-trading-bot-spring-boot-starter-basic-archetype -DarchetypeVersion=${{ steps.package.outputs.version }} -DgroupId=tech.cassandre -DartifactId=archetype-test-basic -Dversion=1.0-SNAPSHOT -Dpackage=tech.cassandre
57+
mvn -B archetype:generate -DarchetypeGroupId=tech.cassandre.trading.bot -DarchetypeArtifactId=cassandre-trading-bot-spring-boot-starter-basic-archetype -DarchetypeVersion=${{ steps.package.outputs.version }} -DgroupId=com.example -DartifactId=archetype-test-basic -Dversion=1.0-SNAPSHOT -Dpackage=com.example
6058
mvn -f archetype-test-basic/pom.xml test
6159
6260
# ================================================================================================================
6361
- name : Test Cassandre trading bot maven archetype - basic ta4j strategy
6462
run: |
65-
mvn -B archetype:generate -DarchetypeGroupId=tech.cassandre.trading.bot -DarchetypeArtifactId=cassandre-trading-bot-spring-boot-starter-basic-ta4j-archetype -DarchetypeVersion=${{ steps.package.outputs.version }} -DgroupId=tech.cassandre -DartifactId=archetype-test-ta4j-basic -Dversion=1.0-SNAPSHOT -Dpackage=tech.cassandre
63+
mvn -B archetype:generate -DarchetypeGroupId=tech.cassandre.trading.bot -DarchetypeArtifactId=cassandre-trading-bot-spring-boot-starter-basic-ta4j-archetype -DarchetypeVersion=${{ steps.package.outputs.version }} -DgroupId=com.example -DartifactId=archetype-test-ta4j-basic -Dversion=1.0-SNAPSHOT -Dpackage=com.example
6664
mvn -f archetype-test-ta4j-basic/pom.xml test

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
# ================================================================================================================
2525
- name: Build, run tests, package and deploy to Maven central
2626
env: # Environment variables.
27-
# Maven options.
28-
MAVEN_OPTS: -Xmx1024m -XX:MaxPermSize=128m
2927
# Kucoin credentials.
3028
KUCOIN_NAME: ${{ secrets.KUCOIN_NAME }}
3129
KUCOIN_USERNAME: ${{ secrets.KUCOIN_USERNAME }}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ jobs:
3737
- name: Build, run tests, package
3838
id: package
3939
env: # Environment variables.
40-
# Maven options.
41-
MAVEN_OPTS: -Xmx1024m -XX:MaxPermSize=128m
4240
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4341
# Ossrh credentials.
4442
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ hs_err_pid*
5050
# Maven
5151
log/
5252
.notes
53-
.mvn
5453
*.iml
5554

5655
# Node

‎.mvn/jvm.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Xmx2048m -Xms1024m -Djava.awt.headless=true

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
src="https://github.com/cassandre-tech/cassandre-trading-bot/workflows/Continuous%20integration/badge.svg"
1414
alt="GitHub Actions" />
1515
</a>
16+
</p>
17+
18+
<p align="center">
1619
<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">
1720
<img
1821
src="https://api.codacy.com/project/badge/Grade/f26dc41008a64bb18dcd404b46b69fc8"

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
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>2.2.0</version>
11+
<version>2.3.0</version>
1212
<packaging>pom</packaging>
1313
<name>Cassandre trading bot</name>
1414
<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>

‎spring-boot-starter-test/autoconfigure/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- =========================================================================================================== -->
77
<!-- Project information -->
88
<artifactId>cassandre-trading-bot-spring-boot-starter-test-autoconfigure</artifactId>
9-
<name>Trading bot spring boot starter test autoconfigure</name>
9+
<name>Trading bot spring boot autoconfigure test</name>
1010
<!-- =========================================================================================================== -->
1111

1212
<!-- =========================================================================================================== -->
@@ -47,6 +47,12 @@
4747
<artifactId>junit-pioneer</artifactId>
4848
<version>1.0.0</version>
4949
</dependency>
50+
<dependency>
51+
<groupId>org.hsqldb</groupId>
52+
<artifactId>hsqldb</artifactId>
53+
<version>2.5.1</version>
54+
<scope>test</scope>
55+
</dependency>
5056
</dependencies>
5157
<!-- =========================================================================================================== -->
5258

@@ -134,7 +140,7 @@
134140
<parent>
135141
<groupId>tech.cassandre.trading.bot</groupId>
136142
<artifactId>cassandre-trading-bot-project</artifactId>
137-
<version>2.2.0</version>
143+
<version>2.3.0</version>
138144
<relativePath>../../pom.xml</relativePath>
139145
</parent>
140146
<!-- =========================================================================================================== -->

‎spring-boot-starter-test/autoconfigure/src/main/java/tech/cassandre/trading/bot/test/mock/TickerFluxMock.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
import org.mockito.stubbing.Answer;
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
7-
import org.springframework.boot.autoconfigure.domain.EntityScan;
87
import org.springframework.boot.test.context.TestConfiguration;
98
import org.springframework.context.annotation.Bean;
109
import org.springframework.context.annotation.Primary;
1110
import org.springframework.core.io.Resource;
1211
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
13-
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
1412
import tech.cassandre.trading.bot.batch.TickerFlux;
1513
import tech.cassandre.trading.bot.dto.market.TickerDTO;
16-
import tech.cassandre.trading.bot.service.MarketService;
1714
import tech.cassandre.trading.bot.dto.util.CurrencyDTO;
1815
import tech.cassandre.trading.bot.dto.util.CurrencyPairDTO;
16+
import tech.cassandre.trading.bot.service.MarketService;
1917

2018
import java.io.FileNotFoundException;
2119
import java.io.IOException;
@@ -50,8 +48,6 @@
5048
*/
5149
@SuppressWarnings("checkstyle:DesignForExtension")
5250
@TestConfiguration
53-
@EntityScan(basePackages = "tech.cassandre.trading.bot.domain")
54-
@EnableJpaRepositories(basePackages = "tech.cassandre.trading.bot.repository")
5551
public class TickerFluxMock {
5652

5753
/** Logger. */

0 commit comments

Comments
 (0)