@nx/maven 22.0.2 → 22.0.3

package/dist/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -0,0 +1,39 @@
+version: 2.1
+
+orbs:
+  nx: nrwl/nx@1.7.0
+
+env:
+  NX_BATCH_MODE: true
+
+jobs:
+  main:
+    environment:
+      # Configure the JVM to avoid OOM errors
+      _JAVA_OPTIONS: "-Xmx3g"
+      MAVEN_OPTS: "-Xmx3g"
+    docker:
+      - image: cimg/openjdk:21.0-node
+    steps:
+      - checkout
+
+      # This enables task distribution via Nx Cloud
+      # Run this command as early as possible, before dependencies are installed
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="verify-ci"
+
+      - nx/set-shas:
+          main-branch-name: '<%= mainBranch %>'
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run:
+          command: <%= command.command %><% if (command.alwaysRun) { %>
+          when: always<% } %><% } %><% } %>
+
+workflows:
+  version: 2
+
+  <%= workflowFileName %>:
+    jobs:
+      - main

package/dist/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -0,0 +1,42 @@
+name: <%= workflowName %>
+
+on:
+  push:
+    branches:
+      - <%= mainBranch %>
+  pull_request:
+
+permissions:
+  actions: read
+  contents: read
+
+env:
+  NX_BATCH_MODE: true
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          filter: tree:0
+
+      # This enables task distribution via Nx Cloud
+      # Run this command as early as possible, before dependencies are installed
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="verify-ci"
+
+      - name: Set up JDK 21 for x64
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          architecture: x64
+
+      - uses: nrwl/nx-set-shas@v4
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: <%= command.command %><% if (command.alwaysRun) { %>
+        if: always()<% } %><% } %><% } %>

package/dist/generators/ci-workflow/generator.d.ts

@@ -0,0 +1,15 @@
+import { Tree } from '@nx/devkit';
+export type Command = {
+    command?: string;
+    comments?: string[];
+    alwaysRun?: boolean;
+};
+export interface Schema {
+    name: string;
+    ci: 'github' | 'circleci';
+    packageManager?: null;
+    commands?: Command[];
+}
+export declare function ciWorkflowGenerator(tree: Tree, schema: Schema): Promise<void>;
+export default ciWorkflowGenerator;
+//# sourceMappingURL=generator.d.ts.map

package/dist/generators/ci-workflow/generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/generators/ci-workflow/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AA4CpB,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC1B,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAMnE;AAsCD,eAAe,mBAAmB,CAAC"}

package/dist/generators/ci-workflow/generator.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ciWorkflowGenerator = ciWorkflowGenerator;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
+const default_base_1 = require("nx/src/utils/default-base");
+function getCiCommands(ci) {
+    switch (ci) {
+        case 'circleci': {
+            return [
+                {
+                    comments: [
+                        `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
+                    ],
+                },
+                {
+                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t verify-ci`,
+                },
+                getNxCloudFixCiCommand(),
+            ];
+        }
+        default: {
+            return [
+                {
+                    comments: [
+                        `Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
+                    ],
+                    command: `./nx affected -t verify-ci`,
+                },
+                getNxCloudFixCiCommand(),
+            ];
+        }
+    }
+}
+function getNxCloudFixCiCommand() {
+    return {
+        comments: [
+            `Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ci/features/self-healing-ci`,
+        ],
+        command: `./nx fix-ci`,
+        alwaysRun: true,
+    };
+}
+async function ciWorkflowGenerator(tree, schema) {
+    const ci = schema.ci;
+    const options = getTemplateData(tree, schema);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', ci), '', options);
+    await (0, devkit_1.formatFiles)(tree);
+}
+function getTemplateData(tree, options) {
+    const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
+    let nxCloudHost = 'nx.app';
+    try {
+        const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readNxJson)(tree));
+        nxCloudHost = new URL(nxCloudUrl).host;
+    }
+    catch { }
+    const mainBranch = (0, default_base_1.deduceDefaultBase)();
+    const commands = options.commands ?? getCiCommands(options.ci);
+    const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, devkit_1.readNxJson)(tree));
+    return {
+        workflowName,
+        workflowFileName,
+        commands,
+        mainBranch,
+        nxCloudHost,
+        connectedToCloud,
+    };
+}
+exports.default = ciWorkflowGenerator;

package/dist/generators/ci-workflow/schema.json

@@ -0,0 +1,40 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxMavenCiWorkflowSchema",
+  "title": "Maven CI Workflow Generator",
+  "description": "Setup a CI Workflow to run Nx in CI.",
+  "type": "object",
+  "properties": {
+    "ci": {
+      "type": "string",
+      "description": "CI provider.",
+      "enum": ["github", "circleci"],
+      "x-prompt": {
+        "message": "What is your target CI provider?",
+        "type": "list",
+        "items": [
+          {
+            "value": "github",
+            "label": "GitHub Actions"
+          },
+          {
+            "value": "circleci",
+            "label": "Circle CI"
+          }
+        ]
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "Workflow name.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "default": "CI",
+      "x-prompt": "How should we name your workflow?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["ci", "name"]
+}

package/dist/generators.json

@@ -5,6 +5,11 @@
       "implementation": "./dist/generators/init/generator",
       "schema": "./dist/generators/init/schema.json",
       "description": "Initialize Maven support in an Nx workspace"
+    },
+    "ci-workflow": {
+      "implementation": "./dist/generators/ci-workflow/generator",
+      "schema": "./dist/generators/ci-workflow/schema.json",
+      "description": "Setup a CI Workflow to run Nx in CI"
     }
   }
 }

package/dist/migrations/0-0-8/update-pom-xml-version.d.ts

@@ -0,0 +1,7 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Migration for @nx/maven v0.0.8
+ * Updates the Maven plugin version from 0.0.7 to 0.0.8 in user pom.xml files
+ */
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=update-pom-xml-version.d.ts.map

package/dist/migrations/0-0-8/update-pom-xml-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-pom-xml-version.d.ts","sourceRoot":"","sources":["../../../src/migrations/0-0-8/update-pom-xml-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGlC;;;GAGG;AACH,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAE9C"}

package/dist/migrations/0-0-8/update-pom-xml-version.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const pom_xml_updater_1 = require("../../utils/pom-xml-updater");
+/**
+ * Migration for @nx/maven v0.0.8
+ * Updates the Maven plugin version from 0.0.7 to 0.0.8 in user pom.xml files
+ */
+async function update(tree) {
+    (0, pom_xml_updater_1.updateNxMavenPluginVersion)(tree, '0.0.8');
+}

package/dist/migrations/0-0-9/update-pom-xml-version.d.ts

@@ -0,0 +1,7 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Migration for @nx/maven v0.0.9
+ * Updates the Maven plugin version from 0.0.8 to 0.0.9 in user pom.xml files
+ */
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=update-pom-xml-version.d.ts.map

package/dist/migrations/0-0-9/update-pom-xml-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-pom-xml-version.d.ts","sourceRoot":"","sources":["../../../src/migrations/0-0-9/update-pom-xml-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGlC;;;GAGG;AACH,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAE9C"}

package/dist/migrations/0-0-9/update-pom-xml-version.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const pom_xml_updater_1 = require("../../utils/pom-xml-updater");
+/**
+ * Migration for @nx/maven v0.0.9
+ * Updates the Maven plugin version from 0.0.8 to 0.0.9 in user pom.xml files
+ */
+async function update(tree) {
+    (0, pom_xml_updater_1.updateNxMavenPluginVersion)(tree, '0.0.9');
+}

package/dist/plugins/dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../src/plugins/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAqB,MAAM,YAAY,CAAC;AAQnE;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBA8ChC,CAAC"}
+{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../src/plugins/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAqB,MAAM,YAAY,CAAC;AASnE;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBA2DhC,CAAC"}

package/dist/plugins/dependencies.js

@@ -4,6 +4,7 @@ exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const maven_data_cache_1 = require("./maven-data-cache");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const internal_1 = require("@nx/devkit/internal");
 const types_1 = require("./types");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const path_1 = require("path");
@@ -36,7 +37,14 @@ const createDependencies = async (options, context) => {
         return [];
     }
     devkit_1.logger.verbose('[Maven Dependencies] Found Maven data with', mavenData.createDependenciesResults.length, 'dependencies');
-    // Extract dependencies from the mavenData
-    return mavenData.createDependenciesResults;
+    // Create a mapping from project root to project name
+    const rootToProjectMap = (0, internal_1.createProjectRootMappingsFromProjectConfigurations)(context.projects);
+    // Extract and transform dependencies from the mavenData
+    const transformedDependencies = mavenData.createDependenciesResults.map((dep) => ({
+        ...dep,
+        source: rootToProjectMap.get(dep.source),
+        target: rootToProjectMap.get(dep.target),
+    }));
+    return transformedDependencies;
 };
 exports.createDependencies = createDependencies;

package/dist/utils/pom-xml-updater.d.ts

@@ -0,0 +1,10 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Updates the version of dev.nx.maven:nx-maven-plugin in pom.xml files.
+ * Only updates the version element that belongs to the nx-maven-plugin.
+ *
+ * @param tree - Nx Tree instance
+ * @param version - The new version to set
+ */
+export declare function updateNxMavenPluginVersion(tree: Tree, version: string): void;
+//# sourceMappingURL=pom-xml-updater.d.ts.map

package/dist/utils/pom-xml-updater.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pom-xml-updater.d.ts","sourceRoot":"","sources":["../../src/utils/pom-xml-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGlC;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CA2C5E"}

package/dist/utils/pom-xml-updater.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateNxMavenPluginVersion = updateNxMavenPluginVersion;
+const xmldom_1 = require("@xmldom/xmldom");
+/**
+ * Updates the version of dev.nx.maven:nx-maven-plugin in pom.xml files.
+ * Only updates the version element that belongs to the nx-maven-plugin.
+ *
+ * @param tree - Nx Tree instance
+ * @param version - The new version to set
+ */
+function updateNxMavenPluginVersion(tree, version) {
+    const pomPath = 'pom.xml';
+    if (!tree.exists(pomPath)) {
+        return;
+    }
+    const content = tree.read(pomPath, 'utf-8');
+    const parser = new xmldom_1.DOMParser();
+    const doc = parser.parseFromString(content);
+    let hasChanges = false;
+    // Find all plugin elements in the document
+    const plugins = Array.from(doc.getElementsByTagName('plugin'));
+    for (const plugin of plugins) {
+        // Check if this is the nx-maven-plugin by looking for groupId and artifactId
+        const groupId = plugin.getElementsByTagName('groupId')[0];
+        const artifactId = plugin.getElementsByTagName('artifactId')[0];
+        const isNxMavenPlugin = groupId?.textContent?.trim() === 'dev.nx.maven' &&
+            artifactId?.textContent?.trim() === 'nx-maven-plugin';
+        // If this is the nx-maven-plugin, update its version
+        if (isNxMavenPlugin) {
+            const versionElement = plugin.getElementsByTagName('version')[0];
+            const currentVersion = versionElement?.textContent?.trim();
+            if (currentVersion && currentVersion !== version) {
+                versionElement.textContent = version;
+                hasChanges = true;
+            }
+        }
+    }
+    // If content changed, write it back using XML serializer to preserve formatting
+    if (hasChanges) {
+        const serializer = new xmldom_1.XMLSerializer();
+        const updatedContent = serializer.serializeToString(doc);
+        tree.write(pomPath, updatedContent);
+    }
+}

package/dist/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
-export declare const mavenPluginVersion = "0.0.7";
+export declare const mavenPluginVersion = "0.0.9";
 //# sourceMappingURL=versions.d.ts.map

package/dist/utils/versions.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mavenPluginVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.mavenPluginVersion = '0.0.7';
+exports.mavenPluginVersion = '0.0.9';

package/generators.json

@@ -5,6 +5,11 @@
       "implementation": "./dist/generators/init/generator",
       "schema": "./dist/generators/init/schema.json",
       "description": "Initialize Maven support in an Nx workspace"
+    },
+    "ci-workflow": {
+      "implementation": "./dist/generators/ci-workflow/generator",
+      "schema": "./dist/generators/ci-workflow/schema.json",
+      "description": "Setup a CI Workflow to run Nx in CI"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/maven",
-  "version": "22.0.2",
+  "version": "22.0.3",
   "private": false,
   "description": "Nx plugin for Maven integration",
   "repository": {
@@ -45,7 +45,7 @@
   "author": "Victor Savkin",
   "license": "MIT",
   "dependencies": {
-    "@nx/devkit": "22.0.2",
+    "@nx/devkit": "22.0.3",
     "@xmldom/xmldom": "^0.8.10",
     "tslib": "^2.3.0"
   },
@@ -55,7 +55,7 @@
     "@types/xmldom": "^0.1.34",
     "jest": "^30.0.2",
     "memfs": "^4.9.2",
-    "nx": "22.0.2",
+    "nx": "22.0.3",
     "ts-jest": "^29.4.0",
     "typescript": "~5.9.2"
   },