Tweaked docs, bumped version

Author: robmoffat

CHANGES.md

@@ -134,4 +134,8 @@
  - Fix for #163, Error Reporting Could Be Better with some update
  - Fix for #182, Symphony Chat Workflow Annotations Documentation
 
- 
+## Jun 24, 2021
+ - Fix for #190, Chat Workflow documentation in the wrong place
+ - Fix for #180, Kore AI Bot Health Unreliable
+ - Fix for #171, Chat Workflow Delete/Checkbox alignment display
+ - Fix for #141, Handle Primitives in Chat Workflow

README.md

@@ -4,28 +4,42 @@
 ![License](https://img.shields.io/github/license/finos/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)
 
-## What This Is
+# What This Is
 
 This project is a set of libraries aimed at facilitating creating Bots and Apps for the [Symphony Chat Platform](https://symphony.com) using Java and [Spring Boot](https://spring.io/projects/spring-boot).
 
 This project contains the following:
 
-- Symphony Java Client Bindings
-- Symphony Java Client Identity
-- Symphony API Spring-Boot Starter
-- Symphony App Spring-Boot Starter
-- Symphony JSON Support
-- Symphony FIX Support
-- A Symphony Maven Build Notifier
-- A TeamCity Build Notifier
-- Symphony Shared Stream
-- Chat Workflow
-- KoreAI Connector
-- Tutorials for getting started
-- Demo bots and apps
+- **Libraries**
+  - Symphony Java Client Bindings
+  - Symphony Java Client Identity
+  - Symphony API Spring-Boot Starter
+  - Symphony App Spring-Boot Starter
+  - Symphony JSON Support
+  - Symphony FIX Support
+  - Symphony Shared Stream
+  - Chat Workflow
+  
+- **Tools**
+  - A Symphony Maven Build Notifier
+  - A TeamCity Build Notifier
+  - KoreAI Bridge Connector
+  - RSS News bot
+  - Reminder Bot (tbc)
+  - Webhook Bot (tbc)
+  
+- **Tutorials for getting started**
+
+- **Demo bots and apps**
+  - Demo Bot
+  - Demo App
+  - Claim Bot
+  - To-Do Bot
 
 Read further to see what each of these includes.
 
+# Libraries
+
 ## Overview and Dependencies
 
 Many of the components in this project rely on each other, as demonstrated in this dependency diagram.  This also gives and overviw of the purpose of each component.
@@ -91,17 +105,6 @@ Although this is not reliant on Symphony code, it is adjacent tech and so might
 
  - [View the README](libs/quickfix-json/README.md)
 
-## Maven Build Reporter
-
-Provides a maven extension that allows you to report build results into a Symphony chat room.  
-
- - [View the README](tools/symphony-maven-build-reporter/README.md)
- 
-## TeamCity Build Notifier
-
-Allows you to report your TeamCity builds into Symphony chat rooms, using a bot.
-
- - [View the README](tools/teamcity-symphony-integration/README.md)
 
 ## Symphony Shared Stream
 
@@ -117,21 +120,44 @@ This module provides a one-stop-shop for constructing work-flows in Java.  It is
  - [View the Tutorial](tutorials/Chat-Workflow.md) 
  - [Demo To-Do List Bot](demos/todo-bot/README.md)
  - [Demo Claim Bot](demos/claim-bot/README.md)
- - [RSS News Bot](tools/rss-bot/README.md)
- - [Poll Bot](tools/poll-bot/README.md)
+
+# Tools
+
+_All bots are deployed into maven central as executable jars_.
+
+## Maven Build Reporter
+
+Provides a maven extension that allows you to report build results into a Symphony chat room.  
+
+ - [View the README](tools/symphony-maven-build-reporter/README.md)
 
+## TeamCity Build Notifier
+
+Allows you to report your TeamCity builds into Symphony chat rooms, using a bot.
+
+ - [View the README](tools/teamcity-symphony-integration/README.md)
+
 ## Kore-AI Bridge
 
 This is a Spring Boot App that acts as a middleman between a Symphony bot and a KoreAI bot, allowing you to expose your KoreAI bot as a bot on Symphony.  [Kore.AI](https://kore.ai/) is a low code/no code environment for building chat bots.
 
  - [View the README](tools/koreai/README.md)
 
-## License
+## Poll Bot
 
-This project is licensed under the [Apache 2.0 License](LICENSE).
+A bot for running polls in a Symphony chat room.  Built using chat-workflow.
+
+ - [View the README](tools/poll-bot/README.md)
 
-## Running The Demo Bots
+## News (RSS) Bot
 
+A bot for feeding news into a Symphony chat room.  Built using chat-workflow.
+
+- [View the README](tools/rss-bot/README.md)
+
+# License
+
+This project is licensed under the [Apache 2.0 License](LICENSE).
 
 
 ## Releasing This Project (For Maintainers)

demos/claim-bot/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>7.20.3-SNAPSHOT</version>
+		<version>7.20.4-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>chat-workflow-spring-boot-starter</artifactId>
-			<version>7.20.3-SNAPSHOT</version>
+			<version>7.20.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

demos/demo-app/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>7.20.3-SNAPSHOT</version>
+		<version>7.20.4-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -43,7 +43,7 @@
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-app-spring-boot-starter</artifactId>
 			<scope>compile</scope>
-			<version>7.20.3-SNAPSHOT</version>
+			<version>7.20.4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

demos/demo-bot/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>7.20.3-SNAPSHOT</version>
+		<version>7.20.4-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -33,13 +33,13 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-api-spring-boot-starter</artifactId>
-			<version>7.20.3-SNAPSHOT</version>
+			<version>7.20.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>shared-stream-spring-boot-starter</artifactId>
-			<version>7.20.3-SNAPSHOT</version>
+			<version>7.20.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

demos/todo-bot/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>7.20.3-SNAPSHOT</version>
+		<version>7.20.4-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>chat-workflow-spring-boot-starter</artifactId>
-			<version>7.20.3-SNAPSHOT</version>
+			<version>7.20.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

libs/bindings/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>7.20.3-SNAPSHOT</version>
+		<version>7.20.4-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -247,7 +247,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>identity</artifactId>
-			<version>7.20.3-SNAPSHOT</version>
+			<version>7.20.4-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- excluded by spring bom, but we need it for jersey-apache-connector -->

libs/bindings/src/test/java/com/symphony/api/bindings/TokenIT.java

@@ -31,7 +31,7 @@ public void checkTokenCreation(TestClientStrategy s) throws Exception  {
 		}
 
 		// this will perform a retry, since the original tokens are invalid.
-		messagesApi.v4StreamSidMessageGet(ROOM, 0l, null,  null, 0, 100);
+		messagesApi.v4StreamSidMessageGet(ROOM, 0l, null,  null, 0, 5);
 
 		// check that tokens actually did get refreshed
 		Assertions.assertNotEquals(originalSessionToken, tm.getSessionToken());

libs/chat-workflow-spring-boot-starter/pom.xml

@@ -8,7 +8,7 @@
     <parent>
     <groupId>org.finos.symphony.toolkit</groupId>
     <artifactId>symphony-java-toolkit</artifactId>
-    <version>7.20.3-SNAPSHOT</version>
+    <version>7.20.4-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent> 
 
@@ -21,17 +21,17 @@
     <dependency>
       <groupId>org.finos.symphony.toolkit</groupId>
       <artifactId>symphony-api-spring-boot-starter</artifactId>
-      <version>7.20.3-SNAPSHOT</version>
+      <version>7.20.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.finos.symphony.toolkit</groupId>
       <artifactId>entity-json</artifactId>
-      <version>7.20.3-SNAPSHOT</version>
+      <version>7.20.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.finos.symphony.toolkit</groupId>
       <artifactId>shared-stream-spring-boot-starter</artifactId>
-      <version>7.20.3-SNAPSHOT</version>
+      <version>7.20.4-SNAPSHOT</version>
     </dependency> 
     <!-- needed for formatting messageml -->   
     <dependency>

libs/entity-json/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>7.20.3-SNAPSHOT</version>
+		<version>7.20.4-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>