From 73af5b7941bce62b5b6084cc48aabf220c2316b8 Mon Sep 17 00:00:00 2001 From: Matthias Villiger Date: Wed, 14 Feb 2024 17:18:35 +0100 Subject: [PATCH] Support build on root pom 369036, 371565 --- maven_rt_plugin_config-master/pom.xml | 41 ++++++++++++++++++++------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/maven_rt_plugin_config-master/pom.xml b/maven_rt_plugin_config-master/pom.xml index 0b5c59f..78d0d53 100644 --- a/maven_rt_plugin_config-master/pom.xml +++ b/maven_rt_plugin_config-master/pom.xml @@ -1,6 +1,6 @@ ${env.NODE_OPTIONS} https://nodejs.org/dist/ - ${project.basedir}${file.separator}${project.parent.relativePath}${file.separator}.. --progress=false --clean=false target/karma-reports @@ -155,6 +152,20 @@ + + + + + adjust-master_npm_workspace_dir-for-parent-build + + + ${basedir}${file.separator}..${file.separator}pnpm-workspace.yaml + + + + ${project.basedir}${file.separator}.. + + jandex-idx @@ -535,7 +546,7 @@ true - + @@ -553,6 +564,8 @@ generate-sources + + ${master_skip_install_node} @@ -572,7 +585,7 @@ - ${project.basedir}${file.separator}${project.parent.relativePath}${file.separator}target${file.separator}npm_update.marker + ${master_npm_workspace_dir}${file.separator}target${file.separator}npm_update.marker @@ -591,9 +604,9 @@ true - - - + + + @@ -614,6 +627,8 @@ ${master_node_dir}/node ${master_node_dir} + + ${master_skip_init_node} ${master_node_modules_dir}/npm/bin/npm-cli.js @@ -639,6 +654,8 @@ ${master_node_dir}/node ${master_npm_workspace_dir} + + ${master_skip_npm_update} ${master_node_modules_dir}/pnpm/bin/pnpm.cjs @@ -660,6 +677,8 @@ ${master_node_dir}/node ${master_npm_workspace_dir} + + ${master_skip_npm_update} ${master_node_modules_dir}/pnpm/bin/pnpm.cjs