Skip to content

Commit

Permalink
[Chore] Merge 2.5.1 to develop (#1225)
Browse files Browse the repository at this point in the history
### Description

This merges `main` into `develop`

### Context

Git flow

### Testing

- `./gradlew test`

### Documentation

N/A

### Known limitations

N/A
  • Loading branch information
philipliu authored Dec 5, 2023
2 parents 990b497 + bd10449 commit 93b43ff
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ subprojects {

allprojects {
group = "org.stellar.anchor-sdk"
version = "2.5.0"
version = "2.5.1"

tasks.jar {
manifest {
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE)
[![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases)
[![Docker](https://badgen.net/badge/Latest%20Release/v2.5.0/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.5.0)
[![Docker](https://badgen.net/badge/Latest%20Release/v2.5.1/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.5.1)
![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/wk_push_to_develop.yml/badge.svg?branch=develop)

<div style="text-align: center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.stellar.anchor.horizon.Horizon;
import org.stellar.anchor.platform.apiclient.CustodyApiClient;
import org.stellar.anchor.platform.condition.ConditionalOnAllSepsEnabled;
import org.stellar.anchor.platform.condition.ConditionalOnAnySepsEnabled;
import org.stellar.anchor.platform.config.*;
import org.stellar.anchor.platform.observer.stellar.PaymentObservingAccountsManager;
import org.stellar.anchor.platform.service.Sep31DepositInfoApiGenerator;
Expand Down Expand Up @@ -123,7 +124,7 @@ Sep1Service sep1Service(Sep1Config sep1Config) throws IOException, InvalidConfig
}

@Bean
@ConditionalOnAllSepsEnabled(seps = {"sep6", "sep24"})
@ConditionalOnAnySepsEnabled(seps = {"sep6", "sep24"})
ClientFinder clientFinder(Sep10Config sep10Config, ClientsConfig clientsConfig) {
return new ClientFinder(sep10Config, clientsConfig);
}
Expand Down

0 comments on commit 93b43ff

Please sign in to comment.