jsii-pacmak 1.124.0 → 1.125.0

package/lib/targets/java.d.ts

@@ -45,6 +45,23 @@ export default class Java extends Target {
     protected readonly generator: JavaGenerator;
     constructor(options: TargetOptions);
     build(sourceDir: string, outDir: string): Promise<void>;
+    /**
+     * Run the maven 'versions:resolve-ranges' plugin
+     *
+     * Initially, we generate version ranges into the pom file based on the NPM
+     * version ranges.
+     *
+     * At build time, given a dependency version range, Maven will download metadata
+     * for all possible versions before every (uncached) build. This takes a long
+     * time, before finally resolving to the latest version anyway.
+     *
+     * Instead, we use the Maven 'versions' plugin to resolve our wide ranges to
+     * point versions. We want the "latest matching" version anyway, and if we don't
+     * the resolution now (which downloads the .poms of all possible versions) it
+     * will happen during every single build.
+     */
+    resolveMavenVersions(directory: string): Promise<void>;
+    private invokeMaven;
 }
 declare class JavaGenerator extends Generator {
     private static readonly RESERVED_KEYWORDS;

package/lib/targets/java.js

@@ -67,10 +67,10 @@ class JavaBuilder {
         try {
             const tempSourceDir = await this.generateAggregateSourceDir(this.modules, this.options);
             scratchDirs.push(tempSourceDir);
-            await resolveMavenVersions(tempSourceDir.directory);
             // Need any old module object to make a target to be able to invoke build, though none of its settings
             // will be used.
             const target = this.makeTarget(this.modules[0], this.options);
+            await target.resolveMavenVersions(tempSourceDir.directory);
             const tempOutputDir = await util_1.Scratch.make(async (dir) => {
                 logging.debug(`Building Java code to ${dir}`);
                 await target.build(tempSourceDir.directory, dir);
@@ -311,30 +311,59 @@ class Java extends target_1.Target {
     }
     async build(sourceDir, outDir) {
         const url = `file://${outDir}`;
-        const mvnArguments = new Array();
+        await this.invokeMaven(sourceDir, ['deploy', `-D=altDeploymentRepository=local::default::${url}`], {
+            retry: { maxAttempts: 5 },
+        });
+    }
+    /**
+     * Run the maven 'versions:resolve-ranges' plugin
+     *
+     * Initially, we generate version ranges into the pom file based on the NPM
+     * version ranges.
+     *
+     * At build time, given a dependency version range, Maven will download metadata
+     * for all possible versions before every (uncached) build. This takes a long
+     * time, before finally resolving to the latest version anyway.
+     *
+     * Instead, we use the Maven 'versions' plugin to resolve our wide ranges to
+     * point versions. We want the "latest matching" version anyway, and if we don't
+     * the resolution now (which downloads the .poms of all possible versions) it
+     * will happen during every single build.
+     */
+    async resolveMavenVersions(directory) {
+        const versionsPluginVersion = '2.20.1';
+        await this.invokeMaven(directory, [
+            `org.codehaus.mojo:versions-maven-plugin:${versionsPluginVersion}:resolve-ranges`,
+        ], {
+            retry: { maxAttempts: 1 },
+        });
+    }
+    async invokeMaven(directory, args, options) {
+        // Pass through jsii-pacmak --mvn-xyz=... arguments as --xyz=...
+        const passThruArgs = new Array();
         for (const arg of Object.keys(this.arguments)) {
             if (!arg.startsWith('mvn-')) {
                 continue;
             }
-            mvnArguments.push(`--${arg.slice(4)}`);
-            mvnArguments.push(this.arguments[arg].toString());
+            passThruArgs.push(`--${arg.slice(4)}`);
+            passThruArgs.push(this.arguments[arg].toString());
         }
         await (0, util_1.subprocess)('mvn', [
             // If we don't run in verbose mode, turn on quiet mode
             ...(this.arguments.verbose ? [] : ['--quiet']),
             '--batch-mode',
-            ...mvnArguments,
-            'deploy',
-            `-D=altDeploymentRepository=local::default::${url}`,
+            ...args,
+            ...passThruArgs,
             '--settings=user.xml',
         ], {
-            cwd: sourceDir,
+            cwd: directory,
             env: {
                 // Twiddle the JVM settings a little for Maven. Delaying JIT compilation
                 // brings down Maven execution time by about 1/3rd (15->10s, 30->20s)
                 MAVEN_OPTS: `${process.env.MAVEN_OPTS ?? ''} -XX:+TieredCompilation -XX:TieredStopAtLevel=1`,
+                ...options?.env,
             },
-            retry: { maxAttempts: 5 },
+            ...options,
         });
     }
 }
@@ -2855,31 +2884,6 @@ function removeIntersections(x) {
     }
     return x;
 }
-/**
- * Run the maven 'versions:resolve-ranges' plugin
- *
- * Initially, we generate version ranges into the pom file based on the NPM
- * version ranges.
- *
- * At build time, given a dependency version range, Maven will download metadata
- * for all possible versions before every (uncached) build. This takes a long
- * time, before finally resolving to the latest version anyway.
- *
- * Instead, we use the Maven 'versions' plugin to resolve our wide ranges to
- * point versions. We want the "latest matching" version anyway, and if we don't
- * the resolution now (which downloads the .poms of all possible versions) it
- * will happen during every single build.
- */
-async function resolveMavenVersions(directory) {
-    const versionsPluginVersion = '2.20.1';
-    await (0, util_1.subprocess)('mvn', [
-        `org.codehaus.mojo:versions-maven-plugin:${versionsPluginVersion}:resolve-ranges`,
-        '--settings=user.xml',
-    ], {
-        cwd: directory,
-        retry: { maxAttempts: 1 },
-    });
-}
 /**
  * Whether the given property or method needs to be implemented on a $Proxy class
  *

package/lib/version.d.ts

@@ -1,5 +1,5 @@
 /** The short version number for this jsii-pacmak release (e.g: `X.Y.Z`) */
 export declare const VERSION: string;
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.124.0 (build 987897b)";
+export declare const VERSION_DESC = "1.125.0 (build fdbe357)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2025-12-30T12:06:47Z by generate.sh
+// Generated at 2026-01-05T09:57:35Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION_DESC = exports.VERSION = void 0;
 /** The short version number for this jsii-pacmak release (e.g: `X.Y.Z`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-exports.VERSION = '1.124.0';
+exports.VERSION = '1.125.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.124.0 (build 987897b)';
+exports.VERSION_DESC = '1.125.0 (build fdbe357)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.124.0",
+  "version": "1.125.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,24 +37,24 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.124.0",
-    "@jsii/spec": "1.124.0",
+    "@jsii/check-node": "1.125.0",
+    "@jsii/spec": "1.125.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.124.0",
+    "codemaker": "^1.125.0",
     "commonmark": "^0.31.2",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.124.0",
+    "jsii-reflect": "^1.125.0",
     "semver": "^7.7.2",
     "spdx-license-list": "^6.10.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.124.0",
-    "@jsii/go-runtime": "^1.124.0",
-    "@jsii/java-runtime": "^1.124.0",
-    "@scope/jsii-calc-lib": "^1.124.0",
+    "@jsii/dotnet-runtime": "^1.125.0",
+    "@jsii/go-runtime": "^1.125.0",
+    "@jsii/java-runtime": "^1.125.0",
+    "@scope/jsii-calc-lib": "^1.125.0",
     "@types/clone": "^2.1.4",
     "@types/commonmark": "^0.27.10",
     "@types/diff": "^5.2.3",
@@ -63,7 +63,7 @@
     "@types/yargs": "^17.0.33",
     "diff": "^5.2.0",
     "jsii": "^5.9.10",
-    "jsii-build-tools": "^1.124.0",
+    "jsii-build-tools": "^1.125.0",
     "jsii-calc": "^3.20.120",
     "jsii-rosetta": "~5.9.10",
     "pyright": "^1.1.403"