feat(manager/asdf): add support for java temurin and temurin-jre. (#2…

…2504)
renovatebot · Jun 1, 2023 · ef8c4ca · ef8c4ca
1 parent c14e4f7
commit ef8c4ca
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 8 deletions.
diff --git a/lib/modules/manager/asdf/extract.spec.ts b/lib/modules/manager/asdf/extract.spec.ts
@@ -548,8 +548,8 @@ dummy 1.2.3
     });
 
     it('can handle java jre / jdk', () => {
-      const jdkRes = extractPackageFile('java adoptopenjdk-16.0.0+36');
-      expect(jdkRes).toEqual({
+      const adoptOpenJdkRes = extractPackageFile('java adoptopenjdk-16.0.0+36');
+      expect(adoptOpenJdkRes).toEqual({
         deps: [
           {
             currentValue: '16.0.0+36',
@@ -559,8 +559,32 @@ dummy 1.2.3
           },
         ],
       });
-      const jreRes = extractPackageFile('java adoptopenjdk-jre-16.0.0+36');
-      expect(jreRes).toEqual({
+      const adoptOpenJreRes = extractPackageFile(
+        'java adoptopenjdk-jre-16.0.0+36'
+      );
+      expect(adoptOpenJreRes).toEqual({
+        deps: [
+          {
+            currentValue: '16.0.0+36',
+            datasource: 'java-version',
+            depName: 'java',
+            packageName: 'java-jre',
+          },
+        ],
+      });
+      const temurinJdkRes = extractPackageFile('java temurin-16.0.0+36');
+      expect(temurinJdkRes).toEqual({
+        deps: [
+          {
+            currentValue: '16.0.0+36',
+            datasource: 'java-version',
+            depName: 'java',
+            packageName: 'java-jdk',
+          },
+        ],
+      });
+      const temurinJreRes = extractPackageFile('java temurin-jre-16.0.0+36');
+      expect(temurinJreRes).toEqual({
         deps: [
           {
             currentValue: '16.0.0+36',

diff --git a/lib/modules/manager/asdf/upgradeable-tooling.ts b/lib/modules/manager/asdf/upgradeable-tooling.ts
@@ -243,22 +243,42 @@ export const upgradeableTooling: Record<string, ToolingDefinition> = {
     config: (version) => {
       const adoptOpenJdkMatches = version.match(
         /^adoptopenjdk-(?<version>\d\S+)/
-      );
+      )?.groups;
       if (adoptOpenJdkMatches) {
         return {
           datasource: JavaVersionDatasource.id,
           packageName: 'java-jdk',
-          currentValue: adoptOpenJdkMatches.groups!.version,
+          currentValue: adoptOpenJdkMatches.version,
         };
       }
       const adoptOpenJreMatches = version.match(
         /^adoptopenjdk-jre-(?<version>\d\S+)/
-      );
+      )?.groups;
       if (adoptOpenJreMatches) {
         return {
           datasource: JavaVersionDatasource.id,
           packageName: 'java-jre',
-          currentValue: adoptOpenJreMatches.groups!.version,
+          currentValue: adoptOpenJreMatches.version,
+        };
+      }
+      const temurinJdkMatches = version.match(
+        /^temurin-(?<version>\d\S+)/
+      )?.groups;
+      if (temurinJdkMatches) {
+        return {
+          datasource: JavaVersionDatasource.id,
+          packageName: 'java-jdk',
+          currentValue: temurinJdkMatches.version,
+        };
+      }
+      const temurinJreMatches = version.match(
+        /^temurin-jre-(?<version>\d\S+)/
+      )?.groups;
+      if (temurinJreMatches) {
+        return {
+          datasource: JavaVersionDatasource.id,
+          packageName: 'java-jre',
+          currentValue: temurinJreMatches.version,
         };
       }