Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rvullriede authored Apr 28, 2024
2 parents 8f450b4 + 0ed901f commit 6171eff
Show file tree
Hide file tree
Showing 328 changed files with 9,763 additions and 3,643 deletions.
15 changes: 0 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,3 @@ updates:
interval: daily
time: "12:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
versions:
- 2.12.1
- 2.12.2
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-csv
versions:
- 2.12.1
- 2.12.2
- dependency-name: io.netty:netty-all
versions:
- 4.1.61.Final
- dependency-name: com.pubnub:pubnub-gson
versions:
- 4.35.0
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ bin/
log/
classes/

# maven wrapper
.mvn
mvnw
mvnw.cmd


# Misc.
.DS_Store
*.swp
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright 2015-2023 Knowm Inc. (http://knowm.org) and contributors.
Copyright 2015-2024 Knowm Inc. (http://knowm.org) and contributors.
Copyright 2012-2015 Xeiam LLC (http://xeiam.com) and contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
28 changes: 20 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<version.java>1.8</version.java>
<version.assertj>3.24.2</version.assertj>
<version.assertj>3.25.3</version.assertj>
<version.commons.lang3>3.14.0</version.commons.lang3>
<version.fasterxml>2.14.3</version.fasterxml>
<version.github.mmazi>3.0</version.github.mmazi>
<version.resilience4j>1.7.0</version.resilience4j>
<version.junit>5.9.3</version.junit>
<version.lombok>1.18.26</version.lombok>
<version.resilience4j>1.7.1</version.resilience4j>
<version.junit>5.10.2</version.junit>
<version.lombok>1.18.32</version.lombok>
<version.knowm.xchart>3.8.6</version.knowm.xchart>
<version.qos.logback>1.4.12</version.qos.logback>
<version.reflections>0.10.2</version.reflections>
<version.slf4j>2.0.6</version.slf4j>
<version.slf4j>2.0.13</version.slf4j>
<version.crypto>5.0.0</version.crypto>
<version.java-jwt>4.4.0</version.java-jwt>
<version.wiremock>3.2.0</version.wiremock>
Expand Down Expand Up @@ -91,7 +91,6 @@
</scm>

<modules>
<module>xchange-bankera</module>
<module>xchange-bibox</module>
<module>xchange-binance</module>
<module>xchange-bitbay</module>
Expand Down Expand Up @@ -142,6 +141,7 @@
<module>xchange-examples</module>
<module>xchange-ftx</module>
<module>xchange-gateio</module>
<module>xchange-gateio-v4</module>
<module>xchange-globitex</module>
<module>xchange-gemini</module>
<module>xchange-hitbtc</module>
Expand Down Expand Up @@ -181,13 +181,13 @@
<module>xchange-enigma</module>


<module>xchange-stream-bankera</module>
<module>xchange-stream-binance</module>
<module>xchange-stream-bitfinex</module>
<module>xchange-stream-bitflyer</module>
<module>xchange-stream-bitmex</module>
<module>xchange-stream-bitstamp</module>
<module>xchange-stream-btcmarkets</module>
<module>xchange-stream-bybit</module>
<module>xchange-stream-cexio</module>
<module>xchange-stream-coinbasepro</module>
<module>xchange-stream-coinjar</module>
Expand Down Expand Up @@ -229,6 +229,11 @@
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>

<dependencyManagement>
Expand Down Expand Up @@ -327,6 +332,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>

<!-- SLF4J implementation for use in examples -->
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -425,7 +437,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.3</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
8 changes: 0 additions & 8 deletions xchange-bankera/api-specification.txt

This file was deleted.

35 changes: 0 additions & 35 deletions xchange-bankera/pom.xml

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6171eff

Please sign in to comment.