From e4a4de6eab81084fc7a1d7daffe14da8183118c1 Mon Sep 17 00:00:00 2001 From: StinkyLord <42116482+PhilipAbed@users.noreply.github.com> Date: Mon, 28 Feb 2022 20:01:48 +0200 Subject: [PATCH] fix(manager/sbt): group PRs by variable instead of variable+groupid together (#14339) --- lib/manager/sbt/__snapshots__/extract.spec.ts.snap | 14 +++++++------- lib/manager/sbt/extract.spec.ts | 2 +- lib/manager/sbt/extract.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/manager/sbt/__snapshots__/extract.spec.ts.snap b/lib/manager/sbt/__snapshots__/extract.spec.ts.snap index c554afc830..8801059fff 100644 --- a/lib/manager/sbt/__snapshots__/extract.spec.ts.snap +++ b/lib/manager/sbt/__snapshots__/extract.spec.ts.snap @@ -26,7 +26,7 @@ Object { "currentValue": "1.2.3", "datasource": "sbt-package", "depName": "com.abc:abc", - "groupName": "abcVersion for com.abc", + "groupName": "abcVersion", "lookupName": "com.abc:abc", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", @@ -63,7 +63,7 @@ Object { "currentValue": "1.2.3", "datasource": "sbt-package", "depName": "com.abc:abc", - "groupName": "abcVersion for com.abc", + "groupName": "abcVersion", "lookupName": "com.abc:abc", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", @@ -73,7 +73,7 @@ Object { "currentValue": "1.2.3", "datasource": "sbt-package", "depName": "com.abc:abc-a", - "groupName": "abcVersion for com.abc", + "groupName": "abcVersion", "lookupName": "com.abc:abc-a", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", @@ -83,7 +83,7 @@ Object { "currentValue": "1.2.3", "datasource": "sbt-package", "depName": "com.abc:abc-b", - "groupName": "abcVersion for com.abc", + "groupName": "abcVersion", "lookupName": "com.abc:abc-b", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", @@ -93,7 +93,7 @@ Object { "currentValue": "1.2.3", "datasource": "sbt-package", "depName": "com.abc:abc-c", - "groupName": "abcVersion for com.abc", + "groupName": "abcVersion", "lookupName": "com.abc:abc-c", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", @@ -242,7 +242,7 @@ Object { "datasource": "sbt-package", "depName": "org.example:grault", "depType": "Test", - "groupName": "versionExample for org.example", + "groupName": "versionExample", "lookupName": "org.example:grault", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", @@ -396,7 +396,7 @@ Object { "datasource": "sbt-package", "depName": "org.example:grault", "depType": "Test", - "groupName": "versionExample for org.example", + "groupName": "versionExample", "lookupName": "org.example:grault", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", diff --git a/lib/manager/sbt/extract.spec.ts b/lib/manager/sbt/extract.spec.ts index 82d4ece576..dd2064face 100644 --- a/lib/manager/sbt/extract.spec.ts +++ b/lib/manager/sbt/extract.spec.ts @@ -93,7 +93,7 @@ describe('manager/sbt/extract', () => { datasource: 'sbt-plugin', depName: 'com.github.gseitz:sbt-release', depType: 'plugin', - groupName: 'sbtReleaseVersion for com.github.gseitz', + groupName: 'sbtReleaseVersion', lookupName: 'com.github.gseitz:sbt-release', registryUrls: [ 'https://repo.maven.apache.org/maven2', diff --git a/lib/manager/sbt/extract.ts b/lib/manager/sbt/extract.ts index 8f17ca5a4b..f019da482c 100644 --- a/lib/manager/sbt/extract.ts +++ b/lib/manager/sbt/extract.ts @@ -211,7 +211,7 @@ function parseDepExpr( }; if (variables[rawVersion]) { - result.groupName = `${rawVersion} for ${groupId}`; + result.groupName = `${rawVersion}`; } if (depType) { -- GitLab