From d4e5e7a929bf4a9d193b2517af1a4f9e2823bafb Mon Sep 17 00:00:00 2001 From: Rob Moffat Date: Wed, 3 Jun 2026 11:13:51 +0100 Subject: [PATCH 1/3] Update version to 11.0.1-SNAPSHOT and add maven-surefire-plugin configuration for test execution. Update README for release process and adjust security support status for versions. --- .vscode/settings.json | 3 ++ README.md | 19 ++---------- SECURITY.md | 5 +-- demos/claim-bot/pom.xml | 6 ++-- demos/custom-help-bot/pom.xml | 6 ++-- demos/demo-bot/pom.xml | 6 ++-- demos/rooms-bot/pom.xml | 6 ++-- demos/todo-bot/pom.xml | 6 ++-- libs/chat-workflow-coverage/pom.xml | 14 ++++----- libs/chat-workflow-testing/pom.xml | 10 +++--- libs/chat-workflow/pom.xml | 4 +-- libs/entity-json/pom.xml | 2 +- .../pom.xml | 8 ++--- libs/symphony/entities/pom.xml | 4 +-- .../pom.xml | 6 ++-- pom.xml | 31 ++++++++++--------- tools/poll-bot/pom.xml | 6 ++-- tools/reminder-bot/pom.xml | 8 ++--- tools/rss-bot/pom.xml | 4 +-- 19 files changed, 73 insertions(+), 81 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..dc3b8952a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/README.md b/README.md index ba6a310ba..4cb15deac 100644 --- a/README.md +++ b/README.md @@ -150,17 +150,7 @@ In order to do a release: - Update this file to include details of the release. -2. On Releaser's machine: - -``` -# on spring-bot-master branch -mvn clean test -mvn versions:set -DnewVersion=.. -DartifactId=\* -DgroupId=\* -mvn -DskipTests clean test source:jar javadoc:javadoc deploy -P symphony-release -mvn versions:set -DnewVersion=..-SNAPSHOT -DartifactId=\* -DgroupId=\* -# then PR spring-bot-master branch with the new version number -``` -OR +2. Add a Tag ``` #create your version tag and push that tag on spring-bot-master branch @@ -175,9 +165,4 @@ mvn versions:set -DnewVersion=.. org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -33,12 +33,12 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.apache.commons diff --git a/demos/custom-help-bot/pom.xml b/demos/custom-help-bot/pom.xml index d04dba4fd..c6bc6e6b1 100644 --- a/demos/custom-help-bot/pom.xml +++ b/demos/custom-help-bot/pom.xml @@ -7,7 +7,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../pom.xml @@ -29,13 +29,13 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT compile org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT compile diff --git a/demos/demo-bot/pom.xml b/demos/demo-bot/pom.xml index c61db86bf..e45b6c50f 100644 --- a/demos/demo-bot/pom.xml +++ b/demos/demo-bot/pom.xml @@ -7,7 +7,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../pom.xml @@ -28,13 +28,13 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT compile org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT compile diff --git a/demos/rooms-bot/pom.xml b/demos/rooms-bot/pom.xml index 8e8dd76e0..8696286e6 100644 --- a/demos/rooms-bot/pom.xml +++ b/demos/rooms-bot/pom.xml @@ -6,7 +6,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../pom.xml @@ -23,12 +23,12 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT diff --git a/demos/todo-bot/pom.xml b/demos/todo-bot/pom.xml index 5b8e26a44..096d8764d 100644 --- a/demos/todo-bot/pom.xml +++ b/demos/todo-bot/pom.xml @@ -6,7 +6,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -23,12 +23,12 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.apache.commons diff --git a/libs/chat-workflow-coverage/pom.xml b/libs/chat-workflow-coverage/pom.xml index ed19ff536..256363877 100644 --- a/libs/chat-workflow-coverage/pom.xml +++ b/libs/chat-workflow-coverage/pom.xml @@ -10,7 +10,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -56,32 +56,32 @@ org.finos.springbot chat-workflow - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot chat-workflow-testing - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot entity-json - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot entities - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT diff --git a/libs/chat-workflow-testing/pom.xml b/libs/chat-workflow-testing/pom.xml index 53e2df74f..556573e9a 100644 --- a/libs/chat-workflow-testing/pom.xml +++ b/libs/chat-workflow-testing/pom.xml @@ -9,7 +9,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -22,7 +22,7 @@ org.finos.springbot chat-workflow - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT @@ -45,9 +45,9 @@ - org.junit.jupiter - junit-jupiter-engine - + org.junit.jupiter + junit-jupiter + diff --git a/libs/chat-workflow/pom.xml b/libs/chat-workflow/pom.xml index 04dae3253..bf7ddf1e3 100644 --- a/libs/chat-workflow/pom.xml +++ b/libs/chat-workflow/pom.xml @@ -11,7 +11,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -33,7 +33,7 @@ org.finos.springbot entity-json - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.springframework.boot diff --git a/libs/entity-json/pom.xml b/libs/entity-json/pom.xml index 7ebaa2aa1..5fa0ef673 100644 --- a/libs/entity-json/pom.xml +++ b/libs/entity-json/pom.xml @@ -10,7 +10,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml index 445fadb39..f156e23fc 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml @@ -9,7 +9,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../.. @@ -22,12 +22,12 @@ org.finos.springbot chat-workflow - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot entities - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.symphony.bdk @@ -43,7 +43,7 @@ org.finos.springbot chat-workflow-testing - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT test diff --git a/libs/symphony/entities/pom.xml b/libs/symphony/entities/pom.xml index 1e9ec8927..4e967c1f1 100644 --- a/libs/symphony/entities/pom.xml +++ b/libs/symphony/entities/pom.xml @@ -10,7 +10,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../.. @@ -23,7 +23,7 @@ org.finos.springbot entity-json - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml b/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml index b6bc812e6..bbe28c3f9 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml @@ -9,7 +9,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../.. @@ -48,7 +48,7 @@ org.finos.springbot chat-workflow - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT @@ -135,7 +135,7 @@ org.finos.springbot chat-workflow-testing - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT test diff --git a/pom.xml b/pom.xml index b9dc6cb6b..21dad61f8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT pom Spring Bot @@ -114,6 +114,22 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + **/*Test.java + **/*IT.java + **/Test*.java + + + + + org.apache.maven.plugins @@ -208,18 +224,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - - **/*Test.java - **/*IT.java - **/Test*.java - - - @@ -255,5 +259,4 @@ - diff --git a/tools/poll-bot/pom.xml b/tools/poll-bot/pom.xml index d389f7966..5fc298e47 100644 --- a/tools/poll-bot/pom.xml +++ b/tools/poll-bot/pom.xml @@ -6,7 +6,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -23,12 +23,12 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT diff --git a/tools/reminder-bot/pom.xml b/tools/reminder-bot/pom.xml index 616f535f8..cbf68d6fc 100644 --- a/tools/reminder-bot/pom.xml +++ b/tools/reminder-bot/pom.xml @@ -6,7 +6,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../../pom.xml @@ -26,12 +26,12 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.finos.springbot teams-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.apache.commons @@ -80,7 +80,7 @@ org.finos.springbot chat-workflow-testing - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT test diff --git a/tools/rss-bot/pom.xml b/tools/rss-bot/pom.xml index abda8c1e5..f663ede52 100644 --- a/tools/rss-bot/pom.xml +++ b/tools/rss-bot/pom.xml @@ -6,7 +6,7 @@ org.finos.springbot spring-bot - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT ../.. @@ -23,7 +23,7 @@ org.finos.springbot symphony-bdk-chat-workflow-spring-boot-starter - 11.0.0-SNAPSHOT + 11.0.1-SNAPSHOT org.apache.commons From cd6772bec5362c0271239fbc6ffe8a15123d575c Mon Sep 17 00:00:00 2001 From: Rob Moffat Date: Wed, 3 Jun 2026 11:18:10 +0100 Subject: [PATCH 2/3] updated changes --- CHANGES.md | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a335b3f9c..8b541ca2f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -264,16 +264,50 @@ Major release of chat workflow. Most interfaces for this changed. See migratio - #416 Single Method Invoke on Multiple Chat Button - #419 Teams Upload Attachments +# Jan 15 2025 + - #435 Summary on MS Teams App — `@Work` responses can include a summary field displayed in Teams adaptive cards (SYMPHONYP-1135) + # Jan 22 2025 - - Migrate to 3.4.0 - - Vulnerability Fixes + - #455 Migrate to Spring Boot 3.4.0 (merged via #456) + - SYMPHONYP-1237 vulnerability fixes in framework dependencies + - Release 10.0.3 -# Dec 3 2025 -* Bumped version number by @robmoffat in https://github.com/finos/spring-bot/pull/458 +# Apr 30 2025 * Updated plugins for github actions by @robmoffat in https://github.com/finos/spring-bot/pull/462 * Vulnerability fix by @vaibhav-db in https://github.com/finos/spring-bot/pull/463 + +# Jul 14 2025 * SYMPHONYP-1356 vulnerability-in-spring-bot-framework by @vaibhav-db in https://github.com/finos/spring-bot/pull/464 -* Update allow-list.xml by @robmoffat in https://github.com/finos/spring-bot/pull/465 + +# Oct 3 2025 * Added credentials for github action by @robmoffat in https://github.com/finos/spring-bot/pull/470 -* Spring bot master db by @vaibhav-db in https://github.com/finos/spring-bot/pull/467 + +# Oct 29 2025 + - #468 Upgrade Spring Boot version to 3.5.5 (merged via #467, SYMPHONYP-1398) + +# Dec 3 2025 +* Bumped version number by @robmoffat in https://github.com/finos/spring-bot/pull/458 +* Update allow-list.xml by @robmoffat in https://github.com/finos/spring-bot/pull/465 + +# Dec 10 2025 +* Release 10.0.4 by @robmoffat in https://github.com/finos/spring-bot/pull/475 + +# Jan 28 2026 + - #472 Certificate-based authentication for MS Teams bots (SYMPHONYP-1416, merged via #478) + - #477 Fix certificate authentication issue in Teams bot startup and test configuration + +# Mar 18 2026 +* Added GitHub Actions release workflow by @robmoffat in https://github.com/finos/spring-bot/pull/480 +* GPG signing and Maven Central publishing plugin updates (#481–#483) + +# May 29 2026 + - Migrate to Spring Boot 4.0.x (merged via #485, SYMPHONYP-1450) + - Updated Mockito test configuration for Spring Boot 4 / `@MockitoBean` changes +* Dependency check allow-list fix by @robmoffat in https://github.com/finos/spring-bot/pull/486 + +# Jun 3 2026 +* Version 11.0.1-SNAPSHOT +* Moved `maven-surefire-plugin` configuration to `build/pluginManagement` for all modules +* Updated README release process and SECURITY.md support status +* Modify git tag commands for versioning clarity by @robmoffat in https://github.com/finos/spring-bot/pull/488 From df40ba21d3efb93888ba99a3e41f960887ef81dc Mon Sep 17 00:00:00 2001 From: Rob Moffat Date: Wed, 3 Jun 2026 11:20:50 +0100 Subject: [PATCH 3/3] Revise README.md with updated badges and project details Updated README.md to reflect new project information and badges. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cb15deac..9e43dbe87 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![FINOS - Active](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-active.svg)](https://community.finos.org/docs/governance/Software-Projects/stages/active) +[![FINOS - Graduated](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-graduated.svg)](https://community.finos.org/docs/governance/lifecycle-stages/graduated) [![codecov](https://codecov.io/gh/finos/spring-bot/branch/spring-bot-develop/graph/badge.svg?token=CSa0aaqYD0)](https://codecov.io/gh/finos/spring-bot) ![License](https://img.shields.io/github/license/finos/spring-bot) ![build](https://github.com/finos/spring-bot/actions/workflows/build.yml/badge.svg)