From 3660a509a3292b5bd5f4e47261e81a45ff3a697e Mon Sep 17 00:00:00 2001 From: Victor Sollerhed <victor.sollerhed@gmail.com> Date: Thu, 21 Nov 2024 16:01:58 +0100 Subject: [PATCH] fix: Revert "feat(manager/asdf): add support for java semeru and semeru-jre" (#32656) --- lib/modules/manager/asdf/extract.spec.ts | 26 ------------------- .../manager/asdf/upgradeable-tooling.ts | 20 -------------- 2 files changed, 46 deletions(-) diff --git a/lib/modules/manager/asdf/extract.spec.ts b/lib/modules/manager/asdf/extract.spec.ts index 78dfb20a73..680444d4da 100644 --- a/lib/modules/manager/asdf/extract.spec.ts +++ b/lib/modules/manager/asdf/extract.spec.ts @@ -818,32 +818,6 @@ awscli 2.8.6 }, ], }); - const semeruJdkRes = extractPackageFile( - 'java semeru-openj9-17.0.8.1+1_openj9-0.40.0', - ); - expect(semeruJdkRes).toEqual({ - deps: [ - { - currentValue: '17.0.8.1+1', - datasource: 'java-version', - depName: 'java', - packageName: 'java-jdk', - }, - ], - }); - const semeruJreRes = extractPackageFile( - 'java semeru-jre-openj9-17.0.8.1+1_openj9-0.40.0', - ); - expect(semeruJreRes).toEqual({ - deps: [ - { - currentValue: '17.0.8.1+1', - datasource: 'java-version', - depName: 'java', - packageName: 'java-jre', - }, - ], - }); const temurinJdkRes = extractPackageFile('java temurin-16.0.0+36'); expect(temurinJdkRes).toEqual({ deps: [ diff --git a/lib/modules/manager/asdf/upgradeable-tooling.ts b/lib/modules/manager/asdf/upgradeable-tooling.ts index 0a5f371c43..ba4ac276d9 100644 --- a/lib/modules/manager/asdf/upgradeable-tooling.ts +++ b/lib/modules/manager/asdf/upgradeable-tooling.ts @@ -365,26 +365,6 @@ export const upgradeableTooling: Record<string, ToolingDefinition> = { currentValue: adoptOpenJreMatches.version, }; } - const semeruJdkMatches = version.match( - /^semeru-openj9-(?<version>\d\S+)_openj9-(?<openj9>\d\S+)/, - )?.groups; - if (semeruJdkMatches) { - return { - datasource: JavaVersionDatasource.id, - packageName: 'java-jdk', - currentValue: semeruJdkMatches.version, - }; - } - const semeruJreMatches = version.match( - /^semeru-jre-openj9-(?<version>\d\S+)_openj9-\d\S+/, - )?.groups; - if (semeruJreMatches) { - return { - datasource: JavaVersionDatasource.id, - packageName: 'java-jre', - currentValue: semeruJreMatches.version, - }; - } const temurinJdkMatches = version.match( /^temurin-(?<version>\d\S+)/, )?.groups; -- GitLab