Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

| Version | Number | Status |
| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
| Spring Bot (Spring Boot V3) | [![Maven Central](https://img.shields.io/maven-central/v/org.finos.springbot/spring-bot)](https://search.maven.org/search?q=org.finos.springbot) | ![build](https://github.com/finos/spring-bot/actions/workflows/build.yml/badge.svg) |
| Spring Bot (Spring Boot V4) | [![Maven Central](https://img.shields.io/maven-central/v/org.finos.springbot/spring-bot)](https://search.maven.org/search?q=org.finos.springbot) | ![build](https://github.com/finos/spring-bot/actions/workflows/build.yml/badge.svg) |
| Spring Bot (Spring Boot V3) | [![Maven Central](https://img.shields.io/maven-central/v/org.finos.springbot/spring-bot?versionPrefix=10)](https://search.maven.org/search?q=org.finos.springbot) | ![build](https://github.com/finos/spring-bot/actions/workflows/build.yml/badge.svg) |
| Spring Bot (Spring Boot V2) | [![Maven Central](https://img.shields.io/maven-central/v/org.finos.springbot/spring-bot?versionPrefix=9)](https://search.maven.org/search?q=org.finos.springbot) | ![build](https://github.com/finos/spring-bot/actions/workflows/build.yml/badge.svg) |
| Symphony Java Toolkit | [![Maven Central](https://img.shields.io/maven-central/v/org.finos.symphony.toolkit/symphony-java-toolkit)](https://search.maven.org/search?q=org.finos.symphony.toolkit) | ![build](https://github.com/finos/spring-bot/actions/workflows/build.yml/badge.svg?branch=symphony-java-toolkit-master) |

Expand Down Expand Up @@ -159,6 +160,16 @@ mvn -DskipTests clean test source:jar javadoc:javadoc deploy -P symphony-release
mvn versions:set -DnewVersion=<our breaking change no>.<symphony-api-version>.<our-release-no+1>-SNAPSHOT -DartifactId=\* -DgroupId=\*
# then PR spring-bot-master branch with the new version number
```
OR

```
#create your version tag and push that tag on spring-bot-master branch
mvn clean test
mvn versions:set -DnewVersion=<our breaking change no>.<minor version no>.<our-patch-version-no> -DartifactId=\* -DgroupId=\*
git tag <our breaking change no>.<minor version no>.<our-patch-version-no>
git push origin <our breaking change no>.<minor version no>.<our-patch-version-no>
mvn versions:set -DnewVersion=<our breaking change no>.<symphony-api-version>.<our-release-no+1>-SNAPSHOT -DartifactId=\* -DgroupId=
```

3. SECURITY.md

Expand Down
6 changes: 3 additions & 3 deletions demos/claim-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -33,12 +33,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions demos/custom-help-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -29,13 +29,13 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -28,13 +28,13 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions demos/rooms-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions demos/todo-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
14 changes: 7 additions & 7 deletions libs/chat-workflow-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down Expand Up @@ -56,32 +56,32 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow-testing</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entities</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions libs/chat-workflow-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.validation.Validator;

/**
Expand All @@ -46,7 +46,7 @@ public class TestTableEdit {
private TestObjects to;
private EntityJson toWrapper;

@MockBean
@MockitoBean
Validator v;

@Autowired
Expand All @@ -58,7 +58,7 @@ public class TestTableEdit {
@Autowired
TableAddRow addRows;

@MockBean
@MockitoBean
ResponseHandlers rh;

Chat room = null;
Expand Down
14 changes: 11 additions & 3 deletions libs/chat-workflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -49,7 +49,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>

</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion libs/entity-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand All @@ -22,12 +22,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entities</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.symphony.bdk</groupId>
Expand All @@ -43,7 +43,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow-testing</artifactId>
<version>10.0.4-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading
Loading