feat(java): add maven version resolver (#2871)

containerbase · Jul 1, 2024 · e707443 · e707443
1 parent 04c8295
commit e707443
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/docs/custom-registries.md b/docs/custom-registries.md
@@ -278,8 +278,9 @@ The first url is preferred and the second is used as fallback for older versions
 Samples:
 
 ```txt
-https://github.com/containerbase/maven-prebuild/releases/3.0.4/maven-3.0.4.tar.xz.sha512
-https://github.com/containerbase/maven-prebuild/releases/3.0.4/maven-3.0.4.tar.xz
+https://github.com/containerbase/maven-prebuild/releases/download/3.0.4/maven-3.0.4.tar.xz.sha512
+https://github.com/containerbase/maven-prebuild/releases/download/3.0.4/maven-3.0.4.tar.xz
+https://github.com/containerbase/maven-prebuild/releases/latest/download/version
 https://archive.apache.org/dist/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
 https://archive.apache.org/dist/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz.sha1
 https://archive.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar

diff --git a/src/cli/install-tool/index.ts b/src/cli/install-tool/index.ts
@@ -17,7 +17,7 @@ import {
   GradleVersionResolver,
   InstallGradleService,
 } from '../tools/java/gradle';
-import { InstallMavenService } from '../tools/java/maven';
+import { InstallMavenService, MavenVersionResolver } from '../tools/java/maven';
 import {
   JavaJdkVersionResolver,
   JavaJreVersionResolver,
@@ -97,6 +97,7 @@ function prepareResolveContainer(): Container {
   container.bind(TOOL_VERSION_RESOLVER).to(JavaVersionResolver);
   container.bind(TOOL_VERSION_RESOLVER).to(JavaJreVersionResolver);
   container.bind(TOOL_VERSION_RESOLVER).to(JavaJdkVersionResolver);
+  container.bind(TOOL_VERSION_RESOLVER).to(MavenVersionResolver);
   container.bind(TOOL_VERSION_RESOLVER).to(NodeVersionResolver);
   container.bind(TOOL_VERSION_RESOLVER).to(YarnVersionResolver);
 

diff --git a/src/cli/tools/java/maven.ts b/src/cli/tools/java/maven.ts
@@ -1,8 +1,10 @@
 import fs from 'node:fs/promises';
 import { join } from 'node:path';
+import { isNonEmptyStringAndNotWhitespace } from '@sindresorhus/is';
 import { execa } from 'execa';
 import { inject, injectable } from 'inversify';
 import { InstallToolBaseService } from '../../install-tool/install-tool-base.service';
+import { ToolVersionResolver } from '../../install-tool/tool-version-resolver';
 import {
   CompressionService,
   EnvService,
@@ -108,3 +110,17 @@ export class InstallMavenService extends InstallToolBaseService {
     return (await fs.readFile(checksumFile, 'utf-8')).split(' ')[0]?.trim();
   }
 }
+
+@injectable()
+export class MavenVersionResolver extends ToolVersionResolver {
+  readonly tool = 'maven';
+
+  async resolve(version: string | undefined): Promise<string | undefined> {
+    if (!isNonEmptyStringAndNotWhitespace(version) || version === 'latest') {
+      return await this.http.get(
+        `https://github.com/containerbase/${this.tool}-prebuild/releases/latest/download/version`,
+      );
+    }
+    return version;
+  }
+}
diff --git a/test/java/Dockerfile b/test/java/Dockerfile
@@ -205,6 +205,7 @@ FROM base as test-latest-version
 
 RUN install-tool java-jre
 RUN install-tool gradle
+RUN install-tool maven
 
 
 #--------------------------------------