From f98a0c56f41208f41eb1e15dbe75da662b854b3e Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Tue, 3 Nov 2026 06:57:18 +0100
Subject: [PATCH 01/17] Deploy whole installation via ant maven-install

---
 nbbuild/build.xml                 | 57 ++++++++++++++++++++++++++++---
 nbbuild/default-properties.xml    |  9 +++++
 nbbuild/templates/projectized.xml |  3 +-
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 7fe00ca5b472..816348fe1d23 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -319,8 +319,7 @@ metabuild.hash=${metabuild.hash}</echo>
 
   <!-- build NBMs for selected modules -->
   <target name="build-nbms" depends="init,download-selected-extbins" description="Build all NBMs, all modules have to be built before proceed">
-      <mkdir dir="nbms" />
-      <property name="base.nbm.target.dir" location="nbms" />
+      <mkdir dir="${base.nbm.target.dir}"/>
       <property name="nbms.fail.on.error" value="true"/>
       <subant-junit target="nbm" failonerror="${nbms.fail.on.error}" report="${nb.build.dir}/build-nbms.xml" inheritall="false">
           <buildpath path="${modules.sorted}"/>
@@ -331,8 +330,7 @@ metabuild.hash=${metabuild.hash}</echo>
   </target>
 
   <target name="build-nonsigned-nbms" depends="init,download-selected-extbins" description="Build all NBMs, all modules have to be built before proceed">
-      <mkdir dir="nbms" />
-      <property name="base.nbm.target.dir" location="nbms" />
+      <mkdir dir="${base.nbm.target.dir}"/>
       <property name="nbms.fail.on.error" value="true"/>
       <subant-junit target="nbm-nosignature" failonerror="${nbms.fail.on.error}" report="${nb.build.dir}/build-nbms.xml" inheritall="false">
           <buildpath path="${modules.sorted}"/>
@@ -415,6 +413,57 @@ metabuild.hash=${metabuild.hash}</echo>
           <buildpath path="${modules.sorted}"/>
       </subant-junit>
   </target>
+
+  <target name="maven-install" depends="init" description="Finishes installation of artifacts into Maven repository">
+      <echo message="Run only after: ant build-source-zips build-nbms build-javadoc!"/>
+
+      <!--
+      Inspired by following two invocations:
+
+      # https://github.com/apache/netbeans-jenkins-lib/blob/120b7fe817075c802dbc7f8cb59d5d218249e310/vars/asfMainNetBeansBuild.groovy#L200
+      mvn org.apache.maven.plugins:maven-dependency-plugin:3.5.0:get
+        -Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}
+        -DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots
+
+      mvn org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate
+        -X ${commonparam}
+        -DnetbeansNbmDirectory=${netbeansbase}/nbms
+        -DnetbeansInstallDirectory=${netbeansbase}/netbeans
+        -DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips
+        -DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc
+        -DparentGAV=org.apache.netbeans:netbeans-parent:5
+        -DforcedVersion=${mavenVersion}
+        -DskipInstall=true
+        -DdeployId=apache.snapshots.https
+        -DdeployUrl=https://repository.apache.org/content/repositories/snapshots
+
+      # https://github.com/apache/netbeans-jenkins-lib/blob/120b7fe817075c802dbc7f8cb59d5d218249e310/vars/asfMainNetBeansBuild.groovy#L437
+      mvn org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate
+        ${commonparam}
+        -DnetbeansNbmDirectory=${netbeansbase}/nbms
+        -DnetbeansInstallDirectory=${netbeansbase}/netbeans
+        -DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips
+        -DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc
+        -DparentGAV=org.apache.netbeans:netbeans-parent:5
+        -DforcedVersion=${mavenVersion}
+        -DskipInstall=true
+        -DdeployUrl=file://${env.WORKSPACE}/mavenrepository
+
+      zip zipFile:'mavenrepo.zip',dir:'mavenrepository',archive:'true'
+      -->
+      <property name="commonparam" value=""/>
+      <exec executable="mvn">
+          <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
+          <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
+          <arg value="-DnetbeansNbmDirectory=${base.nbm.target.dir}"/>
+          <arg value="-DnetbeansSourcesDirectory=${netbeans.zipped.sources.dir}"/>
+          <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}"/>
+          <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:5"/>
+          <arg value="-DforcedVersion=${mavenVersion}"/>
+          <arg line="${commonparam}"/>
+      </exec>
+      <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository"/>
+  </target>
   
       
   <target name="check-javahelpbin" depends="init" description="Validate intermodule links in helpsets.">
diff --git a/nbbuild/default-properties.xml b/nbbuild/default-properties.xml
index 88ce933b8d3a..ff9796795098 100644
--- a/nbbuild/default-properties.xml
+++ b/nbbuild/default-properties.xml
@@ -46,10 +46,19 @@
   </condition>
   <property name="netbeans.dest.dir" location="${nb_all}/nbbuild/netbeans"/> <!-- historical location, too much work to change default -->
   <property name="netbeans.javadoc.dir" location="${nb.build.dir}/javadoc"/>
+  <property name="base.nbm.target.dir" location="nbms" />
   <property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>
 
   <property name="autoupdate.catalog.url" value="http://bits.netbeans.org/dev/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz"/>
 
+  <!--
+  Version of [NetBeans Repository Plugin](https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/nb-repository-plugin/index.html)
+  to use when handling `ant maven-install` invocation.
+  -->
+  <property name="repopluginversion" value="14.5"/>
+  <!-- default version to use when installing into Maven repository -->
+  <property name="mavenVersion" value="dev-SNAPSHOT"/>
+
   <macrodef name="resolve">
     <attribute name="name"/>
     <attribute name="value"/>
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index bdd324ce7478..b3bd2931f5d5 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -896,7 +896,6 @@
     <target name="patch-for-maven" depends="maven-install"/> <!-- deprecated -->
     <target name="maven-install" depends="init" description="Installs a -D{mavenVersion} of this module into local Maven repository">
         <property name="maven.tmp" location="${build.dir}/mvn"/>
-        <property name="mavenVersion" value="dev-SNAPSHOT"/>
         <delete dir="${maven.tmp}"/>
         <property name="maven.tmp.nbms" location="${maven.tmp}/nbms"/>
         <antcall target="nbm" inheritall="false">
@@ -928,7 +927,7 @@
             <arg value="-DnetbeansNbmDirectory=${maven.tmp.nbms}"/>
             <arg value="-DnetbeansSourcesDirectory=${maven.tmp.sources}"/>
             <arg value="-DnetbeansJavadocDirectory=${maven.tmp.javadoc}"/>
-            <arg value="org.apache.netbeans.utilities:nb-repository-plugin:14.5:populate"/>
+            <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
         </exec>
     </target>
     

From 768a4a8458f53dd013a3129d4b57d09ef2087476 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Tue, 3 Nov 2026 07:17:02 +0100
Subject: [PATCH 02/17] Provide additional arguments via mavenArgs property

---
 nbbuild/build.xml                 | 6 +++---
 nbbuild/templates/projectized.xml | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 816348fe1d23..869b120e3347 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -451,7 +451,7 @@ metabuild.hash=${metabuild.hash}</echo>
 
       zip zipFile:'mavenrepo.zip',dir:'mavenrepository',archive:'true'
       -->
-      <property name="commonparam" value=""/>
+      <property name="mavenArgs" value=""/>
       <exec executable="mvn">
           <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
@@ -460,9 +460,9 @@ metabuild.hash=${metabuild.hash}</echo>
           <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}"/>
           <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:5"/>
           <arg value="-DforcedVersion=${mavenVersion}"/>
-          <arg line="${commonparam}"/>
+          <arg line="${mavenArgs}"/>
       </exec>
-      <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository"/>
+      <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
   </target>
   
       
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index b3bd2931f5d5..21db77d29de9 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -918,6 +918,7 @@
         <condition property=".cmd" value=".cmd" else="">
           <os family="windows"/>
         </condition>
+        <property name="mavenArgs" value=""/>
         <exec executable="${maven.embedder.dir}/maven/bin/mvn${.cmd}" failonerror="true">
             <arg value="-DforcedVersion=${mavenVersion}"/>
             <arg value="-DdefineCluster=false"/>
@@ -929,6 +930,7 @@
             <arg value="-DnetbeansJavadocDirectory=${maven.tmp.javadoc}"/>
             <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
         </exec>
-    </target>
+        <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
+  </target>
     
 </project>

From 809f263701b07c7ad02e3ff6486f69776683bbd0 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Tue, 3 Nov 2026 08:48:52 +0100
Subject: [PATCH 03/17] Fail the build Ant build on Maven error

---
 nbbuild/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 869b120e3347..44eb197eed8f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -452,7 +452,7 @@ metabuild.hash=${metabuild.hash}</echo>
       zip zipFile:'mavenrepo.zip',dir:'mavenrepository',archive:'true'
       -->
       <property name="mavenArgs" value=""/>
-      <exec executable="mvn">
+      <exec executable="mvn" failonerror="true">
           <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
           <arg value="-DnetbeansNbmDirectory=${base.nbm.target.dir}"/>

From 53efb65d20ecf671dd90d3b5533c423df5834b84 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Wed, 4 Nov 2026 06:02:20 +0100
Subject: [PATCH 04/17] Expose Maven Install in the UI

---
 nbbuild/build.xml             | 1 +
 nbbuild/nbproject/project.xml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 44eb197eed8f..b39f35f63ee0 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -461,6 +461,7 @@ metabuild.hash=${metabuild.hash}</echo>
           <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:5"/>
           <arg value="-DforcedVersion=${mavenVersion}"/>
           <arg line="${mavenArgs}"/>
+          <env key="JAVA_HOME" value="${java.home}"/>
       </exec>
       <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
   </target>
diff --git a/nbbuild/nbproject/project.xml b/nbbuild/nbproject/project.xml
index 976d1a4e0fe3..b8fe340604ef 100644
--- a/nbbuild/nbproject/project.xml
+++ b/nbbuild/nbproject/project.xml
@@ -188,6 +188,10 @@
                         <label>Build IDE (no ZIP file)</label>
                         <target>build-nozip</target>
                     </action>
+                    <action>
+                        <label>Maven Install</label>
+                        <target>maven-install</target>
+                    </action>
                     <action>
                         <label>Clean Everything</label>
                         <target>clean</target>
@@ -196,10 +200,6 @@
                         <label>Run Commit Validation</label>
                         <target>commit-validation</target>
                     </action>
-                    <action>
-                        <label>apisupport</label>
-                        <target>-Dname=apisupport rebuild-cluster</target>
-                    </action>
                 </context-menu>
             </view>
             <subprojects/>

From adf8ca0b95c5dfb523aa9e8b59a1c534b8f3f91b Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Wed, 4 Nov 2026 06:20:41 +0100
Subject: [PATCH 05/17] Prefixing the properties with nbm.

---
 nbbuild/build.xml              | 8 ++++----
 nbbuild/default-properties.xml | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index b39f35f63ee0..e75675f9163f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -453,17 +453,17 @@ metabuild.hash=${metabuild.hash}</echo>
       -->
       <property name="mavenArgs" value=""/>
       <exec executable="mvn" failonerror="true">
-          <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
+          <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
           <arg value="-DnetbeansNbmDirectory=${base.nbm.target.dir}"/>
           <arg value="-DnetbeansSourcesDirectory=${netbeans.zipped.sources.dir}"/>
           <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}"/>
-          <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:5"/>
-          <arg value="-DforcedVersion=${mavenVersion}"/>
+          <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:${nbm.install.parent.version}"/>
+          <arg value="-DforcedVersion=${nbm.install.version}"/>
           <arg line="${mavenArgs}"/>
           <env key="JAVA_HOME" value="${java.home}"/>
       </exec>
-      <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
+      <echo message="Installed -Dnbm.install.version=${nbm.install.version} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
   </target>
   
       
diff --git a/nbbuild/default-properties.xml b/nbbuild/default-properties.xml
index ff9796795098..2393fb975947 100644
--- a/nbbuild/default-properties.xml
+++ b/nbbuild/default-properties.xml
@@ -55,9 +55,11 @@
   Version of [NetBeans Repository Plugin](https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/nb-repository-plugin/index.html)
   to use when handling `ant maven-install` invocation.
   -->
-  <property name="repopluginversion" value="14.5"/>
+  <property name="nbm.plugin.version" value="14.5"/>
   <!-- default version to use when installing into Maven repository -->
-  <property name="mavenVersion" value="dev-SNAPSHOT"/>
+  <property name="nbm.install.version" value="dev-SNAPSHOT"/>
+  <!-- default NBM pom parent version -->
+  <property name="nbm.install.parent.version" value="5"/>
 
   <macrodef name="resolve">
     <attribute name="name"/>

From 278e2b855e2a31b423edac02c8c130b6d1e6e6f7 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Wed, 11 Nov 2026 06:37:24 +0100
Subject: [PATCH 06/17] More explicit warning

---
 nbbuild/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index e75675f9163f..3cf49dbd9ad0 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -415,7 +415,7 @@ metabuild.hash=${metabuild.hash}</echo>
   </target>
 
   <target name="maven-install" depends="init" description="Finishes installation of artifacts into Maven repository">
-      <echo message="Run only after: ant build-source-zips build-nbms build-javadoc!"/>
+      <echo message="=== Run only after ===${line.separator} ant build-source-zips${line.separator} ant build-nbms${line.separator} ant build-javadoc${line.separator}=== Only then maven-install ===${line.separator}"/>
 
       <!--
       Inspired by following two invocations:

From 1904bd0b64721c1984133366b992a797cee6014f Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 07:40:39 +0100
Subject: [PATCH 07/17] Using nbm.plugin.version consistently

---
 nbbuild/build.xml                 | 6 +++---
 nbbuild/templates/projectized.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 3cf49dbd9ad0..6bd3940e4866 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -422,10 +422,10 @@ metabuild.hash=${metabuild.hash}</echo>
 
       # https://github.com/apache/netbeans-jenkins-lib/blob/120b7fe817075c802dbc7f8cb59d5d218249e310/vars/asfMainNetBeansBuild.groovy#L200
       mvn org.apache.maven.plugins:maven-dependency-plugin:3.5.0:get
-        -Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}
+        -Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}
         -DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots
 
-      mvn org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate
+      mvn org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate
         -X ${commonparam}
         -DnetbeansNbmDirectory=${netbeansbase}/nbms
         -DnetbeansInstallDirectory=${netbeansbase}/netbeans
@@ -438,7 +438,7 @@ metabuild.hash=${metabuild.hash}</echo>
         -DdeployUrl=https://repository.apache.org/content/repositories/snapshots
 
       # https://github.com/apache/netbeans-jenkins-lib/blob/120b7fe817075c802dbc7f8cb59d5d218249e310/vars/asfMainNetBeansBuild.groovy#L437
-      mvn org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate
+      mvn org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate
         ${commonparam}
         -DnetbeansNbmDirectory=${netbeansbase}/nbms
         -DnetbeansInstallDirectory=${netbeansbase}/netbeans
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index 21db77d29de9..cf9b53614ecf 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -928,7 +928,7 @@
             <arg value="-DnetbeansNbmDirectory=${maven.tmp.nbms}"/>
             <arg value="-DnetbeansSourcesDirectory=${maven.tmp.sources}"/>
             <arg value="-DnetbeansJavadocDirectory=${maven.tmp.javadoc}"/>
-            <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate"/>
+            <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
         </exec>
         <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
   </target>

From dd509a17192e3c0a33173cfdbfae8af16db194da Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 08:38:35 +0100
Subject: [PATCH 08/17] pass mavenArgs to the executed Maven plugin

---
 nbbuild/templates/projectized.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index cf9b53614ecf..b27f5ef32dc0 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -929,6 +929,8 @@
             <arg value="-DnetbeansSourcesDirectory=${maven.tmp.sources}"/>
             <arg value="-DnetbeansJavadocDirectory=${maven.tmp.javadoc}"/>
             <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
+            <arg line="${mavenArgs}"/>
+            <env key="JAVA_HOME" value="${java.home}"/>
         </exec>
         <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
   </target>

From 4a08e7a2da28e6e56fe2262f0efa8a1df5d669ab Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 08:43:18 +0100
Subject: [PATCH 09/17] Consistently using nbm.install.version to specify
 version of the NBM to install

---
 nbbuild/build.xml                 | 4 ++--
 nbbuild/templates/projectized.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 6bd3940e4866..7fea079d9b00 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -432,7 +432,7 @@ metabuild.hash=${metabuild.hash}</echo>
         -DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips
         -DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc
         -DparentGAV=org.apache.netbeans:netbeans-parent:5
-        -DforcedVersion=${mavenVersion}
+        -DforcedVersion=${nbm.install.version}
         -DskipInstall=true
         -DdeployId=apache.snapshots.https
         -DdeployUrl=https://repository.apache.org/content/repositories/snapshots
@@ -445,7 +445,7 @@ metabuild.hash=${metabuild.hash}</echo>
         -DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips
         -DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc
         -DparentGAV=org.apache.netbeans:netbeans-parent:5
-        -DforcedVersion=${mavenVersion}
+        -DforcedVersion=${nbm.install.version}
         -DskipInstall=true
         -DdeployUrl=file://${env.WORKSPACE}/mavenrepository
 
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index b27f5ef32dc0..c064c51fc8b9 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -894,7 +894,7 @@
     </target>
 
     <target name="patch-for-maven" depends="maven-install"/> <!-- deprecated -->
-    <target name="maven-install" depends="init" description="Installs a -D{mavenVersion} of this module into local Maven repository">
+    <target name="maven-install" depends="init" description="Installs a -D{nbm.install.version} of this module into local Maven repository">
         <property name="maven.tmp" location="${build.dir}/mvn"/>
         <delete dir="${maven.tmp}"/>
         <property name="maven.tmp.nbms" location="${maven.tmp}/nbms"/>
@@ -920,7 +920,7 @@
         </condition>
         <property name="mavenArgs" value=""/>
         <exec executable="${maven.embedder.dir}/maven/bin/mvn${.cmd}" failonerror="true">
-            <arg value="-DforcedVersion=${mavenVersion}"/>
+            <arg value="-DforcedVersion=${nbm.install.version}"/>
             <arg value="-DdefineCluster=false"/>
             <arg value="-DdependencyRepositoryId=netbeans-snapshot"/>
             <arg value="-DdependencyRepositoryUrl=https://repository.apache.org/content/groups/snapshots"/>
@@ -932,7 +932,7 @@
             <arg line="${mavenArgs}"/>
             <env key="JAVA_HOME" value="${java.home}"/>
         </exec>
-        <echo message="Installed -DmavenVersion=${mavenVersion} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
+        <echo message="Installed -Dnbm.install.version=${nbm.install.version} into Maven repository with additional -DmavenArgs=${mavenArgs}"/>
   </target>
     
 </project>

From 64dbfc7b537a101b2c42d67bcd58eee24b33a2f8 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 09:01:45 +0100
Subject: [PATCH 10/17] Avoid defining base.nbm.target.dir

---
 nbbuild/build.xml              | 8 ++++++--
 nbbuild/default-properties.xml | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 7fea079d9b00..fed20ba809aa 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -319,7 +319,8 @@ metabuild.hash=${metabuild.hash}</echo>
 
   <!-- build NBMs for selected modules -->
   <target name="build-nbms" depends="init,download-selected-extbins" description="Build all NBMs, all modules have to be built before proceed">
-      <mkdir dir="${base.nbm.target.dir}"/>
+      <mkdir dir="nbms" />
+      <property name="base.nbm.target.dir" location="nbms" />
       <property name="nbms.fail.on.error" value="true"/>
       <subant-junit target="nbm" failonerror="${nbms.fail.on.error}" report="${nb.build.dir}/build-nbms.xml" inheritall="false">
           <buildpath path="${modules.sorted}"/>
@@ -330,7 +331,8 @@ metabuild.hash=${metabuild.hash}</echo>
   </target>
 
   <target name="build-nonsigned-nbms" depends="init,download-selected-extbins" description="Build all NBMs, all modules have to be built before proceed">
-      <mkdir dir="${base.nbm.target.dir}"/>
+      <mkdir dir="nbms" />
+      <property name="base.nbm.target.dir" location="nbms" />
       <property name="nbms.fail.on.error" value="true"/>
       <subant-junit target="nbm-nosignature" failonerror="${nbms.fail.on.error}" report="${nb.build.dir}/build-nbms.xml" inheritall="false">
           <buildpath path="${modules.sorted}"/>
@@ -452,6 +454,8 @@ metabuild.hash=${metabuild.hash}</echo>
       zip zipFile:'mavenrepo.zip',dir:'mavenrepository',archive:'true'
       -->
       <property name="mavenArgs" value=""/>
+      <mkdir dir="nbms" />
+      <property name="base.nbm.target.dir" location="nbms" />
       <exec executable="mvn" failonerror="true">
           <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
diff --git a/nbbuild/default-properties.xml b/nbbuild/default-properties.xml
index 2393fb975947..a072b9eab325 100644
--- a/nbbuild/default-properties.xml
+++ b/nbbuild/default-properties.xml
@@ -46,7 +46,6 @@
   </condition>
   <property name="netbeans.dest.dir" location="${nb_all}/nbbuild/netbeans"/> <!-- historical location, too much work to change default -->
   <property name="netbeans.javadoc.dir" location="${nb.build.dir}/javadoc"/>
-  <property name="base.nbm.target.dir" location="nbms" />
   <property name="moduleCluster.file" location="${netbeans.dest.dir}/moduleCluster.properties"/>
 
   <property name="autoupdate.catalog.url" value="http://bits.netbeans.org/dev/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz"/>

From 5e51e25140b7940e1ca95b3d8ac0f35075096805 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 10:24:52 +0100
Subject: [PATCH 11/17] Invoke Maven embedder mvn command

---
 nbbuild/build.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index fed20ba809aa..d1ac604d12d3 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -456,7 +456,10 @@ metabuild.hash=${metabuild.hash}</echo>
       <property name="mavenArgs" value=""/>
       <mkdir dir="nbms" />
       <property name="base.nbm.target.dir" location="nbms" />
-      <exec executable="mvn" failonerror="true">
+      <condition property=".cmd" value=".cmd" else="">
+          <os family="windows"/>
+      </condition>
+      <exec executable="${maven.embedder.dir}/maven/bin/mvn${.cmd}" failonerror="true">
           <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
           <arg value="-DnetbeansNbmDirectory=${base.nbm.target.dir}"/>

From 86767523847d9aa547aa4c10a25d3f089be2ee8c Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 10:41:13 +0100
Subject: [PATCH 12/17] Verify ant maven-install works on all systems

---
 .github/workflows/main.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 947a973d5614..ca637d477c3c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -475,6 +475,17 @@ jobs:
         run: |
           ant $OPTS -Djavadoc.fail.broken.links=true build-javadoc
 
+      - name: Maven Install
+        run: |
+          # install all NBMs
+          ant maven-install -Dnbm.install.version=99-SNAPSHOT
+          # remove one
+          rm -r $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/
+          # install a single NBM
+          ant -f platform/openide-awt maven-install -Dnbm.install.version=99-SNAPSHOT
+          # verify pom is installed
+          cat $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/org-openide-awt-99-SNAPSHOT.pom
+
       - name: Create Test Summary
         uses: test-summary/action@37b508cfee6d4d080eedd00b5bb240a6a784a6a5 # v2.6
         if: failure()

From 2e4b6b589f25e46914852faef3dceb2a1f128b72 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 11:15:54 +0100
Subject: [PATCH 13/17] Typo in platform/openide.awt

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca637d477c3c..cfe0f91a7749 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -482,7 +482,7 @@ jobs:
           # remove one
           rm -r $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/
           # install a single NBM
-          ant -f platform/openide-awt maven-install -Dnbm.install.version=99-SNAPSHOT
+          ant -f platform/openide.awt maven-install -Dnbm.install.version=99-SNAPSHOT
           # verify pom is installed
           cat $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/org-openide-awt-99-SNAPSHOT.pom
 

From 620208e61669a55a9e4bf008e57020c20db6cca7 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 11:34:44 +0100
Subject: [PATCH 14/17] Only install Javadoc and source ZIPs when available

---
 nbbuild/build.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index d1ac604d12d3..9b8536f1709a 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -407,16 +407,18 @@ metabuild.hash=${metabuild.hash}</echo>
       <nbbrowse file="${netbeans.javadoc.dir}/index.html"/>
   </target>
 
-  <!-- build source zips for selected modules - useful for populating maven repository only-->
-  <target name="build-source-zips" depends="init" description="Builds source zips for maven repository inclusion.">
+  <target name="-init-sources-zip" depends="init">
       <property name="netbeans.zipped.sources.dir" location="${nb.build.dir}/source-zips" />
-      
+  </target>
+
+  <!-- build source zips for selected modules - useful for populating maven repository only-->
+  <target name="build-source-zips" depends="init,-init-sources-zip" description="Builds source zips for maven repository inclusion.">
       <subant-junit target="sources-zip" failonerror="true">
           <buildpath path="${modules.sorted}"/>
       </subant-junit>
   </target>
 
-  <target name="maven-install" depends="init" description="Finishes installation of artifacts into Maven repository">
+  <target name="maven-install" depends="init,-init-sources-zip" description="Finishes installation of artifacts into Maven repository">
       <echo message="=== Run only after ===${line.separator} ant build-source-zips${line.separator} ant build-nbms${line.separator} ant build-javadoc${line.separator}=== Only then maven-install ===${line.separator}"/>
 
       <!--
@@ -459,12 +461,18 @@ metabuild.hash=${metabuild.hash}</echo>
       <condition property=".cmd" value=".cmd" else="">
           <os family="windows"/>
       </condition>
+      <condition property="exists.netbeansSourcesDirectory" value="true" else="false">
+          <available file="${netbeans.zipped.sources.dir}"/>
+      </condition>
+      <condition property="exists.netbeansJavadocDirectory" value="true" else="false">
+          <available file="${netbeans.javadoc.dir}"/>
+      </condition>
       <exec executable="${maven.embedder.dir}/maven/bin/mvn${.cmd}" failonerror="true">
           <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
           <arg value="-DnetbeansNbmDirectory=${base.nbm.target.dir}"/>
-          <arg value="-DnetbeansSourcesDirectory=${netbeans.zipped.sources.dir}"/>
-          <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}"/>
+          <arg value="-DnetbeansSourcesDirectory=${netbeans.zipped.sources.dir}" if:true="exists.netbeansSourcesDirectory"/>
+          <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}" if:true="exists.netbeansJavadocDirectory"/>
           <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:${nbm.install.parent.version}"/>
           <arg value="-DforcedVersion=${nbm.install.version}"/>
           <arg line="${mavenArgs}"/>

From b0dc170b860dbe25444deee9cd068f70ff35ae16 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 16:31:26 +0100
Subject: [PATCH 15/17] if:true compares against the evaluated value

---
 nbbuild/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 9b8536f1709a..414da5dacb57 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -471,8 +471,8 @@ metabuild.hash=${metabuild.hash}</echo>
           <arg value="org.apache.netbeans.utilities:nb-repository-plugin:${nbm.plugin.version}:populate"/>
           <arg value="-DnetbeansInstallDirectory=${netbeans.dest.dir}"/>
           <arg value="-DnetbeansNbmDirectory=${base.nbm.target.dir}"/>
-          <arg value="-DnetbeansSourcesDirectory=${netbeans.zipped.sources.dir}" if:true="exists.netbeansSourcesDirectory"/>
-          <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}" if:true="exists.netbeansJavadocDirectory"/>
+          <arg value="-DnetbeansSourcesDirectory=${netbeans.zipped.sources.dir}" if:true="${exists.netbeansSourcesDirectory}"/>
+          <arg value="-DnetbeansJavadocDirectory=${netbeans.javadoc.dir}" if:true="${exists.netbeansJavadocDirectory}"/>
           <arg value="-DparentGAV=org.apache.netbeans:netbeans-parent:${nbm.install.parent.version}"/>
           <arg value="-DforcedVersion=${nbm.install.version}"/>
           <arg line="${mavenArgs}"/>

From b8ed5b4734f41657972c695cccc474ffdfaaf37e Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Thu, 12 Nov 2026 19:05:42 +0100
Subject: [PATCH 16/17] Replacing no longer available deadlock server with a
 ever valid m2: URL scheme

---
 nbbuild/templates/projectized.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index c064c51fc8b9..fedd35136998 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -234,8 +234,7 @@
         <condition property="nbm.distribution" value="${dist.base}/${nbm}"> <!-- compatibility -->
             <isset property="dist.base"/>
         </condition>
-        <property name="dist.base.structured" value="http://deadlock.netbeans.org/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms"/>
-        <property name="nbm.distribution" value="${dist.base.structured}/${cluster.dir}/${nbm}"/>
+        <property name="nbm.distribution" value="m2:/org.netbeans.modules:${code.name.base.dashes}:${nbm.install.version}:nbm"/>
         <property name="nbm.module.author" value=""/>
         <property name="nbm.release.date" value=""/>
         <property name="nbm.needs.restart" value="false"/>

From 82f62876cda5a2240c8d9fe347239a620f309fbb Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Fri, 13 Nov 2026 08:26:36 +0100
Subject: [PATCH 17/17] Verify ant maven-install just after building the NBMs

---
 .github/workflows/main.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cfe0f91a7749..53a236a5abdd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -456,6 +456,17 @@ jobs:
       - name: Build nbms
         run: ant $OPTS build-nbms
 
+      - name: Maven Install
+        run: |
+          # install all NBMs
+          ant maven-install -Dnbm.install.version=99-SNAPSHOT
+          # remove one
+          rm -r $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/
+          # install a single NBM
+          ant -f platform/openide.awt maven-install -Dnbm.install.version=99-SNAPSHOT
+          # verify pom is installed
+          cat $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/org-openide-awt-99-SNAPSHOT.pom
+
       # runs only in PRs if requested; ~18 min
       - name: Build all Tests
         if: env.test_tests == 'true' && github.event_name == 'pull_request' && success()
@@ -475,17 +486,6 @@ jobs:
         run: |
           ant $OPTS -Djavadoc.fail.broken.links=true build-javadoc
 
-      - name: Maven Install
-        run: |
-          # install all NBMs
-          ant maven-install -Dnbm.install.version=99-SNAPSHOT
-          # remove one
-          rm -r $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/
-          # install a single NBM
-          ant -f platform/openide.awt maven-install -Dnbm.install.version=99-SNAPSHOT
-          # verify pom is installed
-          cat $HOME/.m2/repository/org/netbeans/api/org-openide-awt/99-SNAPSHOT/org-openide-awt-99-SNAPSHOT.pom
-
       - name: Create Test Summary
         uses: test-summary/action@37b508cfee6d4d080eedd00b5bb240a6a784a6a5 # v2.6
         if: failure()