Repository navigation
Conversation
Backport of 2f87c1e to camel-4.22.x.
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 2 tested, 0 compile-only — current: 1 all testedMaveniverse Scalpel detected 2 affected modules (current approach: 1).
|
…hot repositories Include the Windows validator timeout and process-handling fix from 7ab6c29 (CAMEL-24485).
|
The latest Windows run selected the executable JAR correctly but exposed a doubled separator in its path, failing both the classifier regression and the existing argument-preservation test. The batch script now stores The 4.22.x Ubuntu packaging step still invoked runner Maven through a child script. The workflow now pins the wrapper distribution's Maven on PATH and propagates the snapshot profile into subprocesses. The Maven-home lookup and subprocess version selection were validated locally, and workflow syntax checks pass. Fresh CI is running for these changes. The separate 4.22.x Java 17 failure was a Maven Central HTTP 502 while downloading GraalVM, rather than a test assertion failure. AI-generated by Codex on behalf of @Croway. |
Backport of #27826 to
camel-4.22.x, prepared for review while the main PR is pending.Skip sources and javadoc JARs in both launch scripts, exclude those auxiliary archives from shared distribution assembly content, and add regression tests using the existing JUnit assertion style. Enable the launcher script suites in platform CI, use the pinned Maven wrapper, and keep the snapshot profile active in test/version-evaluation steps.
Also carry the existing Windows validator timeout and process-handling fix from 7ab6c29 (CAMEL-24485): a 2700-second fork budget within a 60-minute job limit, bounded process execution and shared PowerShell cache, timing diagnostics, and archived Surefire reports. This addresses the observed 1200-second timeout on this branch.
Normalize the selected Windows launcher JAR with
%%~fi, avoiding the doubled directory separator that caused two strict path/argument assertions to fail. The tests remain unchanged.Pin the wrapper distribution's
bindirectory on the POSIX job PATH and propagateapache-snapshotsthroughMAVEN_ARGS. Packaging scripts invokemvnin child processes, so changing only direct workflow invocations did not cover those calls.Validation on macOS with Java 21 and the project Maven 3.9.16 wrapper:
../../../mvnw -o -Dtest=CamelShDiscoveryTest,CamelBatDiscoveryTest,FakeJavaTest,WebsiteInstallTest,WebsiteInstallerFixtureTest package formatter:format impsort:sortpasses on both branches (Maven reports 103 tests, zero failures/errors, 36 skipped).target/before packaging; the generated ZIP and TAR archives exclude them and retain the executable launcher and Jolokia agent.sh -n, andgit diff --checkpass.CamelBatDiscoveryTestandFakeJavaTest.PackageNativeValidationTestsuite was stopped after its host Homebrew check stalled; it remains enabled in CI.AI-generated by Codex on behalf of @Croway.