From e6061a891f9d785823fe68ffd7fe21a5faba7a89 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 10 May 2026 05:23:46 +0000 Subject: [PATCH 1/4] Initial plan From 9b1abcee5cc79c43c0f3ba1de3aded06d24355e0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 10 May 2026 05:38:44 +0000 Subject: [PATCH 2/4] Set buildUrl Maven natively using build-helper-maven-plugin regex-property Use build-helper-maven-plugin's regex-property goal to set buildUrl property natively in Maven by replacing backslashes with forward slashes. This handles Windows path separators cross-platform without needing external scripts. - Update build-helper-maven-plugin from 3.0.0 to 3.6.0 - Add regex-property execution in initialize phase to normalize buildUrl - Change default property from file:/${user.dir} to file://${maven.multiModuleProjectDirectory} which properly points to the root project directory (where .mvn/ lives) - Remove -DbuildUrl overrides from CI workflows Agent-Logs-Url: https://github.com/eclipse-rcptt/org.eclipse.rcptt/sessions/0345c90f-0fc8-4641-a53b-bf27683b9cfd Co-authored-by: basilevs <650857+basilevs@users.noreply.github.com> --- .github/workflows/verify.yml | 4 ++-- releng/pom.xml | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 7aa7d687b..8caebc50f 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -43,7 +43,7 @@ jobs: - name: VNC run: vncserver $DISPLAY -localhost=1 -noxstartup -PasswordFile /root/.vnc/passwd - name: Build - run: ./build.sh -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress + run: ./build.sh -DforceContextQualifier=`date '+%Y%m%d%H%M'` --errors --batch-mode --no-transfer-progress - name: List all files if: always() run: find . > files.txt @@ -107,7 +107,7 @@ jobs: - name: VNC run: vncserver $DISPLAY -localhost=1 -noxstartup -PasswordFile /root/.vnc/passwd - name: Build - run: ./build.sh -PlatestPlatform -PforceContextQualifier -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress + run: ./build.sh -PlatestPlatform -PforceContextQualifier -DforceContextQualifier=`date '+%Y%m%d%H%M'` --errors --batch-mode --no-transfer-progress - name: List all files if: always() run: find . > files.txt diff --git a/releng/pom.xml b/releng/pom.xml index 5aeb19f23..fd4fb0fe4 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -39,7 +39,7 @@ 1.8 1.8 1.5.4 - file:/${user.dir} + file://${maven.multiModuleProjectDirectory} 3.9.0 @@ -210,7 +210,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.6.0 org.codehaus.mojo @@ -220,6 +220,26 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + set-build-url + initialize + + regex-property + + + buildUrl + file://${maven.multiModuleProjectDirectory} + \\ + / + false + + + + org.eclipse.dash license-tool-plugin From bd1c9523a76a5bfb323b5700302efbb4e74cab1b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 10 May 2026 12:34:21 +0000 Subject: [PATCH 3/4] Fix Windows file URI: use three slashes (file:///) to avoid authority component error On Windows, file://C:/path is invalid because C: is parsed as the URI authority. Fixed by using file:/// (3 slashes) in the regex-property value. Added a second regex-property execution to collapse file://// to file:/// on Linux where the path already starts with /. Agent-Logs-Url: https://github.com/eclipse-rcptt/org.eclipse.rcptt/sessions/db3d2482-3789-48f4-ae44-a6666fb80e91 Co-authored-by: basilevs <650857+basilevs@users.noreply.github.com> --- releng/pom.xml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/releng/pom.xml b/releng/pom.xml index fd4fb0fe4..f0f556093 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -225,19 +225,33 @@ build-helper-maven-plugin - set-build-url + set-build-url-slashes initialize regex-property buildUrl - file://${maven.multiModuleProjectDirectory} + file:///${maven.multiModuleProjectDirectory} \\ / false + + set-build-url-normalize + initialize + + regex-property + + + buildUrl + ${buildUrl} + file://// + file:/// + false + + From e784de65e7bbd047fb08e2217f925cf1d3914547 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 10 May 2026 14:07:56 +0000 Subject: [PATCH 4/4] Fix Windows build: use OS-activated profiles for buildUrl prefix The build-helper-maven-plugin regex-property runs during 'initialize' phase, but Tycho reads p2 repository URLs during 'afterProjectsRead' (before any lifecycle phase). The regex-property fix was never applied before Tycho consumed the property value. Fix: Use OS-activated Maven profiles resolved during POM construction: - unix-build-url: file:// + /path = file:///path (valid) - windows-build-url: file:/// + C:/path = file:///C:/path (valid) Keep the regex-property execution as a safety net for backslash normalization for consumers that run after the initialize phase. Agent-Logs-Url: https://github.com/eclipse-rcptt/org.eclipse.rcptt/sessions/e5c72614-5989-44aa-b281-279bc3b492bf Co-authored-by: basilevs <650857+basilevs@users.noreply.github.com> --- releng/pom.xml | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/releng/pom.xml b/releng/pom.xml index f0f556093..cf2d03bb9 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -39,7 +39,7 @@ 1.8 1.8 1.5.4 - file://${maven.multiModuleProjectDirectory} + file://${maven.multiModuleProjectDirectory} 3.9.0 @@ -225,33 +225,19 @@ build-helper-maven-plugin - set-build-url-slashes + set-build-url initialize regex-property buildUrl - file:///${maven.multiModuleProjectDirectory} + ${buildUrl} \\ / false - - set-build-url-normalize - initialize - - regex-property - - - buildUrl - ${buildUrl} - file://// - file:/// - false - - @@ -319,6 +305,26 @@ + + + unix-build-url + + unix + + + file://${maven.multiModuleProjectDirectory} + + + + + windows-build-url + + windows + + + file:///${maven.multiModuleProjectDirectory} + + update-version