fix: resolve propagation conflict for AI connector docs (2025.1 → 2025.2) by pabloalonso · Pull Request #3281 · bonitasoft/bonita-doc

pabloalonso · 2026-04-01T08:00:49Z

Summary

Resolves the merge conflict that broke the nightly doc propagation from 2025.1 to 2025.2
The conflict was caused by Ollama documentation (PR docs: Add Ollama AI connector documentation for 2025.2 release #3160) being added directly to 2025.2 instead of 2024.3. When the propagation merged 2025.1 (carrying the new AI providers from 2024.3: Anthropic, Azure OpenAI, Gemini, Cohere, DeepSeek, Groq) into 2025.2, both branches had modified the same sections of ai-connector.adoc differently
Resolution combines all 9 providers (OpenAI, Mistral, Ollama, Anthropic, Azure OpenAI, Gemini, Cohere, DeepSeek, Groq)
Dependency files (bonita-runtime-dependencies, portal-js-dependencies) resolved with ours strategy as intended by .gitattributes

Context

Failed propagation run: https://github.com/bonitasoft/bonita-documentation-site/actions/runs/23831233488
Once merged, the next nightly propagation should also carry changes forward from 2025.2 to 2026.1

🤖 Generated with Claude Code

This Pull Request has been created automatically. Dependency version report for Bonita Portal JS

This Pull Request has been created automatically. Dependency version report for Bonita Runtime

## Summary - Add comprehensive AsciiDoc documentation page for the new AWS S3 connector - Cover all 8 operations (Upload, Download, Delete, Copy, Head, List, Generate Presigned URL, Multipart Upload) with full input/output tables - Document three authentication modes: static IAM credentials, STS session token, and default credential chain - Add the connector to the navigation (process-nav.adoc) and the connectors index page ## Test plan - [ ] Verify the page renders correctly in the Antora preview build - [ ] Verify all xref links resolve (cross-reference validation check) - [ ] Confirm the connector card appears in the connectors index page - [ ] Confirm the navigation entry appears under Bonita official connectors 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…#3270) ## Summary Update the AI connector documentation page to include the two new LLM providers added in v1.3.0: - **Anthropic (Claude)** — Claude models via the Anthropic Messages API - **Azure OpenAI** — OpenAI models deployed in Azure subscriptions ### Changes - Add Anthropic and Azure OpenAI to the supported providers list - Add provider-specific configuration notes (API keys, endpoints, model names) - Update `chatModelName` docs with Anthropic and Azure OpenAI defaults and model links - Update `url` parameter description to cover Azure OpenAI endpoint requirements - Update page description meta ### Related - Connector repo: https://github.com/bonitasoft/bonita-connector-ai - Anthropic + Azure modules PR: bonitasoft/bonita-connector-ai#108 ## Test plan - [ ] Verify the updated page renders correctly in the Antora preview - [ ] Verify the new provider icons render (anthropic.png, azure-openai.png must exist in images/) - [ ] Verify external documentation links work 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

…3268) ## Summary - Add a `[NOTE]` box at the top of the existing REST-based SharePoint integration example page (`sharepointexample.adoc`), directing users to the new native SharePoint connector for new projects ## Related - #3267 — SharePoint connector documentation page (native connector) - Connector repo: https://github.com/bonitasoft/bonita-connector-sharepoint ## Test plan - [ ] Verify the note renders correctly in the Antora preview - [ ] Verify the xref link to `sharepoint-connector.adoc` resolves (requires #3267 to be merged first, or both merged together) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

## Summary - Add documentation page for the new JasperReports connector (`bonita-connector-jasperreports`) - Add navigation entry under **Bonita official connectors** (after Google Calendar, alphabetical) ## Content - Overview of the 5 operations and the async polling pattern - Connection configuration (HTTP Basic Auth, stateless) - Input/output parameter tables for each operation - Error handling reference table - Link to GitHub source code ## Related - Connector repo: https://github.com/bonitasoft/bonita-connector-jasperreports - Spec: https://bonitasoft.atlassian.net/wiki/spaces/BPA/pages/25035636742 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

## Summary - Add documentation page for the new **SharePoint Online** connector (`sharepoint-connector.adoc`) - Add SharePoint entry to the connectors navigation (`process-nav.adoc`) - Add SharePoint card to the connectors index page (`connectors-index.adoc`) ### Operations documented (8) **File & Folder Management:** - Upload File (simple PUT ≤4MB / resumable >4MB) - Download File - Create Folder - List Folder Contents - Delete Item **List Item Management:** - Create List Item - Get List Item - Update List Item ### Also includes - Authentication section (Client Secret + Client Certificate via Entra ID) - Required Entra App Permissions table - Common connection parameters and outputs - Error handling / retry behavior table - Import instructions ### Related - Connector repo: https://github.com/bonitasoft/bonita-connector-sharepoint - Connector spec: https://bonitasoft.atlassian.net/wiki/spaces/BPA/pages/25035309074 ## Test plan - [ ] Verify the page renders correctly in the Antora preview build - [ ] Verify navigation link appears under Bonita official connectors > SharePoint - [ ] Verify SharePoint card appears on the connectors index page - [ ] Verify all xref cross-references resolve correctly 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…#3279) ## Summary - Add Google Gemini, Cohere, DeepSeek, and Groq as new AI connector providers marked as Beta - Add provider-specific documentation sections with API key sources, default models, and Beta warning blocks - Update the chatModelName configuration table with new providers' defaults and doc links - Add placeholder provider icon images (to be replaced with actual logos) ## Notes - Icon images are placeholders copied from anthropic.png -- proper logos should be added before merge - Version noted as 1.1.1 of the AI connector extension per requirements ## Test plan - [ ] Verify the AsciiDoc renders correctly in Antora preview - [ ] Replace placeholder icons with actual provider logos - [ ] Confirm all external links are valid - [ ] Review Beta warning blocks display correctly 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

## Summary - Add comprehensive documentation for the Google Drive connector (7 operations: upload, download, get, list, create folder, move, delete) - Include step-by-step guide for Google Cloud service account setup and domain-wide delegation - Document all connection parameters, operation-specific inputs/outputs, retry behavior, and troubleshooting - Add connector to navigation menu and connector index page > **DO NOT MERGE** — This PR is in draft for review purposes only. ## Test plan - [ ] Verify the page renders correctly on the Antora documentation site - [ ] Confirm navigation links work in process-nav.adoc - [ ] Confirm the card appears correctly in connectors-index.adoc - [ ] Review parameter tables against actual connector .def files - [ ] Validate Google Cloud setup instructions against current Google Console UI 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflict in ai-connector.adoc caused by Ollama documentation (PR #3160) being added directly to 2025.2 instead of 2024.3. When the nightly propagation merged 2025.1 (carrying the new AI providers from 2024.3: Anthropic, Azure OpenAI, Gemini, Cohere, DeepSeek, Groq) into 2025.2, both branches had modified the same sections of ai-connector.adoc differently. Resolution: combine all 9 providers (OpenAI, Mistral, Ollama, Anthropic, Azure OpenAI, Gemini, Cohere, DeepSeek, Groq) in the provider list, URL defaults, and model configuration sections. The dependency files (bonita-runtime-dependencies, portal-js-dependencies) are resolved with the ours strategy as intended by .gitattributes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

github-actions · 2026-04-01T08:01:15Z

Images automagically compressed by Calibre's image-actions ✨

Compression reduced images by 10.3%, saving 204 B.

Filename	Before	After	Improvement	Visual comparison
`modules/process/images/gemini.png`	589 B	532 B	9.7%	View diff
`modules/process/images/deepseek.png`	318 B	267 B	16.0%	View diff
`modules/process/images/cohere.png`	359 B	315 B	12.3%	View diff
`modules/process/images/azure-openai.png`	449 B	411 B	8.5%	View diff
`modules/process/images/anthropic.png`	265 B	251 B	5.3%	View diff

1 image did not require optimisation.

github-actions · 2026-04-01T08:01:22Z

📝 Contribution Summary

To merge this Pull Request, you need to check your updates with the following URL.

🔗 Updated pages

Note

The following pages were updated, please ensure that the display is correct:

bonita-ci · 2026-04-01T08:02:39Z

🎊 PR Preview 0cb843d has been successfully built and deployed to https://bonitasoft-bonita-doc-deploy-pr-3281.surge.sh

🕐 Build time: 0.011s

_{🤖 By surge-preview}

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

github-actions · 2026-04-01T08:04:23Z

Images automagically compressed by Calibre's image-actions ✨

Compression reduced images by 7.7%, saving 116 B.

Filename	Before	After	Improvement	Visual comparison
`modules/process/images/azure-openai.png`	411 B	369 B	10.2%	View diff
`modules/process/images/gemini.png`	532 B	499 B	6.2%	View diff
`modules/process/images/cohere.png`	315 B	289 B	8.3%	View diff
`modules/process/images/anthropic.png`	251 B	236 B	6.0%	View diff

2 images did not require optimisation.

tbouffard · 2026-04-01T08:49:48Z

⚠️ This PR is not going to fix the propagation merge as it is going to be squashed on merge, so the merge resolution it contains won't be available in the 2025.2.
Let's talk about this in person

bonita-ci and others added 12 commits March 31, 2026 10:16

docs(uid): Add Bonita Portal JS dependencies for 2025.1 (#3275)

3acf0cd

This Pull Request has been created automatically. Dependency version report for Bonita Portal JS

docs(runtime): add Bonita Runtime dependencies for 2025.1 (#3277)

48827a2

This Pull Request has been created automatically. Dependency version report for Bonita Runtime

Merge branch '2024.3' into '2025.1'

48ac422

Optimised images with calibre/image-actions

42886a1

pabloalonso requested review from benjaminParisel and tbouffard April 1, 2026 08:02

pabloalonso and others added 2 commits April 1, 2026 10:03

fix: replace forbidden 'Bonita BPM' pattern in jasperreports-connector

0cb843d

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Optimised images with calibre/image-actions

6312669

tbouffard marked this pull request as draft April 1, 2026 08:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: resolve propagation conflict for AI connector docs (2025.1 → 2025.2)#3281

fix: resolve propagation conflict for AI connector docs (2025.1 → 2025.2)#3281
pabloalonso wants to merge 14 commits into2025.2from
fix/propagation-2025.1-to-2025.2

pabloalonso commented Apr 1, 2026

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

bonita-ci commented Apr 1, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

tbouffard commented Apr 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

pabloalonso commented Apr 1, 2026

Summary

Context

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

github-actions bot commented Apr 1, 2026

📝 Contribution Summary

🔗 Updated pages

Uh oh!

bonita-ci commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

tbouffard commented Apr 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

bonita-ci commented Apr 1, 2026 •

edited

Loading