Do the JOSM mvn build in the josm_build action

Signed-off-by: Taylor Smock <smocktaylor@gmail.com>

Author: tsmock

.github/workflows/ant.yml

@@ -165,12 +165,11 @@ jobs:
       run: |
         set -ex
         cd $GITHUB_WORKSPACE/josm/plugins/${{ inputs.plugin-directory }}
-        svn up ../../core
+        svn up ../../core/tools
         ls ../..
         ls ../../core
         ls ../../core/tools
         ls ../../core/tools/checkstyle
-        mvn --file ../../core/pom.xml package install -DskipTests
         mvn --file pom.xml package javadoc:jar source:jar -DskipTests -Dplugin.dist.dir=../../dist -Dplugin.version=${{ steps.version.outputs.version }}
         mv target/${{ inputs.plugin-jar-name }}-*-sources.jar ../../dist/${{ inputs.plugin-jar-name }}-sources.jar
         mv target/${{ inputs.plugin-jar-name }}-*-javadoc.jar ../../dist/${{ inputs.plugin-jar-name }}-javadoc.jar

.github/workflows/internal_ant.yml

@@ -165,12 +165,11 @@ jobs:
       run: |
         set -ex
         cd $GITHUB_WORKSPACE/josm/plugins/${{ inputs.plugin-directory }}
-        svn up ../../core
+        svn up ../../core/tools
         ls ../..
         ls ../../core
         ls ../../core/tools
         ls ../../core/tools/checkstyle
-        mvn --file ../../core/pom.xml package install -DskipTests
         mvn --file pom.xml package javadoc:jar source:jar -DskipTests -Dplugin.dist.dir=../../dist -Dplugin.version=${{ steps.version.outputs.version }}
         mv target/${{ inputs.plugin-jar-name }}-*-sources.jar ../../dist/${{ inputs.plugin-jar-name }}-sources.jar
         mv target/${{ inputs.plugin-jar-name }}-*-javadoc.jar ../../dist/${{ inputs.plugin-jar-name }}-javadoc.jar

actions/josm_build/dist/index.js

@@ -61,18 +61,28 @@ async function buildJosm(
     info("Cache hit for " + buildHit);
     return;
   }
-  const ivyFiles = await hashFiles("**/ivy.xml");
+  const ivyFiles = await hashFiles("**/ivy.xml\n**/pom.xml");
   const ivyHit = await restoreCache(
-    ["~/.ivy2/cache", "~/.ant/cache", josmSource + "/tools"],
+    ["~/.ivy2/cache", "~/.ant/cache", "~/.m2", josmSource + "/tools"],
     `${process.platform}-${process.arch}-ivy-${ivyFiles}`,
   );
   if (ivyHit == null || ivyHit === "") {
     await exec("ant", ["-buildfile", josmSource + "/build.xml", "resolve"]);
+    await exec("mvn", ["clean", "validate"]);
     await saveCache(
-      ["~/.ivy2/cache", "~/.ant/cache", josmSource + "/tools"],
+      ["~/.ivy2/cache", "~/.ant/cache", "~/.m2", josmSource + "/tools"],
       `${process.platform}-${process.arch}-ivy-${ivyFiles}`,
     );
   }
+  // Build with maven
+  await exec("mvn", [
+    "--file",
+    josmSource + "/pom.xml",
+    "package",
+    "install",
+    "-DskipTests",
+  ]);
+  // And then ant, since that is currently the "official" distribution source.
   await exec("ant", ["-buildfile", josmSource + "/build.xml", "dist"]);
   await saveCache(
     [josmSource + "/dist/josm-custom.jar"],
@@ -94,19 +104,28 @@ async function buildJosmTests(
     return;
   }
   await buildJosm(josmSource, josmRevision);
-  const ivyFiles = await hashFiles(josmSource + "/**/ivy.xml");
+  const ivyFiles = await hashFiles(
+    josmSource + "/**/ivy.xml" + "\n" + josmSource + "/**/pom.xml",
+  );
   const ivyHit = await restoreCache(
-    ["~/.ivy2/cache", "~/.ant/cache", josmSource + "/tools"],
+    ["~/.ivy2/cache", "~/.ant/cache", "~/.m2", josmSource + "/tools"],
     `${process.platform}-${process.arch}-test-ivy-${ivyFiles}`,
   );
   if (ivyHit == null || ivyHit === "") {
     await exec("ant", ["-buildfile", josmSource + "/build.xml", "test-init"]);
     await saveCache(
-      ["~/.ivy2/cache", "~/.ant/cache", josmSource + "/tools"],
+      ["~/.ivy2/cache", "~/.ant/cache", "~/.m2", josmSource + "/tools"],
       `${process.platform}-${process.arch}-test-ivy-${ivyFiles}`,
     );
   }
   await exec("ant", ["-buildfile", josmSource + "/build.xml", "test-compile"]);
+  await exec("mvn", [
+    "--file",
+    josmSource + "/test/pom.xml",
+    "package",
+    "install",
+    "-DskipTests",
+  ]);
   await saveCache([josmSource + "/test/build"], `josm-tests-r${josmRevision}`);
 }