Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CHORE] Bump version 3.0.0 #1594

Merged
merged 15 commits into from
Dec 12, 2024
Merged

[CHORE] Bump version 3.0.0 #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f23549e
Bump version to 2.11.2
lijamie98 Nov 4, 2024
a551cea
Bump version to 2.11.2 (#1571)
lijamie98 Nov 5, 2024
dd1636a
Merge 2.11.2 to main (#1572)
lijamie98 Nov 5, 2024
24f2919
[ANCHOR-592] Add schema to database configuration
lijamie98 Dec 4, 2024
2bb6f0c
[ANCHOR-592] Merge release/2.12.0 to `main` (#1590)
lijamie98 Dec 4, 2024
9cd4d75
bump version 3.0.0
JiahuiWho Dec 11, 2024
ed290ba
Ignore transfer_received_at field in API tests
philipliu Dec 11, 2024
17114dc
Fix Github actions paths
philipliu Dec 11, 2024
91e9cfe
[ANCHOR-926] Ignore transfer_received_at field in API tests (#1596)
philipliu Dec 11, 2024
69c5242
Merge branch 'develop' into bump-version-3.0.0
JiahuiWho Dec 11, 2024
0bd8e0d
Merge branch 'main' into merge-main-to-develop-2.12
JiahuiWho Dec 12, 2024
735ab73
[CHORE] Merge main to develop 2.12 (#1597)
JiahuiWho Dec 12, 2024
1635308
Merge branch 'develop' into bump-version-3.0.0
JiahuiWho Dec 12, 2024
1e0eca9
[ANCHOR-431] Set callback-api-request.enabled default to false (#1593)
lijamie98 Dec 12, 2024
ead692a
Merge branch 'develop' into bump-version-3.0.0
JiahuiWho Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .github/workflows/sub_essential_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
#############################################
# Setup JDK 17
# Download, and Extract java-stellar-anchor-sdk.tar
# Download, and Extract anchor-platform.tar
JiahuiWho marked this conversation as resolved.
Show resolved Hide resolved
# Setup hostnames (/etc/hosts)
#############################################
- name: Set up JDK 17
Expand All @@ -20,17 +20,17 @@ jobs:
java-version: '17'
distribution: 'adopt'

- name: Download java-stellar-anchor-sdk.tar
- name: Download anchor-platform.tar
uses: actions/download-artifact@v3
with:
name: java-stellar-anchor-sdk-tar
name: anchor-platform-tar
path: /home/runner/

- name: Extract java-stellar-anchor-sdk.tar
- name: Extract anchor-platform.tar
run: |
cd /home/runner
tar -xf /home/runner/java-stellar-anchor-sdk.tar
cd /home/runner/java-stellar-anchor-sdk
tar -xf /home/runner/anchor-platform.tar
cd /home/runner/anchor-platform

- name: Set up hostnames (/etc/hosts)
run: |
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Run Kafka, Postgres, and Sep24 UI with docker compose
env:
TEST_PROFILE_NAME: default
run: docker compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
run: docker compose -f /home/runner/anchor-platform/service-runner/src/main/resources/docker-compose-test.yaml up -d --build

- name: Run sep server, platform server, observer, and reference servers for integration tests
env:
Expand All @@ -65,13 +65,13 @@ jobs:
RUN_KOTLIN_REFERENCE_SERVER: true
RUN_EVENT_PROCESSING_SERVER: true
RUN_WALLET_SERVER: true
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
SEP1_TOML_VALUE: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/stellar.host.docker.internal.toml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
SEP1_TOML_VALUE: /home/runner/anchor-platform/service-runner/src/main/resources/config/stellar.host.docker.internal.toml
SEP10_WEB_AUTH_DOMAIN: host.docker.internal:8080
SEP10_HOME_DOMAINS: host.docker.internal:8080,*.stellar.org
TOML_PATH: /home/runner/java-stellar-anchor-sdk/wallet-reference-server/src/main/resources/toml
TOML_PATH: /home/runner/anchor-platform/wallet-reference-server/src/main/resources/toml
run: |
cp /home/runner/java-stellar-anchor-sdk/service-runner/build/libs/anchor-platform-runner-*.jar /home/runner/anchor-platform-runner.jar
cp /home/runner/anchor-platform/service-runner/build/libs/anchor-platform-runner-*.jar /home/runner/anchor-platform-runner.jar
java -jar /home/runner/anchor-platform-runner.jar -t &
echo "PID=$!" >> $GITHUB_ENV

Expand Down Expand Up @@ -99,21 +99,21 @@ jobs:
RUN_DOCKER: false
ANCHOR_DOMAIN: http://host.docker.internal:8080
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew runEssentialTests

- name: Run Stellar validation tool
run: |
docker run --network host -v /home/runner/java-stellar-anchor-sdk/platform/src/test/resources://config stellar/anchor-tests:v0.6.20 --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose
docker run --network host -v /home/runner/anchor-platform/platform/src/test/resources://config stellar/anchor-tests:v0.6.20 --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose

- name: Upload Essential Tests report
if: always()
uses: actions/upload-artifact@v3
with:
name: essential-tests-report
path: |
/home/runner/java-stellar-anchor-sdk/api-schema/build/reports/
/home/runner/java-stellar-anchor-sdk/core/build/reports/
/home/runner/java-stellar-anchor-sdk/platform/build/reports/
/home/runner/java-stellar-anchor-sdk/essential-tests/build/reports/
/home/runner/anchor-platform/api-schema/build/reports/
/home/runner/anchor-platform/core/build/reports/
/home/runner/anchor-platform/platform/build/reports/
/home/runner/anchor-platform/essential-tests/build/reports/

52 changes: 26 additions & 26 deletions .github/workflows/sub_extended_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
#############################################
# Setup JDK 17
# Download, and Extract java-stellar-anchor-sdk.tar
# Download, and Extract anchor-platform.tar
# Setup hostnames (/etc/hosts)
#############################################
- name: Set up JDK 17
Expand All @@ -20,17 +20,17 @@ jobs:
java-version: '17'
distribution: 'adopt'

- name: Download java-stellar-anchor-sdk.tar
- name: Download anchor-platform.tar
uses: actions/download-artifact@v3
with:
name: java-stellar-anchor-sdk-tar
name: anchor-platform-tar
path: /home/runner/

- name: Extract java-stellar-anchor-sdk.tar
- name: Extract anchor-platform.tar
run: |
cd /home/runner
tar -xf /home/runner/java-stellar-anchor-sdk.tar
cd /home/runner/java-stellar-anchor-sdk
tar -xf /home/runner/anchor-platform.tar
cd /home/runner/anchor-platform

- name: Set up hostnames (/etc/hosts)
run: |
Expand All @@ -47,15 +47,15 @@ jobs:
#############################################

- name: Run Kafka, Postgres, and Sep24 UI with docker compose
run: docker compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
run: docker compose -f /home/runner/anchor-platform/service-runner/src/main/resources/docker-compose-test.yaml up -d --build

# `custody` Tests
- name: Start `custody` configuration
env:
TEST_PROFILE_NAME: custody
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew startServersWithTestProfile &
echo "PID=$!" >> $GITHUB_ENV

Expand All @@ -69,17 +69,17 @@ jobs:
env:
TEST_PROFILE_NAME: custody
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew :service-runner:clean :extended-tests:clean :extended-tests:test --tests org.stellar.anchor.platform.suite.CustodyTestSuite
kill -9 $PID

# `rpc` Tests
- name: Start `rpc` configuration
env:
TEST_PROFILE_NAME: rpc
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew startServersWithTestProfile &
echo "PID=$!" >> $GITHUB_ENV

Expand All @@ -93,17 +93,17 @@ jobs:
env:
TEST_PROFILE_NAME: rpc
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.RpcTestSuite
kill -9 $PID

# `auth-apikey-custody` Tests
- name: Start `auth-apikey-custody` configuration
env:
TEST_PROFILE_NAME: auth-apikey-custody
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew startServersWithTestProfile &
echo "PID=$!" >> $GITHUB_ENV

Expand All @@ -117,17 +117,17 @@ jobs:
env:
TEST_PROFILE_NAME: auth-apikey-custody
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthApikeyCustodyTestSuite
kill -9 $PID

# `auth-jwt-custody` Tests
- name: Start `auth-jwt-custody` configuration
env:
TEST_PROFILE_NAME: auth-jwt-custody
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew startServersWithTestProfile &
echo "PID=$!" >> $GITHUB_ENV

Expand All @@ -141,17 +141,17 @@ jobs:
env:
TEST_PROFILE_NAME: auth-jwt-custody
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthJwtCustodyTestSuite
kill -9 $PID

# `auth-apikey-platform` Tests
- name: Start `auth-apikey-platform` configuration
env:
TEST_PROFILE_NAME: auth-apikey-platform
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew startServersWithTestProfile &
echo "PID=$!" >> $GITHUB_ENV

Expand All @@ -166,17 +166,17 @@ jobs:
env:
TEST_PROFILE_NAME: auth-apikey-platform
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthApikeyPlatformTestSuite
kill -9 $PID

# `auth-jwt-platform` Tests
- name: Start `auth-jwt-platform` configuration
env:
TEST_PROFILE_NAME: auth-jwt-platform
KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml
KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew startServersWithTestProfile &
echo "PID=$!" >> $GITHUB_ENV

Expand All @@ -191,7 +191,7 @@ jobs:
env:
TEST_PROFILE_NAME: auth-jwt-platform
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthJwtPlatformTestSuite
kill -9 $PID

Expand All @@ -201,5 +201,5 @@ jobs:
with:
name: extended-tests-report
path: |
/home/runner/java-stellar-anchor-sdk/extended-tests/build/reports/
/home/runner/anchor-platform/extended-tests/build/reports/

10 changes: 5 additions & 5 deletions .github/workflows/sub_gradle_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:

- name: Archive Project Folder
run: |
cd /home/runner/work/java-stellar-anchor-sdk
tar -cf /home/runner/java-stellar-anchor-sdk.tar ./java-stellar-anchor-sdk
cd /home/runner/work/anchor-platform
tar -cf /home/runner/anchor-platform.tar ./anchor-platform

- name: Upload java-stellar-anchor-sdk.tar to GitHub Artifacts
- name: Upload anchor-platform.tar to GitHub Artifacts
if: always()
uses: actions/upload-artifact@v3
with:
name: java-stellar-anchor-sdk-tar
name: anchor-platform-tar
path: |
/home/runner/java-stellar-anchor-sdk.tar
/home/runner/anchor-platform.tar
14 changes: 7 additions & 7 deletions .github/workflows/sub_jacoco_report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
#############################################
# Setup JDK 17
# Download, and Extract java-stellar-anchor-sdk.tar
# Download, and Extract anchor-platform.tar
# Setup hostnames (/etc/hosts)
#############################################
- name: Set up JDK 17
Expand All @@ -26,17 +26,17 @@ jobs:
java-version: '17'
distribution: 'adopt'

- name: Download java-stellar-anchor-sdk.tar
- name: Download anchor-platform.tar
uses: actions/download-artifact@v3
with:
name: java-stellar-anchor-sdk-tar
name: anchor-platform-tar
path: /home/runner/

- name: Extract java-stellar-anchor-sdk.tar
- name: Extract anchor-platform.tar
run: |
cd /home/runner
tar -xf /home/runner/java-stellar-anchor-sdk.tar
cd /home/runner/java-stellar-anchor-sdk
tar -xf /home/runner/anchor-platform.tar
cd /home/runner/anchor-platform

- name: Set up hostnames (/etc/hosts)
run: |
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Gradle Build with unit tests only
if : ${{ inputs.forceRebuild }}
run: |
cd /home/runner/java-stellar-anchor-sdk
cd /home/runner/anchor-platform
./gradlew clean build jacocoTestReport -x essential-tests:test -x extended-tests:test

- name: Add coverage to the Pull Request
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ subprojects {

allprojects {
group = "org.stellar.anchor-sdk"
version = "2.11.1"
version = "3.0.0"

tasks.jar {
manifest {
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
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.11.1/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.11.1)
[![Docker](https://badgen.net/badge/Latest%20Release/v3.0.0/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=3.0.0)
JiahuiWho marked this conversation as resolved.
Show resolved Hide resolved
![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/on_push_to_develop.yml/badge.svg?branch=develop)

<div style="text-align: center">
Expand Down
1 change: 1 addition & 0 deletions ...c/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody"))
actualResult,
CustomComparator(
JSONCompareMode.LENIENT,
Customization("[*].result.transfer_received_at") { _, _ -> true },
Customization("[*].result.started_at") { _, _ -> true },
Customization("[*].result.updated_at") { _, _ -> true },
Customization("[*].result.completed_at") { _, _ -> true },
Expand Down
2 changes: 1 addition & 1 deletion platform/src/main/resources/config/anchor-config-default-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ event_processor:
# The configuration of the event delivery to the anchor business server
callback_api_request:
# Whether to enable the event delivery to the anchor business server
enabled: true
enabled: false

######################
## Platform Server Configuration
Expand Down
1 change: 1 addition & 0 deletions service-runner/src/main/resources/profiles/default/config.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ languages=en,es-AR
events.enabled=true
events.queue.type=kafka
events.queue.kafka.bootstrap_server=kafka:29092
event_processor.callback_api_request.enabled=true
# callback API endpoint
callback_api.base_url=http://reference-server:8091/
# platform API endpoint
Expand Down
2 changes: 1 addition & 1 deletion service-runner/src/main/resources/version-info.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2.11.1
version=3.0.0
Loading