From ce5f0891d0a1f4e0e38f8482138cb9feb2ce6b5a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 13:04:48 +0100 Subject: [PATCH 01/42] Bump assertj-core from 3.17.0 to 3.17.1 (#165) Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1. - [Release notes](https://github.com/joel-costigliola/assertj-core/releases) - [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 50c6205..7a9bead 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,7 +414,7 @@ - 3.17.0 + 3.17.1 1.78 2.2.1 2.8.0 From b9be47b6776b80abefa58cbf6193d02b4e31f5b3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2020 13:02:23 +0100 Subject: [PATCH 02/42] Bump assertj-core from 3.17.1 to 3.17.2 (#166) Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2. - [Release notes](https://github.com/joel-costigliola/assertj-core/releases) - [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 7a9bead..acd1f42 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,7 +414,7 @@ - 3.17.1 + 3.17.2 1.78 2.2.1 2.8.0 From 3291a6bf127d1934dc28826d2f9c61e8ad01328e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2020 09:59:39 +0100 Subject: [PATCH 03/42] Bump junit-bom from 5.6.2 to 5.7.0 (#167) Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.6.2 to 5.7.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index acd1f42..44f6b4f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -419,7 +419,7 @@ 2.2.1 2.8.0 2.8.0 - 5.6.2 + 5.7.0 1.2.3 1.7.30 3.14.8 From 5372b3d0601e058aac50df8a78bd7f9cc333f409 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 07:20:43 +0000 Subject: [PATCH 04/42] Bump assertj-core from 3.17.2 to 3.18.0 (#168) Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.0. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 44f6b4f..70c1623 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,7 +414,7 @@ - 3.17.2 + 3.18.0 1.78 2.2.1 2.8.0 From 914dc573ef897dd7d8e06428cf0c841625687433 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 07:21:12 +0000 Subject: [PATCH 05/42] Bump joda-beans from 2.8.0 to 2.8.1 (#169) Bumps joda-beans from 2.8.0 to 2.8.1. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 70c1623..7e6af8c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -417,7 +417,7 @@ 3.18.0 1.78 2.2.1 - 2.8.0 + 2.8.1 2.8.0 5.7.0 1.2.3 From c365b1bcc643930a0b093f2be9220158b7eef993 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Tue, 3 Nov 2020 16:28:48 +0000 Subject: [PATCH 06/42] PROD-5239: Move to new ogbot --- .mergify.yml => .github/mergify.yml | 1 - .github/ogbot.yml | 11 ----------- .github/workflows/ogbot.yml | 13 +++++++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) rename .mergify.yml => .github/mergify.yml (91%) delete mode 100644 .github/ogbot.yml create mode 100644 .github/workflows/ogbot.yml diff --git a/.mergify.yml b/.github/mergify.yml similarity index 91% rename from .mergify.yml rename to .github/mergify.yml index f42a75a..877b02a 100644 --- a/.mergify.yml +++ b/.github/mergify.yml @@ -3,7 +3,6 @@ pull_request_rules: conditions: - "label=auto-merge" - "status-success=build" - - "status-success=ogbot PR title" - "#approved-reviews-by>=1" - "-conflict" - "title~=^((?!(wip|WIP)).)*$" diff --git a/.github/ogbot.yml b/.github/ogbot.yml deleted file mode 100644 index 9d2f9fc..0000000 --- a/.github/ogbot.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Configuration for ogbot -# Individual tasks can be disabled, section names are: -# autoApproveByBot, autoApproveByAssign, prTitle, mergeStatus, commands -all: - enabled: false - -autoApproveByAssign: - enabled: true - -commands: - enabled: true diff --git a/.github/workflows/ogbot.yml b/.github/workflows/ogbot.yml new file mode 100644 index 0000000..b31a529 --- /dev/null +++ b/.github/workflows/ogbot.yml @@ -0,0 +1,13 @@ +name: ogbot + +on: + pull_request: + types: [opened, reopened, edited, synchronize] + +jobs: + pr: + runs-on: ubuntu-latest + steps: + - uses: OpenGamma/OGBot@master + with: + token: ${{ secrets.GITHUB_TOKEN }} From 94ab1dba29bbeea63d985b9ebbfcd9ab869d6408 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 17:08:01 +0000 Subject: [PATCH 07/42] Bump okhttp.version from 3.14.8 to 3.14.9 (#161) Bumps `okhttp.version` from 3.14.8 to 3.14.9. Updates `okhttp` from 3.14.8 to 3.14.9 - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md) - [Commits](https://github.com/square/okhttp/compare/parent-3.14.8...parent-3.14.9) Updates `mockwebserver` from 3.14.8 to 3.14.9 - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md) - [Commits](https://github.com/square/okhttp/compare/parent-3.14.8...parent-3.14.9) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 7e6af8c..981877a 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -422,7 +422,7 @@ 5.7.0 1.2.3 1.7.30 - 3.14.8 + 3.14.9 1.17.5 From a2b6f8348f74a86b38619e49b250ee7bccc77377 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Wed, 23 Dec 2020 16:37:43 +0000 Subject: [PATCH 08/42] PROD-5669: Move to main branch --- .circleci/config.yml | 4 ++-- .github/workflows/ogbot.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d96012f..22598a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,10 +56,10 @@ commands: name: Triggering release of new version command: | RELEASE_SHA=$(git rev-parse HEAD) - git checkout master + git checkout main MASTER_SHA=$(git rev-parse HEAD) if [[ "$RELEASE_SHA" != "$MASTER_SHA" ]]; then - echo "release tag SHA != master HEAD SHA, $RELEASE_SHA $MASTER_SHA" + echo "release tag SHA != main HEAD SHA, $RELEASE_SHA $MASTER_SHA" exit 1 fi git config --local user.email "cibot@opengamma.com" diff --git a/.github/workflows/ogbot.yml b/.github/workflows/ogbot.yml index b31a529..0ed824e 100644 --- a/.github/workflows/ogbot.yml +++ b/.github/workflows/ogbot.yml @@ -8,6 +8,6 @@ jobs: pr: runs-on: ubuntu-latest steps: - - uses: OpenGamma/OGBot@master + - uses: OpenGamma/OGBot@main with: token: ${{ secrets.GITHUB_TOKEN }} From 09238b1b12ca3d17c35b508a156e3f5ea0645eb7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 10:49:54 +0100 Subject: [PATCH 09/42] Upgrade to GitHub-native Dependabot (#176) * Upgrade to GitHub-native Dependabot * Update dependabot.yml * Update dependabot.yml Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- .github/dependabot.yml | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..ac3f7cc --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,47 @@ +version: 2 + +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: weekly + time: "02:30" + open-pull-requests-limit: 20 + reviewers: + - jodastephen + assignees: + - jodastephen + ignore: + - dependency-name: com.beust:jcommander + versions: + - "< 1.73.1, >= 1.73.0.a" + - dependency-name: com.beust:jcommander + versions: + - "< 1.74.1, >= 1.74.0.a" + - dependency-name: com.beust:jcommander + versions: + - ">= 1.75.a, < 1.76" + - dependency-name: com.beust:jcommander + versions: + - ">= 1.80.a, < 1.81" + - dependency-name: com.beust:jcommander + versions: + - ">= 1.81.a, < 1.82" + - dependency-name: com.opengamma:corporate-parent + versions: + - "> 2.7.3, < 2.8" + - dependency-name: com.squareup.okhttp3:mockwebserver + versions: + - ">= 4.a, < 5" + - dependency-name: com.squareup.okhttp3:okhttp + versions: + - ">= 4.a, < 5" + - dependency-name: com.squareup.okio:okio + versions: + - "< 2.3, >= 2.2.a" + - dependency-name: com.squareup.okio:okio + versions: + - ">= 2.a, < 3" + - dependency-name: org.testng:testng + versions: + - "< 6.14.4, >= 6.14.3.a" From b4672a988eaca2e384d55515153a84c435ad94bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 09:13:41 +0100 Subject: [PATCH 10/42] Bump junit-bom from 5.7.0 to 5.7.2 (#178) Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.7.0 to 5.7.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 981877a..31e9999 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -419,7 +419,7 @@ 2.2.1 2.8.1 2.8.0 - 5.7.0 + 5.7.2 1.2.3 1.7.30 3.14.9 From 53b8cef569cb2fb4f75b64e88aab2c6d1d5c3016 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Mon, 6 Dec 2021 12:25:18 +0000 Subject: [PATCH 11/42] Update mergify config --- .github/mergify.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 877b02a..e4a4747 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,3 +1,9 @@ +queue_rules: + - name: default + conditions: + - "label=auto-merge" + - "check-success=build" + pull_request_rules: - name: Auto-Merge conditions: @@ -7,10 +13,9 @@ pull_request_rules: - "-conflict" - "title~=^((?!(wip|WIP)).)*$" actions: - merge: + queue: method: squash - rebase_fallback: null - strict: smart + name: default - name: Delete-Branch conditions: - "merged" From 7272339917596d0c63aa506a729846ea7fe7bb6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=A0ateika?= <3257241+martynassateika@users.noreply.github.com> Date: Sun, 12 Dec 2021 21:46:32 +0000 Subject: [PATCH 12/42] Update CircleCI image (#175) * Update CircleCI image * PROD-4909: Change docker image Move away from deprecated image * Fix CircleCI Co-authored-by: Stephen Colebourne --- .circleci/config.yml | 24 ++++++++++--------- README.md | 2 +- RELEASE.md | 2 +- .../sdk/margin/it/MarginClientRemoteIT.java | 2 ++ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22598a3..ac2faf8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,13 +6,15 @@ executors: #---------------------------------------------------------------------------- # vital to set the MaxRAM parameter as cgroups settings are not passed to the JVM - jdk11: + jdk11-small: docker: - - image: circleci/openjdk:11.0.2-jdk + - image: cimg/openjdk:11.0 + resource_class: small working_directory: ~/repo environment: JAVA_TOOL_OPTIONS: -XX:MaxRAM=1536m - MAVEN_OPTS: -Xmx512m + MAVEN_OPTS: -Xmx736m + REPO_NAME: ClientData ############################################################################# @@ -27,9 +29,9 @@ commands: - run: name: Initializing Maven command: | - mvn --version mkdir -p ./.mvn - echo '-e -B -DtrimStackTrace=false --settings .circleci/maven-settings.xml' > ./.mvn/maven.config + echo "-e -B -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS -DtrimStackTrace=false -Dsurefire.useSystemClassLoader=false -Dog.deploy.branch=$CIRCLE_BRANCH -Dog.deploy.tag=$CIRCLE_TAG -Dog.deploy.sha=$CIRCLE_SHA1 --settings .circleci/maven-settings.xml" > ./.mvn/maven.config + mvn --version #---------------------------------------------------------------------------- maven_install_test: @@ -57,9 +59,9 @@ commands: command: | RELEASE_SHA=$(git rev-parse HEAD) git checkout main - MASTER_SHA=$(git rev-parse HEAD) - if [[ "$RELEASE_SHA" != "$MASTER_SHA" ]]; then - echo "release tag SHA != main HEAD SHA, $RELEASE_SHA $MASTER_SHA" + MAIN_SHA=$(git rev-parse HEAD) + if [[ "$RELEASE_SHA" != "$MAIN_SHA" ]]; then + echo "release tag SHA != main HEAD SHA, $RELEASE_SHA $MAIN_SHA" exit 1 fi git config --local user.email "cibot@opengamma.com" @@ -127,7 +129,7 @@ commands: # jobs to run jobs: build: - executor: jdk11 + executor: jdk11-small steps: - perform_build: actions: @@ -135,7 +137,7 @@ jobs: #---------------------------------------------------------------------------- release: - executor: jdk11 + executor: jdk11-small steps: - perform_build: actions: @@ -145,7 +147,7 @@ jobs: #---------------------------------------------------------------------------- trigger_release: - executor: jdk11 + executor: jdk11-small steps: - perform_build: actions: diff --git a/README.md b/README.md index be4a288..e0c27bf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenGamma Java SDK -[![Build Status](https://travis-ci.org/OpenGamma/JavaSDK.svg?branch=master)](https://travis-ci.org/OpenGamma/JavaSDK) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) +[![Build Status](https://travis-ci.org/OpenGamma/JavaSDK.svg?branch=main)](https://travis-ci.org/OpenGamma/JavaSDK) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) The OpenGamma service is a platform for the independent calculation of metrics such as margin, fees and balance sheet, to enable firms to optimize execution and clearing of derivatives. diff --git a/RELEASE.md b/RELEASE.md index 1e37bdd..8f835f4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,7 +5,7 @@ The release process is as follows: 1. Ensure all required changes have been merged -1. Check out the master branch and ensure there are no local changes +1. Check out the main branch and ensure there are no local changes 1. Update CHANGELOG.md and version in README.md, committing the changes diff --git a/modules/margin/src/test/java/com/opengamma/sdk/margin/it/MarginClientRemoteIT.java b/modules/margin/src/test/java/com/opengamma/sdk/margin/it/MarginClientRemoteIT.java index 489ee50..359e3b1 100644 --- a/modules/margin/src/test/java/com/opengamma/sdk/margin/it/MarginClientRemoteIT.java +++ b/modules/margin/src/test/java/com/opengamma/sdk/margin/it/MarginClientRemoteIT.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -56,6 +57,7 @@ * Run as a formal integration test via maven failsafe. * Requires two environment variables, hence is run via a maven profile. */ +@Disabled("API key not public") @SuppressWarnings("deprecation") @TestInstance(Lifecycle.PER_CLASS) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) From ebaf9cc7a3d17a4517aadf73889397bf65fd539f Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Sun, 12 Dec 2021 22:09:44 +0000 Subject: [PATCH 13/42] Update dependencies --- .github/dependabot.yml | 54 ++++++++++++++++-------------------------- examples/pom.xml | 2 +- modules/pom.xml | 6 ++--- 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ac3f7cc..8718a8e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,37 +11,23 @@ updates: - jodastephen assignees: - jodastephen - ignore: - - dependency-name: com.beust:jcommander - versions: - - "< 1.73.1, >= 1.73.0.a" - - dependency-name: com.beust:jcommander - versions: - - "< 1.74.1, >= 1.74.0.a" - - dependency-name: com.beust:jcommander - versions: - - ">= 1.75.a, < 1.76" - - dependency-name: com.beust:jcommander - versions: - - ">= 1.80.a, < 1.81" - - dependency-name: com.beust:jcommander - versions: - - ">= 1.81.a, < 1.82" - - dependency-name: com.opengamma:corporate-parent - versions: - - "> 2.7.3, < 2.8" - - dependency-name: com.squareup.okhttp3:mockwebserver - versions: - - ">= 4.a, < 5" - - dependency-name: com.squareup.okhttp3:okhttp - versions: - - ">= 4.a, < 5" - - dependency-name: com.squareup.okio:okio - versions: - - "< 2.3, >= 2.2.a" - - dependency-name: com.squareup.okio:okio - versions: - - ">= 2.a, < 3" - - dependency-name: org.testng:testng - versions: - - "< 6.14.4, >= 6.14.3.a" +- package-ecosystem: maven + directory: "/examples/" + schedule: + interval: weekly + time: "02:30" + open-pull-requests-limit: 20 + reviewers: + - jodastephen + assignees: + - jodastephen +- package-ecosystem: maven + directory: "/modules/" + schedule: + interval: weekly + time: "02:30" + open-pull-requests-limit: 20 + reviewers: + - jodastephen + assignees: + - jodastephen diff --git a/examples/pom.xml b/examples/pom.xml index 53ad489..7aadefa 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -67,7 +67,7 @@ - 1.2.3 + 1.2.7 1.1 diff --git a/modules/pom.xml b/modules/pom.xml index 31e9999..c9942f5 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,13 +414,13 @@ - 3.18.0 + 3.21.0 1.78 2.2.1 2.8.1 2.8.0 - 5.7.2 - 1.2.3 + 5.8.2 + 1.2.7 1.7.30 3.14.9 1.17.5 From 9c91a3c79575f72c70989b04569dda0a52b7be6e Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Sun, 12 Dec 2021 22:31:30 +0000 Subject: [PATCH 14/42] Update dependencies --- .github/dependabot.yml | 20 -------------------- modules/pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8718a8e..992c2c8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,23 +11,3 @@ updates: - jodastephen assignees: - jodastephen -- package-ecosystem: maven - directory: "/examples/" - schedule: - interval: weekly - time: "02:30" - open-pull-requests-limit: 20 - reviewers: - - jodastephen - assignees: - - jodastephen -- package-ecosystem: maven - directory: "/modules/" - schedule: - interval: weekly - time: "02:30" - open-pull-requests-limit: 20 - reviewers: - - jodastephen - assignees: - - jodastephen diff --git a/modules/pom.xml b/modules/pom.xml index c9942f5..b14347e 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -415,7 +415,7 @@ 3.21.0 - 1.78 + 1.81 2.2.1 2.8.1 2.8.0 @@ -423,7 +423,7 @@ 1.2.7 1.7.30 3.14.9 - 1.17.5 + 2.10.0 1.1 From 6ecacbd36e74d8d6bac08edd860a91af7cd11350 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Sun, 12 Dec 2021 22:56:59 +0000 Subject: [PATCH 15/42] Update before release --- CHANGELOG.md | 7 +++++++ README.md | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4e0d95..99d7112 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ Change Log Changes to the SDK, listed in the style of [keepachangelog](https://keepachangelog.com/en/1.0.0/). +## Version 3.6.3 - 2021-12-12 + +### Fixed + +Updated dependencies + + ## Version 3.6.2 - 2020-04-28 ### Fixed diff --git a/README.md b/README.md index e0c27bf..13fcb17 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ For example, to access the SDK for the margin service, use: com.opengamma.sdk sdk-margin - 3.6.2 + 3.6.3 ``` From a2ef46af64b2762820b28f5200dd545460dd772b Mon Sep 17 00:00:00 2001 From: opengammacibot Date: Sun, 12 Dec 2021 22:57:53 +0000 Subject: [PATCH 16/42] [maven-release-plugin] prepare release v3.6.3 --- examples/pom.xml | 6 +++++- modules/common/pom.xml | 2 +- modules/margin/pom.xml | 2 +- modules/pom.xml | 4 ++-- pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 7aadefa..5554db8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-examples - 3.6.3-SNAPSHOT + 3.6.3 jar SDK-Examples OpenGamma SDK - Example code to demonstrate usage @@ -77,4 +77,8 @@ true true + + + v3.6.3 + diff --git a/modules/common/pom.xml b/modules/common/pom.xml index e9ac559..023e2fb 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.3-SNAPSHOT + 3.6.3 .. sdk-common diff --git a/modules/margin/pom.xml b/modules/margin/pom.xml index 2facf0f..ce1b192 100644 --- a/modules/margin/pom.xml +++ b/modules/margin/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.3-SNAPSHOT + 3.6.3 .. sdk-margin diff --git a/modules/pom.xml b/modules/pom.xml index b14347e..c92e681 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-parent - 3.6.3-SNAPSHOT + 3.6.3 pom SDK-Parent OpenGamma SDK - Parent project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - HEAD + v3.6.3 diff --git a/pom.xml b/pom.xml index 45cbd21..6b409c6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-root - 3.6.3-SNAPSHOT + 3.6.3 pom SDK-Root OpenGamma SDK - Root project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - HEAD + v3.6.3 From bd7fe2ab934967d5450ee4eba2a981da4dbdb1fc Mon Sep 17 00:00:00 2001 From: opengammacibot Date: Sun, 12 Dec 2021 22:57:54 +0000 Subject: [PATCH 17/42] [maven-release-plugin] prepare for next development iteration --- examples/pom.xml | 6 +----- modules/common/pom.xml | 2 +- modules/margin/pom.xml | 2 +- modules/pom.xml | 4 ++-- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 5554db8..05d853b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-examples - 3.6.3 + 3.6.4-SNAPSHOT jar SDK-Examples OpenGamma SDK - Example code to demonstrate usage @@ -77,8 +77,4 @@ true true - - - v3.6.3 - diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 023e2fb..9fa8a8c 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.3 + 3.6.4-SNAPSHOT .. sdk-common diff --git a/modules/margin/pom.xml b/modules/margin/pom.xml index ce1b192..7aa0e21 100644 --- a/modules/margin/pom.xml +++ b/modules/margin/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.3 + 3.6.4-SNAPSHOT .. sdk-margin diff --git a/modules/pom.xml b/modules/pom.xml index c92e681..34c437e 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-parent - 3.6.3 + 3.6.4-SNAPSHOT pom SDK-Parent OpenGamma SDK - Parent project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - v3.6.3 + HEAD diff --git a/pom.xml b/pom.xml index 6b409c6..6d4790d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-root - 3.6.3 + 3.6.4-SNAPSHOT pom SDK-Root OpenGamma SDK - Root project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - v3.6.3 + HEAD From c90e2b3e1d27e44cc960dc32a45c2f68bf5f306e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Dec 2021 10:32:35 +0000 Subject: [PATCH 18/42] Bump joda-convert from 2.2.1 to 2.2.2 and logback from 1.2.7 to 1.2.9 (#196) * Bump joda-convert from 2.2.1 to 2.2.2 Bumps joda-convert from 2.2.1 to 2.2.2. --- updated-dependencies: - dependency-name: org.joda:joda-convert dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update logback to 1.2.9 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- modules/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pom.xml b/modules/pom.xml index 34c437e..554fcac 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -416,11 +416,11 @@ 3.21.0 1.81 - 2.2.1 + 2.2.2 2.8.1 2.8.0 5.8.2 - 1.2.7 + 1.2.9 1.7.30 3.14.9 2.10.0 From c901e48768483431db8b164d025fbb15d14ce70b Mon Sep 17 00:00:00 2001 From: opengammacibot Date: Sun, 19 Dec 2021 10:33:30 +0000 Subject: [PATCH 19/42] [maven-release-plugin] prepare release v3.6.4 --- examples/pom.xml | 6 +++++- modules/common/pom.xml | 2 +- modules/margin/pom.xml | 2 +- modules/pom.xml | 4 ++-- pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 05d853b..937d657 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-examples - 3.6.4-SNAPSHOT + 3.6.4 jar SDK-Examples OpenGamma SDK - Example code to demonstrate usage @@ -77,4 +77,8 @@ true true + + + v3.6.4 + diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 9fa8a8c..5e65273 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.4-SNAPSHOT + 3.6.4 .. sdk-common diff --git a/modules/margin/pom.xml b/modules/margin/pom.xml index 7aa0e21..9e0f8c8 100644 --- a/modules/margin/pom.xml +++ b/modules/margin/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.4-SNAPSHOT + 3.6.4 .. sdk-margin diff --git a/modules/pom.xml b/modules/pom.xml index 554fcac..feda6b9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-parent - 3.6.4-SNAPSHOT + 3.6.4 pom SDK-Parent OpenGamma SDK - Parent project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - HEAD + v3.6.4 diff --git a/pom.xml b/pom.xml index 6d4790d..9ed391b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-root - 3.6.4-SNAPSHOT + 3.6.4 pom SDK-Root OpenGamma SDK - Root project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - HEAD + v3.6.4 From 99cd7b18b9de1c254d1f778117995c7e06aee355 Mon Sep 17 00:00:00 2001 From: opengammacibot Date: Sun, 19 Dec 2021 10:33:31 +0000 Subject: [PATCH 20/42] [maven-release-plugin] prepare for next development iteration --- examples/pom.xml | 6 +----- modules/common/pom.xml | 2 +- modules/margin/pom.xml | 2 +- modules/pom.xml | 4 ++-- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 937d657..bbae983 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-examples - 3.6.4 + 3.6.5-SNAPSHOT jar SDK-Examples OpenGamma SDK - Example code to demonstrate usage @@ -77,8 +77,4 @@ true true - - - v3.6.4 - diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 5e65273..50744f2 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.4 + 3.6.5-SNAPSHOT .. sdk-common diff --git a/modules/margin/pom.xml b/modules/margin/pom.xml index 9e0f8c8..ed12945 100644 --- a/modules/margin/pom.xml +++ b/modules/margin/pom.xml @@ -5,7 +5,7 @@ com.opengamma.sdk sdk-parent - 3.6.4 + 3.6.5-SNAPSHOT .. sdk-margin diff --git a/modules/pom.xml b/modules/pom.xml index feda6b9..736a9e3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-parent - 3.6.4 + 3.6.5-SNAPSHOT pom SDK-Parent OpenGamma SDK - Parent project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - v3.6.4 + HEAD diff --git a/pom.xml b/pom.xml index 9ed391b..37f386d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.opengamma.sdk sdk-root - 3.6.4 + 3.6.5-SNAPSHOT pom SDK-Root OpenGamma SDK - Root project @@ -34,7 +34,7 @@ scm:git:https://github.com/OpenGamma/JavaSDK.git scm:git:https://github.com/OpenGamma/JavaSDK.git https://github.com/OpenGamma/JavaSDK - v3.6.4 + HEAD From cf70d8306928199070ead1a6e353e811142dcb7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 13:58:09 +0000 Subject: [PATCH 21/42] Bump assertj-core from 3.21.0 to 3.22.0 (#197) Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 736a9e3..91f6601 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,7 +414,7 @@ - 3.21.0 + 3.22.0 1.81 2.2.2 2.8.1 From da8c44ab8f2212f4298da1604cde1d535f36df44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 13:59:50 +0000 Subject: [PATCH 22/42] Bump slf4j-api from 1.7.30 to 1.7.35 (#200) Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.35. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.35) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 91f6601..0054e4c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -421,7 +421,7 @@ 2.8.0 5.8.2 1.2.9 - 1.7.30 + 1.7.35 3.14.9 2.10.0 From 5d5b547d017fcded6a5df349605230702cccf40f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:01:15 +0000 Subject: [PATCH 23/42] Bump jcommander from 1.81 to 1.82 (#198) Bumps [jcommander](https://github.com/cbeust/jcommander) from 1.81 to 1.82. - [Release notes](https://github.com/cbeust/jcommander/releases) - [Changelog](https://github.com/cbeust/jcommander/blob/master/CHANGELOG.md) - [Commits](https://github.com/cbeust/jcommander/compare/1.81...1.82) --- updated-dependencies: - dependency-name: com.beust:jcommander dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 0054e4c..364e57c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -415,7 +415,7 @@ 3.22.0 - 1.81 + 1.82 2.2.2 2.8.1 2.8.0 From f2413769bec0044946490908eab3d07360840221 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 08:44:19 +0000 Subject: [PATCH 24/42] Bump slf4j-api from 1.7.35 to 1.7.36 (#201) Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.35 to 1.7.36. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 364e57c..3ecf70e 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -421,7 +421,7 @@ 2.8.0 5.8.2 1.2.9 - 1.7.35 + 1.7.36 3.14.9 2.10.0 From a58df4b61416485e3f543a955129a5dd54aced99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 11:20:31 +0100 Subject: [PATCH 25/42] Bump joda-beans from 2.8.1 to 2.8.2 (#202) Bumps joda-beans from 2.8.1 to 2.8.2. --- updated-dependencies: - dependency-name: org.joda:joda-beans dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 3ecf70e..d81158e 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -417,7 +417,7 @@ 3.22.0 1.82 2.2.2 - 2.8.1 + 2.8.2 2.8.0 5.8.2 1.2.9 From 7acdceaf8779de4f9d48b8d6c44b3c9a4dc1e227 Mon Sep 17 00:00:00 2001 From: Chris Kent <98477+cjkent@users.noreply.github.com> Date: Tue, 17 May 2022 16:25:20 +0100 Subject: [PATCH 26/42] Multiple CCPs in MarginClientExample (#174) * Calc for multiple CCPs * Fix URL * Trigger build Co-authored-by: Akshai Shah Co-authored-by: Stephen Colebourne --- .../sdk/example/MarginClientExample.java | 93 +++++++++++++------ .../com/opengamma/sdk/example/cme.csv | 2 + .../com/opengamma/sdk/example/ice_span.csv | 2 + 3 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 examples/src/main/resources/com/opengamma/sdk/example/cme.csv create mode 100644 examples/src/main/resources/com/opengamma/sdk/example/ice_span.csv diff --git a/examples/src/main/java/com/opengamma/sdk/example/MarginClientExample.java b/examples/src/main/java/com/opengamma/sdk/example/MarginClientExample.java index bee81d4..74ffec6 100644 --- a/examples/src/main/java/com/opengamma/sdk/example/MarginClientExample.java +++ b/examples/src/main/java/com/opengamma/sdk/example/MarginClientExample.java @@ -8,8 +8,11 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.joda.beans.ser.JodaBeanSer; @@ -33,46 +36,84 @@ public class MarginClientExample { private static final String DEV_ID = "PLEASE-CONTACT-OPENGAMMA"; private static final String DEV_SECRET = "123"; private static final Credentials CREDENTIALS = Credentials.ofApiKey(DEV_ID, DEV_SECRET); + private static final Map CCP_FILES; - // the file to upload - private static final Path LCH_FILE = Paths.get("src/main/resources/com/opengamma/sdk/example/lch-trades.txt"); + static { + Map ccpMap = new HashMap<>(); + ccpMap.put(Ccp.LCH, Paths.get("src/main/resources/com/opengamma/sdk/example/lch-trades.txt")); + ccpMap.put(Ccp.CME, Paths.get("src/main/resources/com/opengamma/sdk/example/cme.csv")); + ccpMap.put(Ccp.ICE_SPAN, Paths.get("src/main/resources/com/opengamma/sdk/example/ice_span.csv")); + CCP_FILES = Collections.unmodifiableMap(ccpMap); + } + + /** + * Invoke without any arguments to calculate for LCH. + *

+ * Provide CCPs as arguments to run calculations for those CCPs. Valid CCPs: + *

    + *
  • LCH
    • + *
  • CME
    • + *
  • ICE_SPAN
    • + *
+ * + * @param args empty to calculate for LCH, otherwise list of CCPs for which to run calculations. + */ + public static void main(String[] args) { + List ccps = new ArrayList<>(); + + if (args.length == 0) { + ccps.add(Ccp.LCH); + } else { + for (String arg : args) { + Ccp ccp = Ccp.of(arg); + ccps.add(ccp); + } + } - // example code - invoke with no arguments - public static void main(String[] args) throws InterruptedException { // create the invoker specifying the URL and credentials try (ServiceInvoker invoker = ServiceInvoker.of(CREDENTIALS)) { // Creating the margin client MarginClient client = MarginClient.of(invoker); // Listing the CCPs that are available - CcpsResult ccps = client.listCcps(); + CcpsResult ccpsResult = client.listCcps(); - // Optional step: Checking if we are permissioned to the specific CCP calculation engine - Ccp chosenCCP = Ccp.LCH; - if (!ccps.isCcpAvailable(chosenCCP)) { - throw new IllegalStateException("Margin Calculator not available for " + chosenCCP.name()); + for (Ccp ccp : ccps) { + if (!CCP_FILES.containsKey(ccp)) { + throw new IllegalStateException("Example portfolio data not available for " + ccp.name()); + } + if (!ccpsResult.isCcpAvailable(ccp)) { + throw new IllegalStateException("Margin Calculator not available for " + ccp.name()); + } + calculate(client, ccp); } + } + } - //Retrieve specific information about the CCP calculation engine: valuation dates and available currencies - CcpInfo lch = client.getCcpInfo(chosenCCP); - LocalDate valuationDate = lch.getLatestValuationDate(); - String currency = lch.getDefaultCurrency(); + private static void calculate(MarginClient client, Ccp ccp) { + System.out.println("Calculating for " + ccp.name()); + //Retrieve specific information about the CCP calculation engine: valuation dates and available currencies + CcpInfo ccpInfo = client.getCcpInfo(ccp); + LocalDate valuationDate = ccpInfo.getLatestValuationDate(); + String currency = ccpInfo.getDefaultCurrency(); - // choose the file to upload - List files = Collections.singletonList(PortfolioDataFile.of(LCH_FILE)); + // choose the file to upload + Path portfolioFile = CCP_FILES.get(ccp); + List files = Collections.singletonList(PortfolioDataFile.of(portfolioFile)); - // create the request - MarginCalcRequest request = MarginCalcRequest.of(valuationDate, currency, files); + // create the request + MarginCalcRequest request = MarginCalcRequest.of(valuationDate, currency, files); - // make the call and view the result - MarginCalcResult result = client.calculate(chosenCCP, request); - System.out.println(JodaBeanSer.PRETTY.simpleJsonWriter().write(result)); + // make the call and view the result + MarginCalcResult result = client.calculate(ccp, request); + System.out.println("Results for " + ccp.name()); + System.out.println(JodaBeanSer.PRETTY.simpleJsonWriter().write(result)); - // make the what-if call and view the result (the difference in margin numbers) - MarginWhatIfCalcResult whatIfResult = - client.calculateWhatIf(Ccp.LCH, request, Collections.singletonList(PortfolioDataFile.of(LCH_FILE))); - System.out.println(JodaBeanSer.PRETTY.simpleJsonWriter().write(whatIfResult)); - } + // make the what-if call and view the result (the difference in margin numbers) + System.out.println("Calculating what-if for " + ccp.name()); + MarginWhatIfCalcResult whatIfResult = + client.calculateWhatIf(ccp, request, Collections.singletonList(PortfolioDataFile.of(portfolioFile))); + System.out.println("What-if results for " + ccp.name()); + System.out.println(JodaBeanSer.PRETTY.simpleJsonWriter().write(whatIfResult)); } - } diff --git a/examples/src/main/resources/com/opengamma/sdk/example/cme.csv b/examples/src/main/resources/com/opengamma/sdk/example/cme.csv new file mode 100644 index 0000000..5d195fe --- /dev/null +++ b/examples/src/main/resources/com/opengamma/sdk/example/cme.csv @@ -0,0 +1,2 @@ +Strata Trade Type,Id Scheme,Id,CCP,Counterparty,Trade Date,Buy Sell,Direction,Currency,Notional,Start Date,End Date,Day Count,Fixed Rate,Index,Interpolated Index,Date Convention,Date Calendar,Payment Date,Payment Date Convention,Payment Date Calendar,Netting Fund,Fund,Original Item ID,Sub Strategy,Broker,Business Unit,Desk,Strategy,Team,Product Type,Book,OTC Cleared Trade Id,Sub Account,Client Instrument Code,Portfolio Margin Model,Seniority,Doc Clause,Red Code,Bilateral-Margin Calculation Methodology,FxPB Grid,FX Option Delta Adjust,Leg 1 Direction,Leg 1 Start Date,Leg 1 End Date,Leg 1 Frequency,Leg 1 Roll Convention,Leg 1 Stub Convention,Leg 1 First Regular Start Date,Leg 1 Last Regular End Date,Leg 1 Date Convention,Leg 1 Date Calendar,Leg 1 Payment Frequency,Leg 1 Payment Relative To,Leg 1 Payment Offset Days,Leg 1 Payment Offset Calendar,Leg 1 Payment Offset Adjustment Convention,Leg 1 Payment Offset Adjustment Calendar,Leg 1 Compounding Method,Leg 1 Payment First Regular Start Date,Leg 1 Payment Last Regular End Date,Leg 1 Currency,Leg 1 Notional,Leg 1 Notional Initial Exchange,Leg 1 Notional Intermediate Exchange,Leg 1 Notional Final Exchange,Leg 1 Day Count,Leg 1 Fixed Rate,Leg 1 Future Value Notional,Leg 1 Index,Leg 1 Negative Rate Method,Leg 1 Gearing,Leg 1 Spread,Leg 1 Fixing Relative To,Leg 1 Fixing Offset Days,Leg 1 Fixing Offset Calendar,Leg 1 Fixing Offset Adjustment Convention,Leg 1 Fixing Offset Adjustment Calendar,Leg 1 Accrual Method,Leg 1 Rate Cut Off Days,Leg 1 Inflation Lag,Leg 1 Inflation Method,Leg 1 Inflation First Index Value,Leg 2 Direction,Leg 2 Start Date,Leg 2 End Date,Leg 2 Frequency,Leg 2 Roll Convention,Leg 2 Stub Convention,Leg 2 First Regular Start Date,Leg 2 Last Regular End Date,Leg 2 Date Convention,Leg 2 Date Calendar,Leg 2 Payment Frequency,Leg 2 Payment Relative To,Leg 2 Payment Offset Days,Leg 2 Payment Offset Calendar,Leg 2 Payment Offset Adjustment Convention,Leg 2 Payment Offset Adjustment Calendar,Leg 2 Compounding Method,Leg 2 Payment First Regular Start Date,Leg 2 Payment Last Regular End Date,Leg 2 Currency,Leg 2 Notional,Leg 2 Notional Initial Exchange,Leg 2 Notional Intermediate Exchange,Leg 2 Notional Final Exchange,Leg 2 Day Count,Leg 2 Fixed Rate,Leg 2 Future Value Notional,Leg 2 Index,Leg 2 Negative Rate Method,Leg 2 Gearing,Leg 2 Spread,Leg 2 Fixing Relative To,Leg 2 Fixing Offset Days,Leg 2 Fixing Offset Calendar,Leg 2 Fixing Offset Adjustment Convention,Leg 2 Fixing Offset Adjustment Calendar,Leg 2 Accrual Method,Leg 2 Rate Cut Off Days,Leg 2 Inflation Lag,Leg 2 Inflation Method,Leg 2 Inflation First Index Value,CDS Index Id Scheme,CDS Index Id,Legal Entity Id Scheme,Legal Entity Id,Payment On Default,Protection Start,Start Date Convention,Start Date Calendar,End Date Convention,End Date Calendar,Frequency,Roll Convention,Stub Convention,First Regular Start Date,Last Regular End Date,Leg 1 Payment Date,Leg 2 Payment Date,Long Short,Expiry Date,Expiry Time,Expiry Zone,Premium Date,Premium Date Convention,Premium Date Calendar,Premium Direction,Premium Currency,Premium Amount +Swap,OG-Trade,41788094,CME,,18/03/2021,,,MXN,,,,,,,,,,,,,XPMF,XPMF,OG-Trade~41788094,Rates,BARC,FI_PMs,FOORD,N/A,FOORD,OTC_CLEARED,g10fly,41788094,Rates,SW IR MXN 28dTIIE 6/16/21-6/10/26 5.08,Drim,,,,,,,Pay,16/06/2021,10/06/2026,P4W,None,SmartInitial,,,NoAdjust,MXMC,P4W,PeriodEnd,0,MXMC,NoAdjust,MXMC,Straight,,,MXN,825000000,FALSE,FALSE,FALSE,Act/360,,,MXN-TIIE-4W,AllowNegative,,0,PeriodStart,-1,MXMC,NoAdjust,NoHolidays,,,,,,Receive,16/06/2021,10/06/2026,P4W,None,SmartInitial,,,NoAdjust,MXMC,P4W,PeriodEnd,0,MXMC,NoAdjust,MXMC,Straight,,,MXN,825000000,FALSE,FALSE,FALSE,Act/360,5.08,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, \ No newline at end of file diff --git a/examples/src/main/resources/com/opengamma/sdk/example/ice_span.csv b/examples/src/main/resources/com/opengamma/sdk/example/ice_span.csv new file mode 100644 index 0000000..3b2a3cb --- /dev/null +++ b/examples/src/main/resources/com/opengamma/sdk/example/ice_span.csv @@ -0,0 +1,2 @@ +Strata Position Type,Id Scheme,Id,CCP,Broker,Fund,Exchange,Contract Code,Contract Code Type,Long Quantity,Short Quantity,Expiry,Expiry Day,Put Call,Exercise Price,Book,Desk,Portfolio Margin Model,Strategy,Sub Strategy +FUT,OG-ETD,E13_ETD_Trades.csv_35,ICE,BARC,XPMF,IFUS,MME,EXG,65,0,2021-06,,,,X-ASSETS,ANDRE,,N/A,Equity Stat Arb \ No newline at end of file From 4c88f65a888b96218d817e72c0dd648ac4baed0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 10:45:00 +0100 Subject: [PATCH 27/42] Bump assertj-core from 3.22.0 to 3.23.1 (#203) Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index d81158e..cba783f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,7 +414,7 @@ - 3.22.0 + 3.23.1 1.82 2.2.2 2.8.2 From fbff57919224a52845f0b475ac1116c38d2de6bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 10:14:39 +0100 Subject: [PATCH 28/42] Bump junit-bom from 5.8.2 to 5.9.0 (#204) Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index cba783f..3b082cb 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -419,7 +419,7 @@ 2.2.2 2.8.2 2.8.0 - 5.8.2 + 5.9.0 1.2.9 1.7.36 3.14.9 From 8040e8ed454a932e37411f4726b47d752a9148ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 11:11:28 +0000 Subject: [PATCH 29/42] Bump joda-beans from 2.8.2 to 2.8.3 (#205) Bumps joda-beans from 2.8.2 to 2.8.3. --- updated-dependencies: - dependency-name: org.joda:joda-beans dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 3b082cb..4db23b2 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -417,7 +417,7 @@ 3.23.1 1.82 2.2.2 - 2.8.2 + 2.8.3 2.8.0 5.9.0 1.2.9 From 74a6e9bf938cfb73ab81517b7b1abf1d7100fbe5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 13:38:58 +0000 Subject: [PATCH 30/42] Bump corporate-parent from 2.7.3 to 2.8.0 (#208) * Bump corporate-parent from 2.7.3 to 2.8.0 Bumps corporate-parent from 2.7.3 to 2.8.0. --- updated-dependencies: - dependency-name: com.opengamma:corporate-parent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Modernize pom.xml Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- examples/pom.xml | 5 ++--- modules/pom.xml | 11 ++++------- pom.xml | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index bbae983..0c0eeba 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.7.4 + 2.8.0 com.opengamma.sdk @@ -70,8 +70,7 @@ 1.2.7 - 1.1 - 2.8.0 + 2.8.3 jdk true diff --git a/modules/pom.xml b/modules/pom.xml index 4db23b2..fffd396 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.7.4 + 2.8.0 com.opengamma.sdk @@ -51,7 +51,7 @@ src/main/resources - + ${project.basedir} LICENSE.txt NOTICE.txt @@ -362,7 +362,6 @@ jar-no-fork - true true @@ -390,7 +389,6 @@ jar - true true @@ -418,15 +416,14 @@ 1.82 2.2.2 2.8.3 - 2.8.0 + 2.8.3 5.9.0 1.2.9 1.7.36 3.14.9 2.10.0 - - 1.1 + jdk OpenGamma SDK diff --git a/pom.xml b/pom.xml index 37f386d..3cd5885 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.7.3 + 2.8.0 com.opengamma.sdk From ab027be446011a5461bdd6781f3a258a5a986063 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 09:03:47 +0100 Subject: [PATCH 31/42] Bump junit-bom from 5.9.0 to 5.9.1 (#210) Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.9.0 to 5.9.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index fffd396..b6125b2 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -417,7 +417,7 @@ 2.2.2 2.8.3 2.8.3 - 5.9.0 + 5.9.1 1.2.9 1.7.36 3.14.9 From f5cd0ad17e547f08cff6b335167c7f60c963460c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:56:27 +0000 Subject: [PATCH 32/42] Bump corporate-parent from 2.8.0 to 2.8.1 (#217) Bumps corporate-parent from 2.8.0 to 2.8.1. --- updated-dependencies: - dependency-name: com.opengamma:corporate-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 0c0eeba..5e23b85 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.8.0 + 2.8.1 com.opengamma.sdk diff --git a/modules/pom.xml b/modules/pom.xml index b6125b2..acd4588 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.8.0 + 2.8.1 com.opengamma.sdk diff --git a/pom.xml b/pom.xml index 3cd5885..9b23d86 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.8.0 + 2.8.1 com.opengamma.sdk From aeb83fc04274863776c1233014044d7486dd507b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 13:00:39 +0000 Subject: [PATCH 33/42] Bump joda-convert from 2.2.2 to 2.2.3 (#216) Bumps [joda-convert](https://github.com/JodaOrg/joda-convert) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/JodaOrg/joda-convert/releases) - [Changelog](https://github.com/JodaOrg/joda-convert/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-convert/compare/v2.2.2...v2.2.3) --- updated-dependencies: - dependency-name: org.joda:joda-convert dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index acd4588..f3489a6 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -414,7 +414,7 @@ 3.23.1 1.82 - 2.2.2 + 2.2.3 2.8.3 2.8.3 5.9.1 From 56d971528d0b980372e51e9bfaa67553655db409 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Thu, 20 Apr 2023 14:06:43 +0100 Subject: [PATCH 34/42] TREAS-4444: Fix Maven CircleCI --- .circleci/config.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac2faf8..8b90fd1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,8 +29,19 @@ commands: - run: name: Initializing Maven command: | + mvn --version mkdir -p ./.mvn - echo "-e -B -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS -DtrimStackTrace=false -Dsurefire.useSystemClassLoader=false -Dog.deploy.branch=$CIRCLE_BRANCH -Dog.deploy.tag=$CIRCLE_TAG -Dog.deploy.sha=$CIRCLE_SHA1 --settings .circleci/maven-settings.xml" > ./.mvn/maven.config + echo "-e" >> ./.mvn/maven.config + echo "-B" >> ./.mvn/maven.config + echo "-DtrimStackTrace=false" >> ./.mvn/maven.config + echo "-Dorg.slf4j.simpleLogger.showDateTime=true" >> ./.mvn/maven.config + echo "-Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS" >> ./.mvn/maven.config + echo "-Dsurefire.useSystemClassLoader=false" >> ./.mvn/maven.config + echo "-Dog.deploy.branch=$CIRCLE_BRANCH" >> ./.mvn/maven.config + echo "-Dog.deploy.tag=$CIRCLE_TAG" >> ./.mvn/maven.config + echo "-Dog.deploy.sha=$CIRCLE_SHA1" >> ./.mvn/maven.config + echo "--settings" >> ./.mvn/maven.config + echo ".circleci/maven-settings.xml" >> ./.mvn/maven.config mvn --version #---------------------------------------------------------------------------- From 17d979728a57d983c676ff94a8437e357c65f8fc Mon Sep 17 00:00:00 2001 From: Christopher Bond <11727490+ChristopherBond@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:58:03 +0100 Subject: [PATCH 35/42] Update ogbot.yml (#226) --- .github/workflows/ogbot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ogbot.yml b/.github/workflows/ogbot.yml index 0ed824e..18aa933 100644 --- a/.github/workflows/ogbot.yml +++ b/.github/workflows/ogbot.yml @@ -7,6 +7,7 @@ on: jobs: pr: runs-on: ubuntu-latest + permissions: write-all steps: - uses: OpenGamma/OGBot@main with: From 9486cc99a3a06fd3a55c69ce0751770479707f8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:46:42 +0100 Subject: [PATCH 36/42] Bump org.joda:joda-beans from 2.8.3 to 2.10.0 (#231) Bumps [org.joda:joda-beans](https://github.com/JodaOrg/joda-beans) from 2.8.3 to 2.10.0. - [Release notes](https://github.com/JodaOrg/joda-beans/releases) - [Changelog](https://github.com/JodaOrg/joda-beans/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-beans/compare/v2.8.3...v2.10.0) --- updated-dependencies: - dependency-name: org.joda:joda-beans dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index f3489a6..1e1890c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -415,7 +415,7 @@ 3.23.1 1.82 2.2.3 - 2.8.3 + 2.10.0 2.8.3 5.9.1 1.2.9 From bde3180c271920d158ceb1ad771e29d355aa2770 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:59:12 +0100 Subject: [PATCH 37/42] Bump org.assertj:assertj-core from 3.23.1 to 3.25.3 (#230) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.23.1 to 3.25.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-core-3.23.1...assertj-build-3.25.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 1e1890c..90c25e9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -412,7 +412,7 @@ - 3.23.1 + 3.25.3 1.82 2.2.3 2.10.0 From bd1c81bd8525d925f306ab52ebdaacaa2e5241fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:30:50 +0100 Subject: [PATCH 38/42] Bump ch.qos.logback:logback-classic from 1.2.7 to 1.2.13 in /examples (#235) Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.7 to 1.2.13. - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.7...v_1.2.13) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephen Colebourne --- examples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pom.xml b/examples/pom.xml index 5e23b85..42abdba 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -67,7 +67,7 @@ - 1.2.7 + 1.2.13 2.8.3 From f9a5596a532e327c792c395cc6652bb6c3c9634c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:31:06 +0100 Subject: [PATCH 39/42] Bump ch.qos.logback:logback-classic from 1.2.9 to 1.2.13 in /modules (#234) Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13. - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 90c25e9..abf9ae1 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -418,7 +418,7 @@ 2.10.0 2.8.3 5.9.1 - 1.2.9 + 1.2.13 1.7.36 3.14.9 2.10.0 From d9d20fe061fc998b201e590e227d650e395577e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:01:13 +0100 Subject: [PATCH 40/42] Bump org.junit:junit-bom from 5.9.1 to 5.10.2 (#228) Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.9.1 to 5.10.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.10.2) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index abf9ae1..14b4a6f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -417,7 +417,7 @@ 2.2.3 2.10.0 2.8.3 - 5.9.1 + 5.10.2 1.2.13 1.7.36 3.14.9 From 3b6c130892639f37fe67019303dfdb5188f5b5e3 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Mon, 12 Aug 2024 14:41:26 +0100 Subject: [PATCH 41/42] PROD-40335: Replace ogbot with Mergify --- .github/dependabot.yml | 5 +---- .github/mergify.yml | 7 +++++-- .github/workflows/ogbot.yml | 14 -------------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/ogbot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 992c2c8..52f8d80 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,4 @@ updates: interval: weekly time: "02:30" open-pull-requests-limit: 20 - reviewers: - - jodastephen - assignees: - - jodastephen + rebase-strategy: "disabled" diff --git a/.github/mergify.yml b/.github/mergify.yml index e4a4747..aa8e092 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,11 +1,13 @@ queue_rules: - name: default - conditions: + merge_conditions: - "label=auto-merge" - "check-success=build" + merge_method: squash pull_request_rules: - name: Auto-Merge + description: Merge branch once conditions pass conditions: - "label=auto-merge" - "status-success=build" @@ -14,9 +16,10 @@ pull_request_rules: - "title~=^((?!(wip|WIP)).)*$" actions: queue: - method: squash name: default + - name: Delete-Branch + description: Delete branch once PR merged conditions: - "merged" actions: diff --git a/.github/workflows/ogbot.yml b/.github/workflows/ogbot.yml deleted file mode 100644 index 18aa933..0000000 --- a/.github/workflows/ogbot.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: ogbot - -on: - pull_request: - types: [opened, reopened, edited, synchronize] - -jobs: - pr: - runs-on: ubuntu-latest - permissions: write-all - steps: - - uses: OpenGamma/OGBot@main - with: - token: ${{ secrets.GITHUB_TOKEN }} From 78ea00ff5132282b799beeb8c793b514f67e9a12 Mon Sep 17 00:00:00 2001 From: ryan-mor <137769362+ryan-mor@users.noreply.github.com> Date: Wed, 9 Jul 2025 09:18:18 +0100 Subject: [PATCH 42/42] Fix releases (#256) Co-authored-by: Ryan Morrice --- .circleci/maven-settings.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/maven-settings.xml b/.circleci/maven-settings.xml index 00c0e75..40b683f 100644 --- a/.circleci/maven-settings.xml +++ b/.circleci/maven-settings.xml @@ -4,7 +4,7 @@ https://maven.apache.org/xsd/settings-1.0.0.xsd"> - oss-sonatype + central ${env.OSS_SONATYPE_USER} ${env.OSS_SONATYPE_PASSWORD} diff --git a/pom.xml b/pom.xml index 9b23d86..1ec9f25 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.opengamma corporate-parent - 2.8.1 + 3.0.3 com.opengamma.sdk