SYMPHONYP-1126 converting spring bot 2.7.10 to spring boot 3.1.8

finos · May 27, 2024 · 90cd8ec · 90cd8ec
1 parent 424b15e
commit 90cd8ec
Show file tree

Hide file tree

Showing 29 changed files with 186 additions and 112 deletions.
diff --git a/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/NewClaim.java b/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/NewClaim.java
@@ -1,9 +1,9 @@
 package org.finos.springbot.example.claim.expenses;
 
-import javax.validation.constraints.Min;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.constraints.Min;
+
 @Work
 public class NewClaim {
 

diff --git a/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/OpenedClaim.java b/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/OpenedClaim.java
@@ -1,12 +1,12 @@
 package org.finos.springbot.example.claim.expenses;
 
-import javax.validation.constraints.Min;
-
 import org.finos.springbot.workflow.actions.Action;
 import org.finos.springbot.workflow.annotations.Display;
 import org.finos.springbot.workflow.annotations.Work;
 import org.finos.springbot.workflow.content.User;
 
+import jakarta.validation.constraints.Min;
+
 @Work
 public class OpenedClaim {
 

diff --git a/demos/todo-bot/src/main/java/org/finos/springbot/example/todo/ToDoList.java b/demos/todo-bot/src/main/java/org/finos/springbot/example/todo/ToDoList.java
@@ -6,11 +6,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.finos.springbot.workflow.annotations.RequiresUserList;
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.Valid;
+
 /**
  * @author rupnsur
  *

diff --git a/libs/chat-workflow-testing/pom.xml b/libs/chat-workflow-testing/pom.xml
@@ -14,8 +14,8 @@
 	</parent>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>
@@ -24,14 +24,31 @@
 			<artifactId>chat-workflow</artifactId>
 			<version>9.0.3-SNAPSHOT</version>
 		</dependency>
-
-		<!-- for testing -->
+
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-		</dependency>
-
+    	  	<groupId>org.springframework.boot</groupId>
+      		<artifactId>spring-boot-starter-validation</artifactId>
+    	</dependency>
+
+		<!-- for testing -->
+		<!-- exclude junit 4 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
+        <!-- junit 5 -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+
 	</dependencies>
 
 </project>
diff --git a/.../chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObject.java b/.../chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObject.java
@@ -1,10 +1,10 @@
 package org.finos.springbot.tests.controller;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.Size;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
+
 @Work()
 public class TestObject {
 

diff --git a/...chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObjects.java b/...chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObjects.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.Valid;
+
 @Work()
 public class TestObjects {
 

diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/form/Collection.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/form/Collection.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.Valid;
+
 @Work()
 public class Collection {
 

diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/IntegerWork.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/IntegerWork.java
@@ -1,10 +1,10 @@
 package org.finos.springbot.tests.work;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+
 @Work
 public class IntegerWork {
 

diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/StringWork.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/StringWork.java
@@ -1,10 +1,10 @@
 package org.finos.springbot.tests.work;
 
-import javax.validation.constraints.Pattern;
-
 import org.finos.springbot.workflow.annotations.Work;
 import org.hibernate.validator.constraints.Length;
 
+import jakarta.validation.constraints.Pattern;
+
 @Work
 public class StringWork {
 

diff --git a/libs/chat-workflow/pom.xml b/libs/chat-workflow/pom.xml
@@ -16,19 +16,15 @@
   </parent> 
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/libs/entity-json/pom.xml b/libs/entity-json/pom.xml
@@ -15,8 +15,8 @@
 	</parent>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>

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
@@ -14,8 +14,8 @@
 	</parent>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>

diff --git a/...ter/src/test/java/org/finos/springbot/symphony/controller/SymphonyHandlerMappingTest.java b/...ter/src/test/java/org/finos/springbot/symphony/controller/SymphonyHandlerMappingTest.java
@@ -1,12 +1,11 @@
 package org.finos.springbot.symphony.controller;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.symphony.bdk.core.service.message.MessageService;
-import com.symphony.bdk.core.service.message.model.Attachment;
-import com.symphony.bdk.gen.api.model.*;
-import com.symphony.bdk.spring.events.RealTimeEvent;
+import static org.mockito.Mockito.atMost;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
 import org.finos.springbot.entityjson.EntityJson;
 import org.finos.springbot.symphony.SymphonyMockConfiguration;
 import org.finos.springbot.symphony.SymphonyWorkflowConfig;
@@ -36,11 +35,20 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.util.StreamUtils;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.symphony.bdk.core.service.message.MessageService;
+import com.symphony.bdk.core.service.message.model.Attachment;
+import com.symphony.bdk.gen.api.model.StreamType;
+import com.symphony.bdk.gen.api.model.V4Initiator;
+import com.symphony.bdk.gen.api.model.V4Message;
+import com.symphony.bdk.gen.api.model.V4MessageSent;
+import com.symphony.bdk.gen.api.model.V4Stream;
+import com.symphony.bdk.gen.api.model.V4SymphonyElementsAction;
+import com.symphony.bdk.gen.api.model.V4User;
+import com.symphony.bdk.spring.events.RealTimeEvent;
 
-import static org.mockito.Mockito.atMost;
 
 
 @SpringBootTest(classes = {

diff --git a/...ow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObject.java b/...ow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObject.java
@@ -1,10 +1,10 @@
 package org.finos.springbot.symphony.history;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.Size;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
+
 @Work()
 public class TestObject {
 

diff --git a/...w-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObjects.java b/...w-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObjects.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.Valid;
+
 @Work()
 public class TestObjects {
 

diff --git a/...orkflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBean.java b/...orkflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBean.java
@@ -1,10 +1,10 @@
 package org.finos.springbot.symphony.json;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.Size;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
+
 @Work()
 public class TestBean {
 

diff --git a/...rkflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBeans.java b/...rkflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBeans.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.finos.springbot.workflow.annotations.Work;
 
+import jakarta.validation.Valid;
+
 @Work()
 public class TestBeans {
 

diff --git a/libs/symphony/entities/pom.xml b/libs/symphony/entities/pom.xml
@@ -15,8 +15,8 @@
 	</parent>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>

diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml b/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml
@@ -14,8 +14,8 @@
 	</parent>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>
@@ -32,6 +32,7 @@
 			<version>${teams.version}</version>
 			<scope>compile</scope>
 		</dependency>
+
 		<dependency>
 	        <groupId>com.microsoft.bot</groupId>
 	        <artifactId>bot-azure</artifactId>
@@ -43,15 +44,46 @@
 	        		<groupId>org.json</groupId>
 	        		<artifactId>json</artifactId>
 	        	</exclusion>
+	        	<exclusion>
+	        		<groupId>com.azure</groupId>
+	        		<artifactId>azure-storage-blob</artifactId>
+	        	</exclusion>
+	        	<exclusion>
+	        		<groupId>com.google.guava</groupId>
+	        		<artifactId>guava</artifactId>
+	        	</exclusion>
 	        </exclusions>
       	</dependency>
 		<dependency>
 			<groupId>com.microsoft.bot</groupId>
 			<artifactId>bot-builder</artifactId>
 			<version>${teams.version}</version>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.squareup.okio</groupId>
+					<artifactId>okio-jvm</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-
+
+		<dependency>
+			<groupId>com.azure</groupId>
+	  		<artifactId>azure-storage-blob</artifactId>
+	  		<version>${azure-storage-blob.version}</version>
+  		</dependency>
+		<!-- removed Vulnerability in bot connector(4.14.3) ->
+		 okttp(3.12.2) -> change version of okio jvm to 3.4.0 -->
+		<dependency>
+			<groupId>com.squareup.okio</groupId>
+			<artifactId>okio-jvm</artifactId>
+			<version>${okio-jvm.version}</version>	
+		</dependency>	
+
 		<!-- for parsing html sent to bot -->
 		<dependency>
 			<groupId>org.jsoup</groupId>
@@ -66,12 +98,18 @@
 			<version>${graalvm.version}</version>
 		</dependency>
 
-		<!-- for templating xml/html @work -->
+		<!-- for templating xml/html @work
+		thymeleaf.spring5 doesn't support in spring 3.x.x' -->
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+	        <artifactId>guava</artifactId>
+	        <version>${guava.version}</version>
+		</dependency>
 
 		<!-- for testing -->
 		<dependency>