Skip to content

Commit

Permalink
Dependency updates + version bump for next release
Browse files Browse the repository at this point in the history
  • Loading branch information
gazbert committed May 19, 2018
1 parent 30531b4 commit 4f2915d
Show file tree
Hide file tree
Showing 20 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ and evaluate the bot, Docker is the way to go.
1. Install [Docker](https://docs.docker.com/engine/installation/) on the machine you want to run the bot.
1. Fetch the BX-bot image from [Docker Hub](https://hub.docker.com/r/gazbert/bxbot/): `docker pull gazbert/bxbot:x.x.x` -
replace `x.x.x` with the [Release](https://github.com/gazbert/bxbot/releases) version of the bot you want to run, e.g.
`docker pull gazbert/bxbot:0.8.7`
`docker pull gazbert/bxbot:0.8.8`
1. Run the Docker container: `docker container run --name bxbot-x.x.x -it gazbert/bxbot:x.x.x bash`
1. Change into the bot's directory: `cd bxbot*`
1. Configure the bot as required - see the main _[Configuration](#configuration-2)_ section. The bot's default
Expand Down
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ buildscript {
}

dependencies {
classpath("io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE")
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE")
classpath("io.spring.gradle:dependency-management-plugin:1.0.5.RELEASE")
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.13.RELEASE")
}
}

plugins {
id 'com.gradle.build-scan' version '1.12.1'
id 'com.gradle.build-scan' version '1.13.1'
}

buildScan {
Expand All @@ -20,8 +20,8 @@ buildScan {
}

ext.versions = [
springBootVersion:'1.5.10.RELEASE',
springTxVersion:'4.3.14.RELEASE'
springBootVersion:'1.5.13.RELEASE',
springTxVersion:'4.3.17.RELEASE'
]

ext.libraries = [
Expand All @@ -43,20 +43,20 @@ ext.libraries = [
force = true
},
spring_tx: dependencies.create("org.springframework:spring-tx:" + ext.versions.springTxVersion),
google_guava: dependencies.create("com.google.guava:guava:24.1-jre"),
google_gson: dependencies.create("com.google.code.gson:gson:2.8.2"),
google_guava: dependencies.create("com.google.guava:guava:25.0-jre"),
google_gson: dependencies.create("com.google.code.gson:gson:2.8.4"),
javax_mail_api: dependencies.create("javax.mail:javax.mail-api:1.6.1"),
javax_mail_sun: dependencies.create("com.sun.mail:javax.mail:1.6.1"),

junit: dependencies.create("junit:junit:4.12"),
powermock_junit: dependencies.create("org.powermock:powermock-module-junit4:1.7.3"),
powermock_api_easymock: dependencies.create("org.powermock:powermock-api-easymock:1.7.3"),
powermock_junit: dependencies.create("org.powermock:powermock-module-junit4:1.7.4"),
powermock_api_easymock: dependencies.create("org.powermock:powermock-api-easymock:1.7.4"),
easymock: dependencies.create("org.easymock:easymock:3.5.1") {
exclude module: "cglib-nodep"
force = true
},
objenesis: dependencies.create("org.objenesis:objenesis:2.6"),
cglib_nodep: dependencies.create("cglib:cglib-nodep:3.2.5"),
cglib_nodep: dependencies.create("cglib:cglib-nodep:3.2.6"),
spring_boot_starter_test: dependencies.create("org.springframework.boot:spring-boot-starter-test:" + ext.versions.springBootVersion)
]

Expand All @@ -66,7 +66,7 @@ allprojects {
apply plugin: 'maven'

group = 'com.gazbert.bxbot'
version = '0.8.8-SNAPSHOT'
version = '0.8.8'
}

subprojects {
Expand Down Expand Up @@ -196,6 +196,6 @@ task buildTarGzipDist(type: Tar, dependsOn: build) {
}

task wrapper(type: Wrapper) {
gradleVersion = '4.6'
gradleVersion = '4.7'
}
}
2 changes: 1 addition & 1 deletion bxbot-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<properties>
<start-class>com.gazbert.bxbot.BXBot</start-class>
Expand Down
2 changes: 1 addition & 1 deletion bxbot-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-core/src/main/resources/banner.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ $$ | $$ |$$ /\$$\ $$ | $$ |$$ | $$ | $$ |$$\
$$$$$$$ |$$ / $$ | $$$$$$$ |\$$$$$$ | \$$$$ |
\_______/ \__| \__| \_______/ \______/ \____/

:: Spring Boot :: (v1.5.10.RELEASE)
:: Spring Boot :: (v1.5.13.RELEASE)
2 changes: 1 addition & 1 deletion bxbot-domain-objects/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>

Expand Down
2 changes: 1 addition & 1 deletion bxbot-exchange-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-exchanges/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<profiles>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion bxbot-repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-rest-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-rest-api/src/main/resources/banner.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ $$ | $$ |$$ /\$$\ $$ | $$ |$$ | $$ | $$ |$$\
$$$$$$$ |$$ / $$ | $$$$$$$ |\$$$$$$ | \$$$$ |
\_______/ \__| \__| \_______/ \______/ \____/

:: Spring Boot :: (v1.5.10.RELEASE)
:: Spring Boot :: (v1.5.13.RELEASE)
2 changes: 1 addition & 1 deletion bxbot-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-strategies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-strategy-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-trading-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>
<!--
Expand Down
2 changes: 1 addition & 1 deletion bxbot-xml-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
</parent>
<dependencies>

Expand Down
2 changes: 1 addition & 1 deletion bxbot.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ REM log4j2 config file location
SET log4j2_config=.\config\log4j2.xml

REM The BX-bot 'fat' jar (Spring Boot app containing all the dependencies)
SET bxbot_jar=bxbot-app-0.8.8-SNAPSHOT.jar
SET bxbot_jar=bxbot-app-0.8.8.jar

REM PID file for checking if bot is running
SET pid_file=.\.bxbot.pid
Expand Down
2 changes: 1 addition & 1 deletion bxbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lib_dir=./libs
log4j2_config=./config/log4j2.xml

# The BX-bot 'fat' jar (Spring Boot app containing all the dependencies)
bxbot_jar=bxbot-app-0.8.8-SNAPSHOT.jar
bxbot_jar=bxbot-app-0.8.8.jar

# PID file for checking if bot is running
pid_file=./.bxbot.pid
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
24 changes: 12 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.gazbert.bxbot</groupId>
<artifactId>bxbot-parent</artifactId>
<packaging>pom</packaging>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.8</version>
<name>BX-bot Parent</name>
<description>Parent POM for building the bot</description>
<url>https://github.com/gazbert/bxbot</url>
Expand Down Expand Up @@ -45,14 +45,14 @@
</prerequisites>
<properties>
<!-- spring-tx should be same version as Spring Boot's spring-core version -->
<spring-tx.version>4.3.14.RELEASE</spring-tx.version>
<powermock.version>1.7.3</powermock.version>
<spring-boot-starter.version>1.5.10.RELEASE</spring-boot-starter.version>
<spring-tx.version>4.3.17.RELEASE</spring-tx.version>
<powermock.version>1.7.4</powermock.version>
<spring-boot-starter.version>1.5.13.RELEASE</spring-boot-starter.version>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.RELEASE</version>
<version>1.5.13.RELEASE</version>
</parent>
<profiles>
<profile>
Expand Down Expand Up @@ -167,13 +167,13 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
<version>2.8.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>24.1-jre</version>
<version>25.0-jre</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Expand Down Expand Up @@ -212,7 +212,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.5.1</version>
<version>3.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -230,7 +230,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>3.2.5</version>
<version>3.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -248,7 +248,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<version>2.21.0</version>
<configuration>
<skipTests>${skip.unit.tests}</skipTests>
<excludes>
Expand All @@ -262,7 +262,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20.1</version>
<version>2.21.0</version>
<configuration>
<skipTests>${skip.integration.tests}</skipTests>
</configuration>
Expand All @@ -276,7 +276,7 @@
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
Expand Down

0 comments on commit 4f2915d

Please sign in to comment.