From 468497051c5d7b7685e7b397a7a3dfe89d9dfc9a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Jan 2022 14:20:35 +0000 Subject: [PATCH 1/2] Update dependency com.google.inject:guice to v5.1.0 --- guice/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guice/pom.xml b/guice/pom.xml index 44dff90650..4381f553ee 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -13,7 +13,7 @@ 1.1.2 - 5.0.1 + 5.1.0 2.2 5.8.2 io.cucumber.guice From 2f64ae2695f2b4d2efb8bc0c169520cb3991560b Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Sun, 30 Jan 2022 15:36:28 +0100 Subject: [PATCH 2/2] Ignore changes to guice api --- .revapi/api-changes.json | 28 +++++++++++++++++++++++++++- CHANGELOG.md | 2 ++ pom.xml | 4 ++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.revapi/api-changes.json b/.revapi/api-changes.json index ceb56cc81c..f3ea0594b8 100644 --- a/.revapi/api-changes.json +++ b/.revapi/api-changes.json @@ -160,7 +160,6 @@ "new": "missing-class com.google.inject.Stage", "justification": "Guice is an optional TestNG dependency" }, - { "ignore": true, "code": "java.method.removed", @@ -237,5 +236,32 @@ ] } } + ], + "guice": [ + { + "extension": "revapi.differences", + "id": "guice-api-issues", + "ignore": true, + "configuration": { + "differences": [ + { + "ignore": true, + "code": "java.annotation.added", + "old": "class com.google.inject.Key", + "new": "class com.google.inject.Key", + "annotation": "@com.google.errorprone.annotations.CheckReturnValue", + "justification": "It's Google." + }, + { + "ignore": true, + "regex": true, + "code": "java.field.enumConstantOrderChanged", + "old": "field com\\.google\\.inject\\.internal\\.ErrorId\\..*", + "new": "field com\\.google\\.inject\\.internal\\.ErrorId\\..*", + "justification": "It's Google." + } + ] + } + } ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index bcf815cbc9..9a254d5606 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). * Update dependency io.cucumber:ci-environment to v9 ([#2475](https://github.com/cucumber/cucumber-jvm/pull/2475) M.P. Korstanje) * Update dependency io.cucumber:html-formatter to v18 ([#2476](https://github.com/cucumber/cucumber-jvm/pull/2476) M.P. Korstanje) - Removed work around for 'Uncaught TypeError: e.git is undefined' +* Update dependency com.google.inject:guice to v5.1.0 ([#2473](https://github.com/cucumber/cucumber-jvm/pull/2473) M.P. Korstanje) +* Update dependency org.testng:testng to v7.5 ([#2457](https://github.com/cucumber/cucumber-jvm/pull/2457) M.P. Korstanje) ### Deprecated diff --git a/pom.xml b/pom.xml index 30de1bec5f..477bd06d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -376,6 +376,9 @@ true + + true + @@ -385,6 +388,7 @@ 7.2.0 internal testng + guice