Address Maven optimization PR feedback

Make the toolchain XML generator consistently async, remove redundant Maven configuration await handling, and reuse the existing XML test helper. Configure CodeQL to skip generated dist output so newly split vendored chunks do not report duplicate generated-code alerts. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4dc58426-5e20-44cb-af16-8da0965fac3b
brunoborges · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026
commit 7eadc3b7558209465feef698f5641eb787ec1727
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+name: setup-java CodeQL configuration
+
+paths-ignore:
+  - dist/**
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -18,3 +18,5 @@ jobs:
       security-events: write
     name: CodeQL analysis
     uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main
+    with:
+      codeql-cfg-path: ./.github/codeql/codeql-config.yml
@@ -33,8 +33,8 @@ jest.unstable_mockModule('xmlbuilder2', () => {
 const toolchains = await import('../src/toolchains.js');
 
 describe('Maven XML loading', () => {
-  it('does not load xmlbuilder2 for new toolchains.xml generation', () => {
-    const xml = toolchains.generateToolchainDefinition(
+  it('does not load xmlbuilder2 for new toolchains.xml generation', async () => {
+    const xml = await toolchains.generateToolchainDefinition(
       '',
       '21',
       'temurin',

@@ -150,7 +150,7 @@ describe('toolchains tests', () => {
       )
     );
     expect(
-      toolchains.generateToolchainDefinition(
+      await toolchains.generateToolchainDefinition(
         '',
         jdkInfo.version,
         jdkInfo.vendor,
@@ -889,7 +889,7 @@ describe('toolchains tests', () => {
     expect(updated).toContain(`<jdkHome>${jdkInfo.jdkHome}</jdkHome>`);
   }, 100000);
 
-  it('generates valid toolchains.xml with minimal configuration', () => {
+  it('generates valid toolchains.xml with minimal configuration', async () => {
     const jdkInfo = {
       version: 'JAVA_VERSION',
       vendor: 'JAVA_VENDOR',
@@ -915,7 +915,7 @@ describe('toolchains tests', () => {
 </toolchains>`;
 
     expect(
-      toolchains.generateToolchainDefinition(
+      await toolchains.generateToolchainDefinition(
         '',
         jdkInfo.version,
         jdkInfo.vendor,
@@ -960,16 +960,6 @@ describe('toolchains tests', () => {
       return '';
     });
 
-    function xmlElementText(xml: string, tagName: string): string {
-      const match = new RegExp(`<${tagName}>([\\s\\S]*?)</${tagName}>`).exec(
-        xml
-      );
-      expect(match).not.toBeNull();
-      return (
-        parseXml(`<value>${match?.[1]}</value>`).root().node.textContent ?? ''
-      );
-    }
-
     await toolchains.configureToolchains(
       version,
       distributionName,
@@ -980,7 +970,7 @@ describe('toolchains tests', () => {
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(toolchainsFile)).toBe(true);
     expect(fs.readFileSync(toolchainsFile, 'utf-8')).toEqual(
-      toolchains.generateToolchainDefinition(
+      await toolchains.generateToolchainDefinition(
         '',
         version,
         distributionName,

@@ -57,7 +57,7 @@ async function createToolchainsSettings({ jdkInfo, settingsDirectory }) {
     await writeToolchainsFileToDisk(settingsDirectory, updatedToolchains);
 }
 // only exported for testing purposes
-function generateToolchainDefinition(original, version, vendor, id, jdkHome) {
+async function generateToolchainDefinition(original, version, vendor, id, jdkHome) {
     if (!original?.length) {
         return generateNewToolchainDefinition(version, vendor, id, jdkHome);
     }

@@ -36241,16 +36241,6 @@ async function run() {
     catch (error) {
         actionError = error;
     }
-    if (mavenConfiguration) {
-        try {
-            await mavenConfiguration;
-        }
-        catch (error) {
-            if (!actionError) {
-                actionError = error;
-            }
-        }
-    }
     if (cacheRestore) {
         try {
             await cacheRestore;

@@ -139,16 +139,6 @@ export async function run() {
     actionError = error as Error;
   }
 
-  if (mavenConfiguration) {
-    try {
-      await mavenConfiguration;
-    } catch (error) {
-      if (!actionError) {
-        actionError = error as Error;
-      }
-    }
-  }
-
   if (cacheRestore) {
     try {
       await cacheRestore;

@@ -64,7 +64,7 @@ export async function createToolchainsSettings({
 }
 
 // only exported for testing purposes
-export function generateToolchainDefinition(
+export async function generateToolchainDefinition(
   original: string,
   version: string,
   vendor: string,